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.
2016-09-21 18:12:24 +03:00
parent 0120085443
commit 06101dba52
42 changed files with 293 additions and 297 deletions
@@ -1,3 +0,0 @@
-<!-- conflictingOverloadsClass1 -->
-<html>
-'<b>public</b> <b>final</b> <b>fun</b> lol(x: Int): Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
@@ -0,0 +1,2 @@
+<!-- conflictingOverloadsClass1 -->
+Conflicting overloads: public final fun lol(x: Int): Int defined in conflictingOverloads, public final fun lol(y: Int): Int defined in conflictingOverloads
@@ -1,3 +0,0 @@
-<!-- conflictingOverloadsClass2 -->
-<html>
-'<b>public</b> <b>final</b> <b>fun</b> lol(y: Int): Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
@@ -0,0 +1,2 @@
+<!-- conflictingOverloadsClass2 -->
+Conflicting overloads: public final fun lol(x: Int): Int defined in conflictingOverloads, public final fun lol(y: Int): Int defined in conflictingOverloads
@@ -1,2 +1,2 @@
 <!-- conflictingOverloadsDefaultPackage1 -->
-'public fun foo(x: Int): Int' conflicts with another declaration in package '<root>'
+Conflicting overloads: public fun foo(x: Int): Int defined in root package, public fun foo(y: Int): Int defined in root package
@@ -1,2 +1,2 @@
 <!-- conflictingOverloadsDefaultPackage2 -->
-'public fun foo(y: Int): Int' conflicts with another declaration in package '<root>'
+Conflicting overloads: public fun foo(x: Int): Int defined in root package, public fun foo(y: Int): Int defined in root package
@@ -1,2 +1,2 @@
 <!-- constructorsRedeclaration1 -->
-'public constructor Element(x: String)' conflicts with another declaration in class 'Element'
+Conflicting overloads: public constructor Element(x: String) defined in Element, public constructor Element(x: String) defined in Element
@@ -1,2 +1,2 @@
 <!-- constructorsRedeclaration2 -->
-'public constructor Element(x: String)' conflicts with another declaration in class 'Element'
+Conflicting overloads: public constructor Element(x: String) defined in Element, public constructor Element(x: String) defined in Element
@@ -1,2 +1,2 @@
 <!-- constructorsRedeclarationTopLevel1 -->
-'public fun Element(x: String): Unit' conflicts with another declaration in class 'Element'
+Conflicting overloads: public fun Element(x: String): Unit defined in root package, public constructor Element(x: String) defined in Element
@@ -1,2 +1,2 @@
 <!-- constructorsRedeclarationTopLevel2 -->
-'public constructor Element(x: String)' conflicts with another declaration in package '<root>'
+Conflicting overloads: public fun Element(x: String): Unit defined in root package, public constructor Element(x: String) defined in Element