Revert "[FIR] Fix parameter order of NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS"
This reverts commit 8bfc4675c4.
This commit is contained in:
+1
-1
@@ -95,7 +95,7 @@ object FirJvmErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
|||||||
|
|
||||||
map.put(
|
map.put(
|
||||||
NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS,
|
NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS,
|
||||||
"Java type mismatch: inferred type is ''{0}'', but ''{1}'' was expected.{2}",
|
"Java type mismatch: inferred type is ''{1}'', but ''{0}'' was expected.{2}",
|
||||||
RENDER_TYPE,
|
RENDER_TYPE,
|
||||||
RENDER_TYPE,
|
RENDER_TYPE,
|
||||||
OPTIONAL_SENTENCE,
|
OPTIONAL_SENTENCE,
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
a.foo(null)
|
a.foo(null)
|
||||||
^
|
^
|
||||||
compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
a.foo(null)
|
a.foo(null)
|
||||||
^
|
^
|
||||||
compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
warning: argument -Xjsr305-annotations is deprecated. Please use -Xjsr305 instead
|
warning: argument -Xjsr305-annotations is deprecated. Please use -Xjsr305 instead
|
||||||
compiler/testData/cli/jvm/jsr305Usage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Usage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
a.foo(null)
|
a.foo(null)
|
||||||
^
|
^
|
||||||
OK
|
OK
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
compiler/testData/cli/jvm/jsr305Migration.kt:2:19: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Migration.kt:2:19: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
annotated.foo(null)
|
annotated.foo(null)
|
||||||
^
|
^
|
||||||
compiler/testData/cli/jvm/jsr305Migration.kt:4:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
compiler/testData/cli/jvm/jsr305Migration.kt:4:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
compiler/testData/cli/jvm/jsr305Migration.kt:2:19: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Migration.kt:2:19: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
annotated.foo(null)
|
annotated.foo(null)
|
||||||
^
|
^
|
||||||
compiler/testData/cli/jvm/jsr305Migration.kt:4:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
compiler/testData/cli/jvm/jsr305Migration.kt:4:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
compiler/testData/cli/jvm/jsr305Migration.kt:2:19: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Migration.kt:2:19: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
annotated.foo(null)
|
annotated.foo(null)
|
||||||
^
|
^
|
||||||
compiler/testData/cli/jvm/jsr305Migration.kt:3:19: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Migration.kt:3:19: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
annotated.bar(null)
|
annotated.bar(null)
|
||||||
^
|
^
|
||||||
compiler/testData/cli/jvm/jsr305Migration.kt:4:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
compiler/testData/cli/jvm/jsr305Migration.kt:4:5: warning: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
compiler/testData/cli/jvm/jsr305Usage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Usage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
a.foo(null)
|
a.foo(null)
|
||||||
^
|
^
|
||||||
OK
|
OK
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
compiler/testData/cli/jvm/jsr305Usage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.Nothing?', but 'kotlin.String' was expected.
|
compiler/testData/cli/jvm/jsr305Usage.kt:2:11: warning: Java type mismatch: inferred type is 'kotlin.String', but 'kotlin.Nothing?' was expected.
|
||||||
a.foo(null)
|
a.foo(null)
|
||||||
^
|
^
|
||||||
OK
|
OK
|
||||||
|
|||||||
Reference in New Issue
Block a user