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

Minor: fixed error message

Browse Source
This commit is contained in:
Svetlana Isakova
2015-10-20 15:30:25 +03:00
parent 27ef6fab21
commit 7150be7c67
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+1 -1
View File
@@ -397,7 +397,7 @@ public class DefaultErrorMessages {
MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", FQ_NAMES_IN_TYPES);
MAP.put(CONSTANT_EXPECTED_TYPE_MISMATCH, "An {0} literal does not conform to the expected type {1}", STRING, RENDER_TYPE);
MAP.put(CONSTANT_EXPECTED_TYPE_MISMATCH, "The {0} literal does not conform to the expected type {1}", STRING, RENDER_TYPE);
MAP.put(DIVISION_BY_ZERO, "Division by zero");
MAP.put(INTEGER_OVERFLOW, "This operation has led to an overflow");
MAP.put(INT_LITERAL_OUT_OF_RANGE, "The value is out of range");
idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// "Create class 'Foo'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>V</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
// ERROR: An integer literal does not conform to the expected type U
// ERROR: The integer literal does not conform to the expected type U
class B<T>(val t: T) {
idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// "Create class 'Foo'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>V</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
// ERROR: An integer literal does not conform to the expected type U
// ERROR: The integer literal does not conform to the expected type U
class B<T>(val t: T) {
inner class Foo<U, V>(u: U, v: V) {
idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// "Create class 'Foo'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>W</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
// ERROR: An integer literal does not conform to the expected type V
// ERROR: The integer literal does not conform to the expected type V
class B<T>(val t: T) {
idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// "Create class 'Foo'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>W</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
// ERROR: An integer literal does not conform to the expected type V
// ERROR: The integer literal does not conform to the expected type V
class B<T>(val t: T) {
inner class Foo<U, V, W>(v: V, w: W) {
idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false"
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: The integer literal does not conform to the expected type kotlin.String
@Deprecated("", ReplaceWith("newFun()", imports = 123))
fun oldFun() {
idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// "Replace invalid positioned arguments for annotation" "true"
// WITH_RUNTIME
// ERROR: Only named arguments are available for Java annotations
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: The integer literal does not conform to the expected type kotlin.String
@Ann(1, arg1 = 2) class A
idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// "Replace invalid positioned arguments for annotation" "true"
// WITH_RUNTIME
// ERROR: Only named arguments are available for Java annotations
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: The integer literal does not conform to the expected type kotlin.String
@Ann(1, 2<caret>) class A
idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: The integer literal does not conform to the expected type kotlin.String
@Suppress(1)
fun foo(): String?<caret>? = null
idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: The integer literal does not conform to the expected type kotlin.String
@Suppress(1, "REDUNDANT_NULLABLE")
fun foo(): String?<caret>? = null
idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Change 'A.component2' function return type to 'Unit'" "true"
// ERROR: An integer literal does not conform to the expected type kotlin.Unit
// ERROR: The integer literal does not conform to the expected type kotlin.Unit
abstract class A {
abstract fun component1(): Int
fun component2() = 42
idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Change 'A.component2' function return type to 'Unit'" "true"
// ERROR: An integer literal does not conform to the expected type kotlin.Unit
// ERROR: The integer literal does not conform to the expected type kotlin.Unit
abstract class A {
abstract fun component1(): Int
fun component2(): Unit = 42