diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index 02506b65595..f5ced899d9c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -402,7 +402,7 @@ public class DefaultErrorMessages { MAP.put(WRONG_SETTER_PARAMETER_TYPE, "Setter parameter type must be equal to the type of the property, i.e. ''{0}''", RENDER_TYPE, RENDER_TYPE); MAP.put(WRONG_GETTER_RETURN_TYPE, "Getter return type must be equal to the type of the property, i.e. ''{0}''", RENDER_TYPE, RENDER_TYPE); MAP.put(WRONG_SETTER_RETURN_TYPE, "Setter return type must be Unit"); - MAP.put(NO_COMPANION_OBJECT, "Please specify constructor invocation; classifier ''{0}'' does not have a companion object", NAME); + MAP.put(NO_COMPANION_OBJECT, "Classifier ''{0}'' does not have a companion object, and thus must be initialized here", NAME); MAP.put(TYPE_PARAMETER_IS_NOT_AN_EXPRESSION, "Type parameter ''{0}'' is not an expression", NAME); MAP.put(TYPE_PARAMETER_ON_LHS_OF_DOT, "Type parameter ''{0}'' cannot have or inherit a companion object, so it cannot be on the left hand side of dot", NAME); MAP.put(NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE, "Nested {0} accessed via instance reference", RENDER_CLASS_OR_OBJECT_NAME); diff --git a/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt b/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt index 7eff2d31234..ba6ecf30c3b 100644 --- a/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt +++ b/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt @@ -1,5 +1,5 @@ // "Import" "true" -// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a companion object +// ERROR: Classifier 'ArrayList' does not have a companion object, and thus must be initialized here // KT-4000 diff --git a/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after b/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after index 34d5e839e1c..3dbef67055c 100644 --- a/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after +++ b/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after @@ -1,5 +1,5 @@ // "Import" "true" -// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a companion object +// ERROR: Classifier 'ArrayList' does not have a companion object, and thus must be initialized here // KT-4000 diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log index c27e845833a..8525b99e72b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log @@ -32,7 +32,7 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Unresolved reference: Companion -Please specify constructor invocation; classifier 'A' does not have a companion object +Classifier 'A' does not have a companion object, and thus must be initialized here ================ Step #2 ================= diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log index f76979cc10a..fd2fc164d00 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log @@ -37,7 +37,7 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Unresolved reference: Companion -Please specify constructor invocation; classifier 'A' does not have a companion object +Classifier 'A' does not have a companion object, and thus must be initialized here ================ Step #2 =================