From 32c66914febf63b8a981402371b5cb994a458d56 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 4 Sep 2015 22:42:46 +0300 Subject: [PATCH] fix tests in org.jetbrains.kotlin.idea.highlighter --- .../diagnosticMessage/cannotOverrideInvisibleMember1.txt | 2 +- idea/testData/diagnosticMessage/conflictingOverloadsClass1.html | 2 +- idea/testData/diagnosticMessage/conflictingOverloadsClass2.html | 2 +- .../diagnosticMessage/conflictingOverloadsDefaultPackage1.txt | 2 +- .../diagnosticMessage/conflictingOverloadsDefaultPackage2.txt | 2 +- .../diagnosticMessage/constructorsRedeclarationTopLevel1.txt | 2 +- .../diagnosticMessage/differentNamesForSameParameter1.txt | 2 +- .../diagnosticMessage/wrongReturnTypeInImplementation1.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt b/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt index 65cf0293a3d..bad439cd1af 100644 --- a/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt +++ b/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt @@ -1,2 +1,2 @@ -'internal open fun foo(): kotlin.Unit defined in B' has no access to 'private open fun foo(): kotlin.Unit defined in A', so it cannot override it \ No newline at end of file +'public open fun foo(): kotlin.Unit defined in B' has no access to 'private open fun foo(): kotlin.Unit defined in A', so it cannot override it \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html b/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html index 4f9b8fd762d..04e9376eab8 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html +++ b/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html @@ -1,3 +1,3 @@ -'internal final fun lol(x: kotlin.Int): kotlin.Int'
is already defined in conflictingOverloads \ No newline at end of file +'public final fun lol(x: kotlin.Int): kotlin.Int'
is already defined in conflictingOverloads \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html b/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html index 3b5e6499f45..e8fca6ad5c7 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html +++ b/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html @@ -1,3 +1,3 @@ -'internal final fun lol(y: kotlin.Int): kotlin.Int'
is already defined in conflictingOverloads \ No newline at end of file +'public final fun lol(y: kotlin.Int): kotlin.Int'
is already defined in conflictingOverloads \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt index d7b325abb07..283271018b8 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt +++ b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt @@ -1,2 +1,2 @@ -'internal fun foo(x: kotlin.Int): kotlin.Int' is already defined in root package +'public fun foo(x: kotlin.Int): kotlin.Int' is already defined in root package \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt index e8f83c8a9ff..00e3a11aeea 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt +++ b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt @@ -1,2 +1,2 @@ -'internal fun foo(y: kotlin.Int): kotlin.Int' is already defined in root package +'public fun foo(y: kotlin.Int): kotlin.Int' is already defined in root package \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt b/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt index 6a97c023c06..6343216a27d 100644 --- a/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt +++ b/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt @@ -1,2 +1,2 @@ -'internal fun Element(x: kotlin.String): kotlin.Unit' is already defined in root package \ No newline at end of file +'public fun Element(x: kotlin.String): kotlin.Unit' is already defined in root package \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt b/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt index 5f11182d393..fe6aafc4e54 100644 --- a/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt +++ b/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt @@ -1,2 +1,2 @@ -Names of the parameter #1 conflict in the following members of supertypes: 'internal abstract fun foo(x: kotlin.Int): kotlin.Unit defined in A, internal open fun foo(y: kotlin.Int): kotlin.Unit defined in B'. This may cause problems when calling this function with named arguments. \ No newline at end of file +Names of the parameter #1 conflict in the following members of supertypes: 'public abstract fun foo(x: kotlin.Int): kotlin.Unit defined in A, public open fun foo(y: kotlin.Int): kotlin.Unit defined in B'. This may cause problems when calling this function with named arguments. \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/wrongReturnTypeInImplementation1.txt b/idea/testData/diagnosticMessage/wrongReturnTypeInImplementation1.txt index 981c291fe45..be95618029b 100644 --- a/idea/testData/diagnosticMessage/wrongReturnTypeInImplementation1.txt +++ b/idea/testData/diagnosticMessage/wrongReturnTypeInImplementation1.txt @@ -1,2 +1,2 @@ -Class 'E' must be declared abstract or implement abstract member internal abstract fun f(): T3 defined in C \ No newline at end of file +Class 'E' must be declared abstract or implement abstract member public abstract fun f(): T3 defined in C \ No newline at end of file