From 35e2c9eb59197cfe6f0ffe550efdf1f7ee0573bf Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 29 Oct 2019 12:48:16 +0300 Subject: [PATCH] Fix scripting tests in 193 ^KT-34541 Fixed --- .../completion/conflictingModule/conflictingModule.mute.193 | 1 - .../conflictingModuleJavaLib/conflictingModuleJavaLib.mute.193 | 1 - .../definition/complex/errorResolver/errorResolver.mute.193 | 1 - .../acceptedAnnotations/acceptedAnnotations.mute.193 | 1 - .../highlighting/additionalImports/additionalImports.mute.193 | 1 - .../highlighting/asyncResolver/asyncResolver.mute.193 | 1 - .../highlighting/conflictingModule/conflictingModule.mute.193 | 1 - .../highlighting/customBaseClass/customBaseClass.mute.193 | 1 - .../highlighting/customExtension/customExtension.mute.193 | 1 - .../highlighting/customJavaHome/customJavaHome.mute.193 | 1 - .../highlighting/customLibrary/customLibrary.mute.193 | 1 - .../customLibraryInModuleDeps.mute.193 | 1 - .../doNotSpeakAboutJava/doNotSpeakAboutJava.mute.193 | 1 - .../doNotSpeakAboutJavaLegacy.mute.193 | 1 - .../highlighting/emptyAsyncResolver/emptyAsyncResolver.mute.193 | 1 - .../highlighting/errorResolver/errorResolver.mute.193 | 1 - .../highlighting/javaNestedClass/javaNestedClass.mute.193 | 1 - .../definition/highlighting/multiModule/multiModule.mute.193 | 1 - .../definition/highlighting/noResolver/noResolver.mute.193 | 1 - .../highlighting/propertyAccessor/propertyAccessor.mute.193 | 1 - .../propertyAccessorFromModule.mute.193 | 1 - .../script/definition/highlighting/simple/simple.mute.193 | 1 - .../highlighting/throwingResolver/throwingResolver.mute.193 | 1 - .../navigation/conflictingModule/conflictingModule.mute.193 | 1 - .../navigation/customBaseClass/customBaseClass.mute.193 | 1 - .../script/definition/navigation/javaLib/javaLib.mute.193 | 1 - .../navigation/javaLibWithSources/javaLibWithSources.mute.193 | 1 - .../script/definition/navigation/kotlinLib/kotlinLib.mute.193 | 1 - .../kotlinLibWithSources/kotlinLibWithSources.mute.193 | 1 - .../script/definition/navigation/stdlib/stdlib.mute.193 | 1 - .../navigation/stdlibWithSources/stdlibWithSources.mute.193 | 1 - idea/testData/script/definition/order/reorder/reorder.mute.193 | 1 - .../script/definition/order/switchOff/switchOff.mute.193 | 1 - .../org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 | 2 +- 34 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 idea/testData/script/definition/completion/conflictingModule/conflictingModule.mute.193 delete mode 100644 idea/testData/script/definition/completion/conflictingModuleJavaLib/conflictingModuleJavaLib.mute.193 delete mode 100644 idea/testData/script/definition/complex/errorResolver/errorResolver.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/acceptedAnnotations/acceptedAnnotations.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/additionalImports/additionalImports.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/asyncResolver/asyncResolver.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/conflictingModule/conflictingModule.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/customBaseClass/customBaseClass.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/customExtension/customExtension.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/customJavaHome/customJavaHome.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/customLibrary/customLibrary.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/customLibraryInModuleDeps/customLibraryInModuleDeps.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/doNotSpeakAboutJava/doNotSpeakAboutJava.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/doNotSpeakAboutJavaLegacy/doNotSpeakAboutJavaLegacy.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/emptyAsyncResolver/emptyAsyncResolver.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/errorResolver/errorResolver.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/javaNestedClass/javaNestedClass.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/multiModule/multiModule.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/noResolver/noResolver.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/propertyAccessor/propertyAccessor.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/propertyAccessorFromModule/propertyAccessorFromModule.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/simple/simple.mute.193 delete mode 100644 idea/testData/script/definition/highlighting/throwingResolver/throwingResolver.mute.193 delete mode 100644 idea/testData/script/definition/navigation/conflictingModule/conflictingModule.mute.193 delete mode 100644 idea/testData/script/definition/navigation/customBaseClass/customBaseClass.mute.193 delete mode 100644 idea/testData/script/definition/navigation/javaLib/javaLib.mute.193 delete mode 100644 idea/testData/script/definition/navigation/javaLibWithSources/javaLibWithSources.mute.193 delete mode 100644 idea/testData/script/definition/navigation/kotlinLib/kotlinLib.mute.193 delete mode 100644 idea/testData/script/definition/navigation/kotlinLibWithSources/kotlinLibWithSources.mute.193 delete mode 100644 idea/testData/script/definition/navigation/stdlib/stdlib.mute.193 delete mode 100644 idea/testData/script/definition/navigation/stdlibWithSources/stdlibWithSources.mute.193 delete mode 100644 idea/testData/script/definition/order/reorder/reorder.mute.193 delete mode 100644 idea/testData/script/definition/order/switchOff/switchOff.mute.193 diff --git a/idea/testData/script/definition/completion/conflictingModule/conflictingModule.mute.193 b/idea/testData/script/definition/completion/conflictingModule/conflictingModule.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/completion/conflictingModule/conflictingModule.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/completion/conflictingModuleJavaLib/conflictingModuleJavaLib.mute.193 b/idea/testData/script/definition/completion/conflictingModuleJavaLib/conflictingModuleJavaLib.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/completion/conflictingModuleJavaLib/conflictingModuleJavaLib.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/complex/errorResolver/errorResolver.mute.193 b/idea/testData/script/definition/complex/errorResolver/errorResolver.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/complex/errorResolver/errorResolver.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/acceptedAnnotations/acceptedAnnotations.mute.193 b/idea/testData/script/definition/highlighting/acceptedAnnotations/acceptedAnnotations.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/acceptedAnnotations/acceptedAnnotations.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/additionalImports/additionalImports.mute.193 b/idea/testData/script/definition/highlighting/additionalImports/additionalImports.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/additionalImports/additionalImports.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/asyncResolver/asyncResolver.mute.193 b/idea/testData/script/definition/highlighting/asyncResolver/asyncResolver.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/asyncResolver/asyncResolver.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/conflictingModule/conflictingModule.mute.193 b/idea/testData/script/definition/highlighting/conflictingModule/conflictingModule.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/conflictingModule/conflictingModule.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/customBaseClass/customBaseClass.mute.193 b/idea/testData/script/definition/highlighting/customBaseClass/customBaseClass.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/customBaseClass/customBaseClass.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/customExtension/customExtension.mute.193 b/idea/testData/script/definition/highlighting/customExtension/customExtension.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/customExtension/customExtension.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/customJavaHome/customJavaHome.mute.193 b/idea/testData/script/definition/highlighting/customJavaHome/customJavaHome.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/customJavaHome/customJavaHome.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/customLibrary/customLibrary.mute.193 b/idea/testData/script/definition/highlighting/customLibrary/customLibrary.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/customLibrary/customLibrary.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/customLibraryInModuleDeps/customLibraryInModuleDeps.mute.193 b/idea/testData/script/definition/highlighting/customLibraryInModuleDeps/customLibraryInModuleDeps.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/customLibraryInModuleDeps/customLibraryInModuleDeps.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/doNotSpeakAboutJava/doNotSpeakAboutJava.mute.193 b/idea/testData/script/definition/highlighting/doNotSpeakAboutJava/doNotSpeakAboutJava.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/doNotSpeakAboutJava/doNotSpeakAboutJava.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/doNotSpeakAboutJavaLegacy/doNotSpeakAboutJavaLegacy.mute.193 b/idea/testData/script/definition/highlighting/doNotSpeakAboutJavaLegacy/doNotSpeakAboutJavaLegacy.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/doNotSpeakAboutJavaLegacy/doNotSpeakAboutJavaLegacy.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/emptyAsyncResolver/emptyAsyncResolver.mute.193 b/idea/testData/script/definition/highlighting/emptyAsyncResolver/emptyAsyncResolver.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/emptyAsyncResolver/emptyAsyncResolver.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/errorResolver/errorResolver.mute.193 b/idea/testData/script/definition/highlighting/errorResolver/errorResolver.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/errorResolver/errorResolver.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/javaNestedClass/javaNestedClass.mute.193 b/idea/testData/script/definition/highlighting/javaNestedClass/javaNestedClass.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/javaNestedClass/javaNestedClass.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/multiModule/multiModule.mute.193 b/idea/testData/script/definition/highlighting/multiModule/multiModule.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/multiModule/multiModule.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/noResolver/noResolver.mute.193 b/idea/testData/script/definition/highlighting/noResolver/noResolver.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/noResolver/noResolver.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/propertyAccessor/propertyAccessor.mute.193 b/idea/testData/script/definition/highlighting/propertyAccessor/propertyAccessor.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/propertyAccessor/propertyAccessor.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/propertyAccessorFromModule/propertyAccessorFromModule.mute.193 b/idea/testData/script/definition/highlighting/propertyAccessorFromModule/propertyAccessorFromModule.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/propertyAccessorFromModule/propertyAccessorFromModule.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/simple/simple.mute.193 b/idea/testData/script/definition/highlighting/simple/simple.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/simple/simple.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/highlighting/throwingResolver/throwingResolver.mute.193 b/idea/testData/script/definition/highlighting/throwingResolver/throwingResolver.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/highlighting/throwingResolver/throwingResolver.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/conflictingModule/conflictingModule.mute.193 b/idea/testData/script/definition/navigation/conflictingModule/conflictingModule.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/conflictingModule/conflictingModule.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/customBaseClass/customBaseClass.mute.193 b/idea/testData/script/definition/navigation/customBaseClass/customBaseClass.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/customBaseClass/customBaseClass.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/javaLib/javaLib.mute.193 b/idea/testData/script/definition/navigation/javaLib/javaLib.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/javaLib/javaLib.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/javaLibWithSources/javaLibWithSources.mute.193 b/idea/testData/script/definition/navigation/javaLibWithSources/javaLibWithSources.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/javaLibWithSources/javaLibWithSources.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/kotlinLib/kotlinLib.mute.193 b/idea/testData/script/definition/navigation/kotlinLib/kotlinLib.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/kotlinLib/kotlinLib.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/kotlinLibWithSources/kotlinLibWithSources.mute.193 b/idea/testData/script/definition/navigation/kotlinLibWithSources/kotlinLibWithSources.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/kotlinLibWithSources/kotlinLibWithSources.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/stdlib/stdlib.mute.193 b/idea/testData/script/definition/navigation/stdlib/stdlib.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/stdlib/stdlib.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/navigation/stdlibWithSources/stdlibWithSources.mute.193 b/idea/testData/script/definition/navigation/stdlibWithSources/stdlibWithSources.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/navigation/stdlibWithSources/stdlibWithSources.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/order/reorder/reorder.mute.193 b/idea/testData/script/definition/order/reorder/reorder.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/order/reorder/reorder.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/testData/script/definition/order/switchOff/switchOff.mute.193 b/idea/testData/script/definition/order/switchOff/switchOff.mute.193 deleted file mode 100644 index 27dbb901d65..00000000000 --- a/idea/testData/script/definition/order/switchOff/switchOff.mute.193 +++ /dev/null @@ -1 +0,0 @@ -https://youtrack.jetbrains.com/issue/KT-34541 \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 index 6847ecc0ee7..2a450ccb34e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 +++ b/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 @@ -15,5 +15,5 @@ fun addExtensionPointInTest( provider: T, testRootDisposable: Disposable ) { - pointName.getPoint(null).registerExtension(provider) + pointName.getPoint(project).registerExtension(provider, testRootDisposable) } \ No newline at end of file