From d324df7f207332cb0d4a5fee357ef3c476a48bef Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 21 Sep 2016 18:12:24 +0300 Subject: [PATCH] KT-13961 REDECLARATION not reported on private-in-file 'foo' vs public 'foo' in different file Private-in-file declarations conflict with public overload-equivalent declarations in other files in the same package. Move functions for grouping possible redeclarations to OverloadResolver (since they are used only there). Refactor redeclarations / conflicting overloads reporting. Original commit: 06101dba52be8ea0a46ff48794be8f82261f9c90 --- .../secondaryConstructorAdded/build.log | 4 ++-- .../incremental/pureKotlin/classRedeclaration/build.log | 2 +- .../incremental/pureKotlin/funRedeclaration/build.log | 2 +- .../pureKotlin/funVsConstructorOverloadConflict/build.log | 2 +- .../incremental/pureKotlin/propertyRedeclaration/build.log | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 8ff9855fed1..97868ff01fe 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -9,7 +9,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public constructor A(x: String)' conflicts with another declaration in package '' +Conflicting overloads: public constructor A(x: String) defined in A, public fun A(x: String): A defined in root package ================ Step #2 ================= @@ -41,4 +41,4 @@ Compiling files: src/useA.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log index da4e0b01787..1e854056845 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -16,4 +16,4 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Redeclaration: Klass -Redeclaration: Klass +Redeclaration: Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index cc75bbbadea..f79a79a7337 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public fun function(): Unit' conflicts with another declaration in package 'test' \ No newline at end of file +Conflicting overloads: public fun function(): Unit defined in test, public fun function(): Unit defined in test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log index e9e9b9c7459..dab333be49e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public constructor function()' conflicts with another declaration in package 'test' +Conflicting overloads: public constructor function() defined in test.function, public fun function(): Unit defined in test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index bb32f37092f..7839df62fd5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Redeclaration: property +Conflicting declarations: public val property: Int, public val property: Int \ No newline at end of file