azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better diagnostics for conflicting overloads.

Browse Source 
Skip declarations without sources in reporting, not when determining redeclaration groups:
this allows emitting informative diagnostics for incremental compilation.
Provide containing declaration with "kind", e.g., "package '<root>'", "class A", and so on.
This commit is contained in:
Dmitry Petrov
2016-02-02 18:24:34 +03:00
parent 130301aa27
commit 4afe98a0f6
19 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/diagnosticMessage/conflictingOverloadsClass1.html
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
<!-- conflictingOverloadsClass1 -->
<html>
'<b>public</b> <b>final</b> <b>fun</b> lol(x: kotlin.Int): kotlin.Int'<br />conflicts with another declaration: <b>public</b> <b>final</b> <b>fun</b> lol(y: kotlin.Int): kotlin.Int</html>
'<b>public</b> <b>final</b> <b>fun</b> lol(x: kotlin.Int): kotlin.Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
idea/testData/diagnosticMessage/conflictingOverloadsClass2.html
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
<!-- conflictingOverloadsClass2 -->
<html>
'<b>public</b> <b>final</b> <b>fun</b> lol(y: kotlin.Int): kotlin.Int'<br />conflicts with another declaration: <b>public</b> <b>final</b> <b>fun</b> lol(x: kotlin.Int): kotlin.Int</html>
'<b>public</b> <b>final</b> <b>fun</b> lol(y: kotlin.Int): kotlin.Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- conflictingOverloadsDefaultPackage1 -->
'public fun foo(x: kotlin.Int): kotlin.Int' conflicts with another declaration: public fun foo(y: kotlin.Int): kotlin.Int
'public fun foo(x: kotlin.Int): kotlin.Int' conflicts with another declaration in package '<root>'
idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- conflictingOverloadsDefaultPackage2 -->
'public fun foo(y: kotlin.Int): kotlin.Int' conflicts with another declaration: public fun foo(x: kotlin.Int): kotlin.Int
'public fun foo(y: kotlin.Int): kotlin.Int' conflicts with another declaration in package '<root>'
idea/testData/diagnosticMessage/constructorsRedeclaration1.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- constructorsRedeclaration1 -->
'public constructor Element(x: kotlin.String)' conflicts with another declaration: public constructor Element(x: kotlin.String)
'public constructor Element(x: kotlin.String)' conflicts with another declaration in class 'Element'
idea/testData/diagnosticMessage/constructorsRedeclaration2.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- constructorsRedeclaration2 -->
'public constructor Element(x: kotlin.String)' conflicts with another declaration: public constructor Element(x: kotlin.String)
'public constructor Element(x: kotlin.String)' conflicts with another declaration in class 'Element'
idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- constructorsRedeclarationTopLevel1 -->
'public fun Element(x: kotlin.String): kotlin.Unit' conflicts with another declaration: public constructor Element(x: kotlin.String)
'public fun Element(x: kotlin.String): kotlin.Unit' conflicts with another declaration in class 'Element'
idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- constructorsRedeclarationTopLevel2 -->
'public constructor Element(x: kotlin.String)' conflicts with another declaration: public fun Element(x: kotlin.String): kotlin.Unit
'public constructor Element(x: kotlin.String)' conflicts with another declaration in package '<root>'