diff --git a/.bunch b/.bunch index 7871389e44a..881679491c9 100644 --- a/.bunch +++ b/.bunch @@ -1,7 +1,6 @@ -181 -173 -172_173 -as31_173 -as32 182 -as33_as32 +181 +173_181 +172_173_181 +as31_173_181 +as32_181 diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt index 5492bab019f..c8013297f94 100644 --- a/buildSrc/src/main/kotlin/instrument.kt +++ b/buildSrc/src/main/kotlin/instrument.kt @@ -54,7 +54,7 @@ fun Project.configureInstrumentation() { val instrumentationClasspathCfg = configurations.create("instrumentationClasspath") dependencies { - instrumentationClasspathCfg(intellijDep()) { includeJars("javac2", "jdom", "asm-all", "jgoodies-forms") } + instrumentationClasspathCfg(intellijDep()) { includeJars("javac2", "jdom", "asm-all") } } afterEvaluate { diff --git a/buildSrc/src/main/kotlin/instrument.kt.182 b/buildSrc/src/main/kotlin/instrument.kt.181 similarity index 99% rename from buildSrc/src/main/kotlin/instrument.kt.182 rename to buildSrc/src/main/kotlin/instrument.kt.181 index c8013297f94..5492bab019f 100644 --- a/buildSrc/src/main/kotlin/instrument.kt.182 +++ b/buildSrc/src/main/kotlin/instrument.kt.181 @@ -54,7 +54,7 @@ fun Project.configureInstrumentation() { val instrumentationClasspathCfg = configurations.create("instrumentationClasspath") dependencies { - instrumentationClasspathCfg(intellijDep()) { includeJars("javac2", "jdom", "asm-all") } + instrumentationClasspathCfg(intellijDep()) { includeJars("javac2", "jdom", "asm-all", "jgoodies-forms") } } afterEvaluate { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt index 1fd3c25d74c..2101f93164c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen.inline -import jdk.internal.org.objectweb.asm.Opcodes +import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.load.kotlin.getContainingKotlinJvmBinaryClass diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.182 b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.181 similarity index 98% rename from compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.182 rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.181 index 2101f93164c..1fd3c25d74c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.182 +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LegacyInlineSuspendUtil.kt.181 @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen.inline -import org.jetbrains.org.objectweb.asm.Opcodes +import jdk.internal.org.objectweb.asm.Opcodes import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.load.kotlin.getContainingKotlinJvmBinaryClass diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.181 similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.181 diff --git a/compiler/compiler.pro b/compiler/compiler.pro index d635adc26d4..710ecbf24f0 100644 --- a/compiler/compiler.pro +++ b/compiler/compiler.pro @@ -51,9 +51,19 @@ messages/**) -dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil -# Depends on apache batik which has lots of dependencies +# Nullability annotations used in Guava +-dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl +-dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl + +# Depends on apache batick which has lots of dependencies -dontwarn com.intellij.util.SVGLoader* +-dontwarn org.jdom.xpath.jaxen.* +-dontwarn com.intellij.util.io.Decompressor* +-dontwarn org.w3c.dom.Location +-dontwarn org.w3c.dom.Window + + #-libraryjars '' #-libraryjars '' #-libraryjars '' diff --git a/compiler/compiler.pro.182 b/compiler/compiler.pro.181 similarity index 94% rename from compiler/compiler.pro.182 rename to compiler/compiler.pro.181 index 710ecbf24f0..d635adc26d4 100644 --- a/compiler/compiler.pro.182 +++ b/compiler/compiler.pro.181 @@ -51,19 +51,9 @@ messages/**) -dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil -# Nullability annotations used in Guava --dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl --dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl - -# Depends on apache batick which has lots of dependencies +# Depends on apache batik which has lots of dependencies -dontwarn com.intellij.util.SVGLoader* --dontwarn org.jdom.xpath.jaxen.* --dontwarn com.intellij.util.io.Decompressor* --dontwarn org.w3c.dom.Location --dontwarn org.w3c.dom.Window - - #-libraryjars '' #-libraryjars '' #-libraryjars '' diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index 3917f2b3c12..cb52a995460 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) compile(project(":compiler:util")) + compile("javax.annotation:jsr250-api:1.0") compile(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) } diff --git a/compiler/frontend.java/build.gradle.kts.182 b/compiler/frontend.java/build.gradle.kts.181 similarity index 91% rename from compiler/frontend.java/build.gradle.kts.182 rename to compiler/frontend.java/build.gradle.kts.181 index cb52a995460..3917f2b3c12 100644 --- a/compiler/frontend.java/build.gradle.kts.182 +++ b/compiler/frontend.java/build.gradle.kts.181 @@ -10,7 +10,6 @@ dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) compile(project(":compiler:util")) - compile("javax.annotation:jsr250-api:1.0") compile(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt index 8dd2aeeeae3..2f96f354c56 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt @@ -166,7 +166,7 @@ abstract class KtCodeFragment( override fun getExceptionHandler() = exceptionHandler - override fun importClass(aClass: PsiClass?): Boolean { + override fun importClass(aClass: PsiClass): Boolean { return true } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.182 b/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.181 similarity index 99% rename from compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.182 rename to compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.181 index 2f96f354c56..8dd2aeeeae3 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.182 +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt.181 @@ -166,7 +166,7 @@ abstract class KtCodeFragment( override fun getExceptionHandler() = exceptionHandler - override fun importClass(aClass: PsiClass): Boolean { + override fun importClass(aClass: PsiClass?): Boolean { return true } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt index b25faf11ea6..42b2191a7f0 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt @@ -75,6 +75,8 @@ abstract class KtConstructor> : KtDeclarationStub> : KtDeclarationStub = emptyList() } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.182 b/compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.181 similarity index 97% rename from compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.182 rename to compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.181 index 3bdc642d9ed..66e7bba9096 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.182 +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtObjectDeclaration.kt.181 @@ -67,7 +67,5 @@ class KtObjectDeclaration : KtClassOrObject { fun getObjectKeyword(): PsiElement? = findChildByType(KtTokens.OBJECT_KEYWORD) - override fun getIdentifyingElement(): PsiElement? = getObjectKeyword() - override fun getCompanionObjects(): List = emptyList() } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index f42092dd065..f496aae35c4 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testCompile(androidDxJar()) { isTransitive = false } testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false } testCompile(intellijDep()) { - includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) + includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) isTransitive = false } } diff --git a/compiler/tests-common/build.gradle.kts.182 b/compiler/tests-common/build.gradle.kts.181 similarity index 91% rename from compiler/tests-common/build.gradle.kts.182 rename to compiler/tests-common/build.gradle.kts.181 index f496aae35c4..f42092dd065 100644 --- a/compiler/tests-common/build.gradle.kts.182 +++ b/compiler/tests-common/build.gradle.kts.181 @@ -31,7 +31,7 @@ dependencies { testCompile(androidDxJar()) { isTransitive = false } testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false } testCompile(intellijDep()) { - includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) + includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) isTransitive = false } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.182 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.181 similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.182 rename to compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.181 diff --git a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt index 197d921880d..245123922d3 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt @@ -11,4 +11,4 @@ import com.intellij.util.Processor * Processor till IDEA 181 and Processor since 182. * BUNCH: 182 */ -typealias ExecutorProcessor = Processor \ No newline at end of file +typealias ExecutorProcessor = Processor \ No newline at end of file diff --git a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.182 b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181 similarity index 87% rename from idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.182 rename to idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181 index 245123922d3..197d921880d 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.182 +++ b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181 @@ -11,4 +11,4 @@ import com.intellij.util.Processor * Processor till IDEA 181 and Processor since 182. * BUNCH: 182 */ -typealias ExecutorProcessor = Processor \ No newline at end of file +typealias ExecutorProcessor = Processor \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt index 41a3f10646f..2611c8e1f0c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.PersistentStateComponent -import com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR import com.intellij.openapi.progress.util.BackgroundTaskUtil import com.intellij.openapi.project.Project import com.intellij.util.ReflectionUtil @@ -26,7 +25,6 @@ import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters import com.intellij.util.xmlb.XmlSerializer import org.jdom.Element import org.jetbrains.kotlin.cli.common.arguments.* -import org.jetbrains.kotlin.config.SettingConstants import kotlin.reflect.KClass abstract class BaseKotlinCompilerSettings protected constructor(private val project: Project) : PersistentStateComponent, Cloneable { @@ -82,8 +80,6 @@ abstract class BaseKotlinCompilerSettings protected constructor(p public override fun clone(): Any = super.clone() companion object { - const val KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE - private val SKIP_DEFAULT_VALUES = SkipDefaultValuesSerializationFilters( CommonCompilerArguments.DummyImpl(), K2JVMCompilerArguments(), diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt.181 similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt.182 rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt.181 index 2611c8e1f0c..41a3f10646f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt.182 +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt.181 @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.PersistentStateComponent +import com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR import com.intellij.openapi.progress.util.BackgroundTaskUtil import com.intellij.openapi.project.Project import com.intellij.util.ReflectionUtil @@ -25,6 +26,7 @@ import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters import com.intellij.util.xmlb.XmlSerializer import org.jdom.Element import org.jetbrains.kotlin.cli.common.arguments.* +import org.jetbrains.kotlin.config.SettingConstants import kotlin.reflect.KClass abstract class BaseKotlinCompilerSettings protected constructor(private val project: Project) : PersistentStateComponent, Cloneable { @@ -80,6 +82,8 @@ abstract class BaseKotlinCompilerSettings protected constructor(p public override fun clone(): Any = super.clone() companion object { + const val KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE + private val SKIP_DEFAULT_VALUES = SkipDefaultValuesSerializationFilters( CommonCompilerArguments.DummyImpl(), K2JVMCompilerArguments(), diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt index eb22f4611cb..bb8eea34f92 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt @@ -19,12 +19,10 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION -import org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.Companion.KOTLIN_COMPILER_SETTINGS_PATH -@State(name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, - storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), - Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED))) +@State(name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) class Kotlin2JsCompilerArgumentsHolder(project: Project) : BaseKotlinCompilerSettings(project) { override fun createSettings() = K2JSCompilerArguments() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt.181 similarity index 79% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt.182 rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt.181 index bb8eea34f92..eb22f4611cb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt.182 +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.kt.181 @@ -19,10 +19,12 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION +import org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.Companion.KOTLIN_COMPILER_SETTINGS_PATH -@State(name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) +@State(name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, + storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), + Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED))) class Kotlin2JsCompilerArgumentsHolder(project: Project) : BaseKotlinCompilerSettings(project) { override fun createSettings() = K2JSCompilerArguments() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt index 9a008248b7f..d130447ec6f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt @@ -19,12 +19,10 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION -import org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.Companion.KOTLIN_COMPILER_SETTINGS_PATH -@State(name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION, - storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), - Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED))) +@State(name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) class Kotlin2JvmCompilerArgumentsHolder(project: Project) : BaseKotlinCompilerSettings(project) { override fun createSettings() = K2JVMCompilerArguments() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt.181 similarity index 79% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt.182 rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt.181 index d130447ec6f..9a008248b7f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt.182 +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.kt.181 @@ -19,10 +19,12 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION +import org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.Companion.KOTLIN_COMPILER_SETTINGS_PATH -@State(name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) +@State(name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION, + storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), + Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED))) class Kotlin2JvmCompilerArgumentsHolder(project: Project) : BaseKotlinCompilerSettings(project) { override fun createSettings() = K2JVMCompilerArguments() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt index c63afd13ef4..3cdeb705111 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt @@ -22,14 +22,12 @@ import com.intellij.util.text.VersionComparatorUtil import org.jdom.Element import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.setApiVersionToLanguageVersionIfNeeded +import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION import org.jetbrains.kotlin.config.detectVersionAutoAdvance import org.jetbrains.kotlin.config.dropVersionsIfNecessary -@State(name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION, - storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), - Storage(file = BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH, - scheme = StorageScheme.DIRECTORY_BASED))) +@State(name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) class KotlinCommonCompilerArgumentsHolder(project: Project) : BaseKotlinCompilerSettings(project) { override fun getState(): Element { return super.getState().apply { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt.181 similarity index 87% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt.182 rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt.181 index 3cdeb705111..c63afd13ef4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt.182 +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.kt.181 @@ -22,12 +22,14 @@ import com.intellij.util.text.VersionComparatorUtil import org.jdom.Element import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.setApiVersionToLanguageVersionIfNeeded -import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION import org.jetbrains.kotlin.config.detectVersionAutoAdvance import org.jetbrains.kotlin.config.dropVersionsIfNecessary -@State(name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) +@State(name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION, + storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), + Storage(file = BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH, + scheme = StorageScheme.DIRECTORY_BASED))) class KotlinCommonCompilerArgumentsHolder(project: Project) : BaseKotlinCompilerSettings(project) { override fun getState(): Element { return super.getState().apply { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt index d6e02b4ecff..b836ef4c5bc 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt @@ -19,11 +19,10 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION -@State(name = KOTLIN_COMPILER_SETTINGS_SECTION, - storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), - Storage(file = BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED))) +@State(name = KOTLIN_COMPILER_SETTINGS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) class KotlinCompilerSettings(project: Project) : BaseKotlinCompilerSettings(project) { override fun createSettings() = CompilerSettings() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt.181 similarity index 81% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt.182 rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt.181 index b836ef4c5bc..d6e02b4ecff 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt.182 +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.kt.181 @@ -19,10 +19,11 @@ package org.jetbrains.kotlin.idea.compiler.configuration import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.config.SettingConstants import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION -@State(name = KOTLIN_COMPILER_SETTINGS_SECTION, storages = [(Storage(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE))]) +@State(name = KOTLIN_COMPILER_SETTINGS_SECTION, + storages = arrayOf(Storage(file = StoragePathMacros.PROJECT_FILE), + Storage(file = BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED))) class KotlinCompilerSettings(project: Project) : BaseKotlinCompilerSettings(project) { override fun createSettings() = CompilerSettings() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java index 58441fbf91d..c443b309fe8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java @@ -7,6 +7,6 @@ package org.jetbrains.kotlin.idea.highlighter; public class ErrorIconUtil { public static String getErrorIconUrl() { - return "/general/error.png"; + return "/general/error.svg"; } } \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java.181 similarity index 88% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java.182 rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java.181 index c443b309fe8..58441fbf91d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java.182 +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ErrorIconUtil.java.181 @@ -7,6 +7,6 @@ package org.jetbrains.kotlin.idea.highlighter; public class ErrorIconUtil { public static String getErrorIconUrl() { - return "/general/error.svg"; + return "/general/error.png"; } } \ No newline at end of file diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt index 35dc48ff580..b48e72e6afd 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android.configure import com.android.tools.idea.gradle.project.model.JavaModuleModel import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys -import com.android.tools.idea.gradle.util.FilePaths +import com.android.tools.idea.io.FilePaths import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ModuleData import com.intellij.openapi.externalSystem.model.project.ProjectData diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.182 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.181 similarity index 98% rename from idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.182 rename to idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.181 index b48e72e6afd..35dc48ff580 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.182 +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.181 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android.configure import com.android.tools.idea.gradle.project.model.JavaModuleModel import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys -import com.android.tools.idea.io.FilePaths +import com.android.tools.idea.gradle.util.FilePaths import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ModuleData import com.intellij.openapi.externalSystem.model.project.ProjectData diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java index ba5b74fa1d3..2b03bb7b115 100644 --- a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java +++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java @@ -121,7 +121,7 @@ public abstract class AndroidTestCase extends AndroidTestBase { Module additionalModule = data.myModuleFixtureBuilder.getFixture().getModule(); myAdditionalModules.add(additionalModule); AndroidFacet facet = addAndroidFacet(additionalModule); - facet.setProjectType(data.myProjectType); + facet.getProperties().PROJECT_TYPE = data.myProjectType; String rootPath = getAdditionalModulePath(data.myDirName); myFixture.copyDirectoryToProject(getResDir(), rootPath + "/res"); myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, rootPath + '/' + SdkConstants.FN_ANDROID_MANIFEST_XML); diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.182 b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.181 similarity index 99% rename from idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.182 rename to idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.181 index 2b03bb7b115..ba5b74fa1d3 100644 --- a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.182 +++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.181 @@ -121,7 +121,7 @@ public abstract class AndroidTestCase extends AndroidTestBase { Module additionalModule = data.myModuleFixtureBuilder.getFixture().getModule(); myAdditionalModules.add(additionalModule); AndroidFacet facet = addAndroidFacet(additionalModule); - facet.getProperties().PROJECT_TYPE = data.myProjectType; + facet.setProjectType(data.myProjectType); String rootPath = getAdditionalModulePath(data.myDirName); myFixture.copyDirectoryToProject(getResDir(), rootPath + "/res"); myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, rootPath + '/' + SdkConstants.FN_ANDROID_MANIFEST_XML); diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java index 8e984c33b0f..dbb76199a4c 100644 --- a/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java +++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java @@ -17,8 +17,7 @@ package org.jetbrains.kotlin.android; -import com.android.annotations.NonNull; -import com.intellij.openapi.application.PathManager; +import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -28,12 +27,12 @@ import java.io.File; * stabbed to minimize changes in AndroidTestBase */ public class TestUtils { - @NonNull + @NotNull public static File getSdk() { return KotlinTestUtils.findAndroidSdk(); } - @NonNull + @NotNull public static String getLatestAndroidPlatform() { return "android-26"; } diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.182 b/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.181 similarity index 89% rename from idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.182 rename to idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.181 index dbb76199a4c..8e984c33b0f 100644 --- a/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.182 +++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.181 @@ -17,7 +17,8 @@ package org.jetbrains.kotlin.android; -import org.jetbrains.annotations.NotNull; +import com.android.annotations.NonNull; +import com.intellij.openapi.application.PathManager; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -27,12 +28,12 @@ import java.io.File; * stabbed to minimize changes in AndroidTestBase */ public class TestUtils { - @NotNull + @NonNull public static File getSdk() { return KotlinTestUtils.findAndroidSdk(); } - @NotNull + @NonNull public static String getLatestAndroidPlatform() { return "android-26"; } diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.182 b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt similarity index 100% rename from idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.182 rename to idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt diff --git a/idea/testData/inspections/removeToStringInStringTemplate/inspectionData/expected.xml.182 b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.181 similarity index 100% rename from idea/testData/inspections/removeToStringInStringTemplate/inspectionData/expected.xml.182 rename to idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.181 diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt index a476e852491..749b5dff138 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt @@ -14,5 +14,9 @@ import java.io.File */ @Suppress("IncompatibleAPI") fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) { - addSpace(file, isOwn) + if (isOwn) { + addSource(file) + } else { + addLibrary(file) + } } \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.182 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181 similarity index 85% rename from idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.182 rename to idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181 index 749b5dff138..a476e852491 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.182 +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181 @@ -14,9 +14,5 @@ import java.io.File */ @Suppress("IncompatibleAPI") fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) { - if (isOwn) { - addSource(file) - } else { - addLibrary(file) - } + addSpace(file, isOwn) } \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java index 4c235cac0e3..7f983233c29 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java @@ -18,9 +18,23 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; +import com.intellij.testFramework.TempFiles; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import gnu.trove.THashSet; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.nio.charset.Charset; +import java.util.Collection; public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCodeInsightFixtureTestCase { @NotNull @@ -39,4 +53,45 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod public PsiFile getFile() { return super.getFile(); } + + protected final Collection myFilesToDelete = new THashSet<>(); + private final TempFiles myTempFiles = new TempFiles(myFilesToDelete); + + @Override + protected void tearDown() throws Exception { + myTempFiles.deleteAll(); + super.tearDown(); + } + + @NotNull + public VirtualFile createTempFile( + @NonNls @NotNull String ext, + @Nullable byte[] bom, + @NonNls @NotNull String content, + @NotNull Charset charset + ) throws IOException { + File temp = FileUtil.createTempFile("copy", "." + ext); + setContentOnDisk(temp, bom, content, charset); + + myFilesToDelete.add(temp); + final VirtualFile file = getVirtualFile(temp); + assert file != null : temp; + return file; + } + + public static void setContentOnDisk(@NotNull File file, @Nullable byte[] bom, @NotNull String content, @NotNull Charset charset) + throws IOException { + FileOutputStream stream = new FileOutputStream(file); + if (bom != null) { + stream.write(bom); + } + try (OutputStreamWriter writer = new OutputStreamWriter(stream, charset)) { + writer.write(content); + } + } + + protected static VirtualFile getVirtualFile(@NotNull File file) { + return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file); + } + } diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.181 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.181 new file mode 100644 index 00000000000..4c235cac0e3 --- /dev/null +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.181 @@ -0,0 +1,42 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.idea.test; + +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiFile; +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import org.jetbrains.annotations.NotNull; + +public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCodeInsightFixtureTestCase { + @NotNull + @Override + public Project getProject() { + return super.getProject(); + } + + @NotNull + @Override + public Editor getEditor() { + return super.getEditor(); + } + + @Override + public PsiFile getFile() { + return super.getFile(); + } +} diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.182 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.182 deleted file mode 100644 index 7f983233c29..00000000000 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java.182 +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.test; - -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiFile; -import com.intellij.testFramework.TempFiles; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import gnu.trove.THashSet; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.nio.charset.Charset; -import java.util.Collection; - -public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCodeInsightFixtureTestCase { - @NotNull - @Override - public Project getProject() { - return super.getProject(); - } - - @NotNull - @Override - public Editor getEditor() { - return super.getEditor(); - } - - @Override - public PsiFile getFile() { - return super.getFile(); - } - - protected final Collection myFilesToDelete = new THashSet<>(); - private final TempFiles myTempFiles = new TempFiles(myFilesToDelete); - - @Override - protected void tearDown() throws Exception { - myTempFiles.deleteAll(); - super.tearDown(); - } - - @NotNull - public VirtualFile createTempFile( - @NonNls @NotNull String ext, - @Nullable byte[] bom, - @NonNls @NotNull String content, - @NotNull Charset charset - ) throws IOException { - File temp = FileUtil.createTempFile("copy", "." + ext); - setContentOnDisk(temp, bom, content, charset); - - myFilesToDelete.add(temp); - final VirtualFile file = getVirtualFile(temp); - assert file != null : temp; - return file; - } - - public static void setContentOnDisk(@NotNull File file, @Nullable byte[] bom, @NotNull String content, @NotNull Charset charset) - throws IOException { - FileOutputStream stream = new FileOutputStream(file); - if (bom != null) { - stream.write(bom); - } - try (OutputStreamWriter writer = new OutputStreamWriter(stream, charset)) { - writer.write(content); - } - } - - protected static VirtualFile getVirtualFile(@NotNull File file) { - return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file); - } - -} diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png index 4ee5ed4c31d..55a55a1e479 100644 Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png.181 b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png.181 new file mode 100644 index 00000000000..4ee5ed4c31d Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png.181 differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png.182 b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png.182 deleted file mode 100644 index 55a55a1e479..00000000000 Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png.182 and /dev/null differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png index a99be88744b..10aa0210d35 100644 Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png.181 b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png.181 new file mode 100644 index 00000000000..a99be88744b Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png.181 differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png.182 b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png.182 deleted file mode 100644 index 10aa0210d35..00000000000 Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png.182 and /dev/null differ diff --git a/idea/src/META-INF/git4idea.xml b/idea/src/META-INF/git4idea.xml index 1bb24d148a3..0b29d934eb1 100644 --- a/idea/src/META-INF/git4idea.xml +++ b/idea/src/META-INF/git4idea.xml @@ -1,4 +1,5 @@ + \ No newline at end of file diff --git a/idea/src/META-INF/git4idea.xml.181 b/idea/src/META-INF/git4idea.xml.181 new file mode 100644 index 00000000000..1bb24d148a3 --- /dev/null +++ b/idea/src/META-INF/git4idea.xml.181 @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/idea/src/META-INF/git4idea.xml.182 b/idea/src/META-INF/git4idea.xml.182 deleted file mode 100644 index 0b29d934eb1..00000000000 --- a/idea/src/META-INF/git4idea.xml.182 +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/idea/src/META-INF/gradle-java.xml.182 b/idea/src/META-INF/gradle-java.xml similarity index 100% rename from idea/src/META-INF/gradle-java.xml.182 rename to idea/src/META-INF/gradle-java.xml diff --git a/idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test.182 b/idea/src/META-INF/gradle-java.xml.181 similarity index 100% rename from idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test.182 rename to idea/src/META-INF/gradle-java.xml.181 diff --git a/idea/src/META-INF/gradle.xml b/idea/src/META-INF/gradle.xml index 4a607172849..561899e1ec7 100644 --- a/idea/src/META-INF/gradle.xml +++ b/idea/src/META-INF/gradle.xml @@ -1,20 +1,4 @@ - - - - - - - - - - - - - - - - @@ -23,69 +7,7 @@ interface="org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/src/META-INF/gradle.xml.181 b/idea/src/META-INF/gradle.xml.181 new file mode 100644 index 00000000000..4a607172849 --- /dev/null +++ b/idea/src/META-INF/gradle.xml.181 @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/src/META-INF/gradle.xml.182 b/idea/src/META-INF/gradle.xml.182 deleted file mode 100644 index 561899e1ec7..00000000000 --- a/idea/src/META-INF/gradle.xml.182 +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index c44273b2ddc..f7dceb6749f 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -13,16 +13,16 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. @snapshot@ JetBrains - + com.intellij.modules.platform - com.intellij.modules.remoteServers org.jetbrains.kotlin.native.platform.deps JUnit org.jetbrains.plugins.gradle + org.jetbrains.plugins.gradle.java org.jetbrains.idea.maven TestNG-J org.jetbrains.android @@ -34,6 +34,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. + com.intellij.modules.idea com.intellij.modules.java JavaScriptDebugger com.intellij.copyright @@ -3035,4 +3036,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. + + + + diff --git a/idea/src/META-INF/plugin.xml.182 b/idea/src/META-INF/plugin.xml.181 similarity index 99% rename from idea/src/META-INF/plugin.xml.182 rename to idea/src/META-INF/plugin.xml.181 index f7dceb6749f..c44273b2ddc 100644 --- a/idea/src/META-INF/plugin.xml.182 +++ b/idea/src/META-INF/plugin.xml.181 @@ -13,16 +13,16 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. @snapshot@ JetBrains - + com.intellij.modules.platform + com.intellij.modules.remoteServers org.jetbrains.kotlin.native.platform.deps JUnit org.jetbrains.plugins.gradle - org.jetbrains.plugins.gradle.java org.jetbrains.idea.maven TestNG-J org.jetbrains.android @@ -34,7 +34,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - com.intellij.modules.idea com.intellij.modules.java JavaScriptDebugger com.intellij.copyright @@ -3036,8 +3035,4 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - - - - diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index 5fdce1c143a..04255f041d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -30,6 +30,7 @@ import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.ex.MessagesEx +import com.intellij.openapi.util.Key import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileVisitor @@ -50,10 +51,13 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.j2k.ConverterSettings import org.jetbrains.kotlin.j2k.JavaToKotlinConverter import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.UserDataProperty import java.io.File import java.io.IOException import java.util.* +var VirtualFile.pathBeforeJ2K: String? by UserDataProperty(Key.create("PATH_BEFORE_J2K_CONVERSION")) + class JavaToKotlinAction : AnAction() { companion object { private fun uniqueKotlinFileName(javaFile: VirtualFile): String { @@ -88,6 +92,7 @@ class JavaToKotlinAction : AnAction() { } else { val fileName = uniqueKotlinFileName(virtualFile) + virtualFile.pathBeforeJ2K = virtualFile.path virtualFile.rename(this, fileName) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.182 b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 index 04255f041d9..5fdce1c143a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 @@ -30,7 +30,6 @@ import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.ex.MessagesEx -import com.intellij.openapi.util.Key import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileVisitor @@ -51,13 +50,10 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.j2k.ConverterSettings import org.jetbrains.kotlin.j2k.JavaToKotlinConverter import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.UserDataProperty import java.io.File import java.io.IOException import java.util.* -var VirtualFile.pathBeforeJ2K: String? by UserDataProperty(Key.create("PATH_BEFORE_J2K_CONVERSION")) - class JavaToKotlinAction : AnAction() { companion object { private fun uniqueKotlinFileName(javaFile: VirtualFile): String { @@ -92,7 +88,6 @@ class JavaToKotlinAction : AnAction() { } else { val fileName = uniqueKotlinFileName(virtualFile) - virtualFile.pathBeforeJ2K = virtualFile.path virtualFile.rename(this, fileName) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt index 34e7dbebefc..aa3d4ba524b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt @@ -74,7 +74,7 @@ abstract class KotlinGenerateTestSupportActionBase( val list = JBList(*frameworks.toTypedArray()) list.cellRenderer = TestFrameworkListCellRenderer() - PopupChooserBuilder(list) + PopupChooserBuilder(list) .setFilteringEnabled { (it as TestFramework).name } .setTitle("Choose Framework") .setItemChoosenCallback { consumer(list.selectedValue as TestFramework) } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt.182 b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt.181 similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt.181 index aa3d4ba524b..34e7dbebefc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt.181 @@ -74,7 +74,7 @@ abstract class KotlinGenerateTestSupportActionBase( val list = JBList(*frameworks.toTypedArray()) list.cellRenderer = TestFrameworkListCellRenderer() - PopupChooserBuilder(list) + PopupChooserBuilder(list) .setFilteringEnabled { (it as TestFramework).name } .setTitle("Choose Framework") .setItemChoosenCallback { consumer(list.selectedValue as TestFramework) } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt index b949ccc1c13..1a8aff86794 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt @@ -213,7 +213,7 @@ abstract class ImplementAbstractMemberIntentionBase : selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION cellRenderer = renderer } - val builder = PopupChooserBuilder(list) + val builder = PopupChooserBuilder(list) renderer.installSpeedSearch(builder) builder .setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title")) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt.182 b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt.181 similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt.181 index 1a8aff86794..b949ccc1c13 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt.181 @@ -213,7 +213,7 @@ abstract class ImplementAbstractMemberIntentionBase : selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION cellRenderer = renderer } - val builder = PopupChooserBuilder(list) + val builder = PopupChooserBuilder(list) renderer.installSpeedSearch(builder) builder .setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title")) diff --git a/idea/src/org/jetbrains/kotlin/idea/jvm/KotlinDeclarationSearcher.kt.182 b/idea/src/org/jetbrains/kotlin/idea/jvm/KotlinDeclarationSearcher.kt similarity index 100% rename from idea/src/org/jetbrains/kotlin/idea/jvm/KotlinDeclarationSearcher.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/jvm/KotlinDeclarationSearcher.kt diff --git a/idea/testData/refactoring/changeSignatureMultiModule/suspendImpls/before/JS/src/test/test.kt.182 b/idea/src/org/jetbrains/kotlin/idea/jvm/KotlinDeclarationSearcher.kt.181 similarity index 100% rename from idea/testData/refactoring/changeSignatureMultiModule/suspendImpls/before/JS/src/test/test.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/jvm/KotlinDeclarationSearcher.kt.181 diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt index 09d18141bbe..922f93ea6ba 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt @@ -43,7 +43,7 @@ object KotlinAddOrderEntryActionFactory : KotlinIntentionActionsFactory() { override fun getVariants() = PsiReference.EMPTY_ARRAY - override fun getRangeInElement(): TextRange? { + override fun getRangeInElement(): TextRange { val offset = simpleExpression.startOffset - refElement.startOffset return TextRange(offset, offset + simpleExpression.textLength) } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt.182 b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt.181 similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt.181 index 922f93ea6ba..09d18141bbe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt.181 @@ -43,7 +43,7 @@ object KotlinAddOrderEntryActionFactory : KotlinIntentionActionsFactory() { override fun getVariants() = PsiReference.EMPTY_ARRAY - override fun getRangeInElement(): TextRange { + override fun getRangeInElement(): TextRange? { val offset = simpleExpression.startOffset - refElement.startOffset return TextRange(offset, offset + simpleExpression.textLength) } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt index 71ddffb834f..f42539a01f9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.quickfix.crossLanguage +import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.QuickFixFactory import com.intellij.lang.jvm.JvmClass @@ -23,12 +24,15 @@ import com.intellij.lang.jvm.JvmElement import com.intellij.lang.jvm.JvmModifier import com.intellij.lang.jvm.JvmModifiersOwner import com.intellij.lang.jvm.actions.* +import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project +import com.intellij.openapi.util.text.StringUtilRt import com.intellij.psi.* import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration +import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.caches.resolve.KotlinCacheService @@ -38,7 +42,9 @@ import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor +import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.core.ShortenReferences import org.jetbrains.kotlin.idea.core.appendModifier import org.jetbrains.kotlin.idea.quickfix.AddModifierFix import org.jetbrains.kotlin.idea.quickfix.RemoveModifierFix @@ -61,6 +67,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeParameterImpl import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType import org.jetbrains.kotlin.resolve.annotations.JVM_FIELD_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME @@ -146,7 +153,7 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { val info = callableInfos.first() as PropertyInfo return buildString { append("Add '") - if (info.isLateinitPreferred) { + if (info.isLateinitPreferred || info.modifierList?.hasModifier(KtTokens.LATEINIT_KEYWORD) == true) { append("lateinit ") } append(if (info.writable) "var" else "val") @@ -345,30 +352,35 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { override fun createAddFieldActions(targetClass: JvmClass, request: CreateFieldRequest): List { val targetContainer = targetClass.toKtClassOrFile() ?: return emptyList() - val modifierBuilder = ModifierBuilder(targetContainer, allowJvmStatic = false).apply { - addJvmModifiers(request.modifiers) - addAnnotation(JVM_FIELD_ANNOTATION_FQ_NAME) - } - if (!modifierBuilder.isValid) return emptyList() - val resolutionFacade = targetContainer.getResolutionFacade() val typeInfo = request.fieldType.toKotlinTypeInfo(resolutionFacade) val writable = JvmModifier.FINAL !in request.modifiers - val propertyInfo = PropertyInfo( - request.fieldName, - TypeInfo.Empty, - typeInfo, - writable, - listOf(targetContainer), - isForCompanion = JvmModifier.STATIC in request.modifiers, - modifierList = modifierBuilder.modifierList, - withInitializer = true + + fun propertyInfo(lateinit: Boolean) = PropertyInfo( + request.fieldName, + TypeInfo.Empty, + typeInfo, + writable, + listOf(targetContainer), + isLateinitPreferred = false, // Dont set it to `lateinit` because it works via templates that brings issues in batch field adding + isForCompanion = JvmModifier.STATIC in request.modifiers, + modifierList = ModifierBuilder(targetContainer, allowJvmStatic = false).apply { + addJvmModifiers(request.modifiers) + if (modifierList.children.none { it.node.elementType in KtTokens.VISIBILITY_MODIFIERS }) + addJvmModifier(JvmModifier.PUBLIC) + if (lateinit) + modifierList.appendModifier(KtTokens.LATEINIT_KEYWORD) + if (!request.modifiers.contains(JvmModifier.PRIVATE) && !lateinit) + addAnnotation(JVM_FIELD_ANNOTATION_FQ_NAME) + }.modifierList, + withInitializer = !lateinit ) + val propertyInfos = if (writable) { - listOf(propertyInfo, propertyInfo.copyProperty(isLateinitPreferred = true)) + listOf(propertyInfo(false), propertyInfo(true)) } else { - listOf(propertyInfo) + listOf(propertyInfo(false)) } return propertyInfos.map { CreatePropertyFix(targetClass, targetContainer, it) } } @@ -404,6 +416,61 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { } return listOf(action) } + + override fun createAddAnnotationActions(target: JvmModifiersOwner, request: AnnotationRequest): List { + val declaration = (target as? KtLightElement<*, *>)?.kotlinOrigin as? KtModifierListOwner ?: return emptyList() + if (declaration.language != KotlinLanguage.INSTANCE) return emptyList() + return listOf(CreateAnnotationAction(declaration, request)) + } + + private class CreateAnnotationAction( + target: KtModifierListOwner, + val request: AnnotationRequest + ) : IntentionAction { + + private val pointer = target.createSmartPointer() + + override fun startInWriteAction(): Boolean = true + + override fun getText(): String = + QuickFixBundle.message("create.annotation.text", StringUtilRt.getShortName(request.qualifiedName)) + + override fun getFamilyName(): String = QuickFixBundle.message("create.annotation.family") + + override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean = pointer.element != null + + + override fun invoke(project: Project, editor: Editor?, file: PsiFile?) { + val target = pointer.element ?: return + val kotlinAnnotation = JavaPsiFacade.getInstance(project).findClass( + request.qualifiedName, + target.resolveScope + )?.language == KotlinLanguage.INSTANCE + val entry = target.addAnnotationEntry( + KtPsiFactory(target) + .createAnnotationEntry( + "@${request.qualifiedName}${ + request.attributes.mapIndexed { i, p -> + if (!kotlinAnnotation && i == 0 && p.name == "value") + renderAttributeValue(p.value).toString() + else + "${p.name} = ${renderAttributeValue(p.value)}" + }.joinToString(", ", "(", ")") + }" + ) + ) + + ShortenReferences.DEFAULT.process(entry) + } + + private fun renderAttributeValue(annotationAttributeRequest: AnnotationAttributeValueRequest) = + when (annotationAttributeRequest) { + is AnnotationAttributeValueRequest.PrimitiveValue -> annotationAttributeRequest.value + is AnnotationAttributeValueRequest.StringValue -> "\"" + annotationAttributeRequest.value + "\"" + } + + } + } private fun JvmPsiConversionHelper.asPsiType(param: Pair>): PsiType? = diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 similarity index 82% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 index f42539a01f9..71ddffb834f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt.181 @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.quickfix.crossLanguage -import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.QuickFixFactory import com.intellij.lang.jvm.JvmClass @@ -24,15 +23,12 @@ import com.intellij.lang.jvm.JvmElement import com.intellij.lang.jvm.JvmModifier import com.intellij.lang.jvm.JvmModifiersOwner import com.intellij.lang.jvm.actions.* -import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project -import com.intellij.openapi.util.text.StringUtilRt import com.intellij.psi.* import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration -import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.caches.resolve.KotlinCacheService @@ -42,9 +38,7 @@ import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor -import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.kotlin.idea.core.ShortenReferences import org.jetbrains.kotlin.idea.core.appendModifier import org.jetbrains.kotlin.idea.quickfix.AddModifierFix import org.jetbrains.kotlin.idea.quickfix.RemoveModifierFix @@ -67,7 +61,6 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeParameterImpl import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType import org.jetbrains.kotlin.resolve.annotations.JVM_FIELD_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME @@ -153,7 +146,7 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { val info = callableInfos.first() as PropertyInfo return buildString { append("Add '") - if (info.isLateinitPreferred || info.modifierList?.hasModifier(KtTokens.LATEINIT_KEYWORD) == true) { + if (info.isLateinitPreferred) { append("lateinit ") } append(if (info.writable) "var" else "val") @@ -352,35 +345,30 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { override fun createAddFieldActions(targetClass: JvmClass, request: CreateFieldRequest): List { val targetContainer = targetClass.toKtClassOrFile() ?: return emptyList() + val modifierBuilder = ModifierBuilder(targetContainer, allowJvmStatic = false).apply { + addJvmModifiers(request.modifiers) + addAnnotation(JVM_FIELD_ANNOTATION_FQ_NAME) + } + if (!modifierBuilder.isValid) return emptyList() + val resolutionFacade = targetContainer.getResolutionFacade() val typeInfo = request.fieldType.toKotlinTypeInfo(resolutionFacade) val writable = JvmModifier.FINAL !in request.modifiers - - fun propertyInfo(lateinit: Boolean) = PropertyInfo( - request.fieldName, - TypeInfo.Empty, - typeInfo, - writable, - listOf(targetContainer), - isLateinitPreferred = false, // Dont set it to `lateinit` because it works via templates that brings issues in batch field adding - isForCompanion = JvmModifier.STATIC in request.modifiers, - modifierList = ModifierBuilder(targetContainer, allowJvmStatic = false).apply { - addJvmModifiers(request.modifiers) - if (modifierList.children.none { it.node.elementType in KtTokens.VISIBILITY_MODIFIERS }) - addJvmModifier(JvmModifier.PUBLIC) - if (lateinit) - modifierList.appendModifier(KtTokens.LATEINIT_KEYWORD) - if (!request.modifiers.contains(JvmModifier.PRIVATE) && !lateinit) - addAnnotation(JVM_FIELD_ANNOTATION_FQ_NAME) - }.modifierList, - withInitializer = !lateinit + val propertyInfo = PropertyInfo( + request.fieldName, + TypeInfo.Empty, + typeInfo, + writable, + listOf(targetContainer), + isForCompanion = JvmModifier.STATIC in request.modifiers, + modifierList = modifierBuilder.modifierList, + withInitializer = true ) - val propertyInfos = if (writable) { - listOf(propertyInfo(false), propertyInfo(true)) + listOf(propertyInfo, propertyInfo.copyProperty(isLateinitPreferred = true)) } else { - listOf(propertyInfo(false)) + listOf(propertyInfo) } return propertyInfos.map { CreatePropertyFix(targetClass, targetContainer, it) } } @@ -416,61 +404,6 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { } return listOf(action) } - - override fun createAddAnnotationActions(target: JvmModifiersOwner, request: AnnotationRequest): List { - val declaration = (target as? KtLightElement<*, *>)?.kotlinOrigin as? KtModifierListOwner ?: return emptyList() - if (declaration.language != KotlinLanguage.INSTANCE) return emptyList() - return listOf(CreateAnnotationAction(declaration, request)) - } - - private class CreateAnnotationAction( - target: KtModifierListOwner, - val request: AnnotationRequest - ) : IntentionAction { - - private val pointer = target.createSmartPointer() - - override fun startInWriteAction(): Boolean = true - - override fun getText(): String = - QuickFixBundle.message("create.annotation.text", StringUtilRt.getShortName(request.qualifiedName)) - - override fun getFamilyName(): String = QuickFixBundle.message("create.annotation.family") - - override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean = pointer.element != null - - - override fun invoke(project: Project, editor: Editor?, file: PsiFile?) { - val target = pointer.element ?: return - val kotlinAnnotation = JavaPsiFacade.getInstance(project).findClass( - request.qualifiedName, - target.resolveScope - )?.language == KotlinLanguage.INSTANCE - val entry = target.addAnnotationEntry( - KtPsiFactory(target) - .createAnnotationEntry( - "@${request.qualifiedName}${ - request.attributes.mapIndexed { i, p -> - if (!kotlinAnnotation && i == 0 && p.name == "value") - renderAttributeValue(p.value).toString() - else - "${p.name} = ${renderAttributeValue(p.value)}" - }.joinToString(", ", "(", ")") - }" - ) - ) - - ShortenReferences.DEFAULT.process(entry) - } - - private fun renderAttributeValue(annotationAttributeRequest: AnnotationAttributeValueRequest) = - when (annotationAttributeRequest) { - is AnnotationAttributeValueRequest.PrimitiveValue -> annotationAttributeRequest.value - is AnnotationAttributeValueRequest.StringValue -> "\"" + annotationAttributeRequest.value + "\"" - } - - } - } private fun JvmPsiConversionHelper.asPsiType(param: Pair>): PsiType? = diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index b78893fa42d..f505819cb07 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -263,7 +263,7 @@ fun getPsiElementPopup( } } - return with(PopupChooserBuilder(list)) { + return with(PopupChooserBuilder(list)) { title?.let { setTitle(it) } renderer.installSpeedSearch(this, true) setItemChoosenCallback { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 index f505819cb07..b78893fa42d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 @@ -263,7 +263,7 @@ fun getPsiElementPopup( } } - return with(PopupChooserBuilder(list)) { + return with(PopupChooserBuilder(list)) { title?.let { setTitle(it) } renderer.installSpeedSearch(this, true) setItemChoosenCallback { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt index 7ef8e91c293..c13b27c8959 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt @@ -34,22 +34,22 @@ class KotlinRenameDispatcherHandler : RenameHandler { private val handlers: Array get() = Extensions.getExtensions(EP_NAME) } - internal fun getRenameHandler(dataContext: DataContext?): RenameHandler? { + internal fun getRenameHandler(dataContext: DataContext): RenameHandler? { val availableHandlers = handlers.filterTo(LinkedHashSet()) { it.isRenaming(dataContext) } availableHandlers.singleOrNull()?.let { return it } availableHandlers.firstIsInstanceOrNull()?.let { availableHandlers -= it } return availableHandlers.firstOrNull() } - override fun isAvailableOnDataContext(dataContext: DataContext?) = handlers.any { it.isAvailableOnDataContext(dataContext) } + override fun isAvailableOnDataContext(dataContext: DataContext) = handlers.any { it.isAvailableOnDataContext(dataContext) } - override fun isRenaming(dataContext: DataContext?) = isAvailableOnDataContext(dataContext) + override fun isRenaming(dataContext: DataContext) = isAvailableOnDataContext(dataContext) - override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { + override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) } - override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 similarity index 86% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 index c13b27c8959..7ef8e91c293 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 @@ -34,22 +34,22 @@ class KotlinRenameDispatcherHandler : RenameHandler { private val handlers: Array get() = Extensions.getExtensions(EP_NAME) } - internal fun getRenameHandler(dataContext: DataContext): RenameHandler? { + internal fun getRenameHandler(dataContext: DataContext?): RenameHandler? { val availableHandlers = handlers.filterTo(LinkedHashSet()) { it.isRenaming(dataContext) } availableHandlers.singleOrNull()?.let { return it } availableHandlers.firstIsInstanceOrNull()?.let { availableHandlers -= it } return availableHandlers.firstOrNull() } - override fun isAvailableOnDataContext(dataContext: DataContext) = handlers.any { it.isAvailableOnDataContext(dataContext) } + override fun isAvailableOnDataContext(dataContext: DataContext?) = handlers.any { it.isAvailableOnDataContext(dataContext) } - override fun isRenaming(dataContext: DataContext) = isAvailableOnDataContext(dataContext) + override fun isRenaming(dataContext: DataContext?) = isAvailableOnDataContext(dataContext) - override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { + override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) } - override fun invoke(project: Project, elements: Array, dataContext: DataContext) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt index 5344790704f..0faed3abeb3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt @@ -42,7 +42,7 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { editor: Editor, currentName: String, oldName: String - ) : super(elementToRename, editor, editor.project, currentName, oldName) + ) : super(elementToRename, editor, editor.project!!, currentName, oldName) override fun acceptReference(reference: PsiReference): Boolean { val refElement = reference.element diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 index 0faed3abeb3..5344790704f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 @@ -42,7 +42,7 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { editor: Editor, currentName: String, oldName: String - ) : super(elementToRename, editor, editor.project!!, currentName, oldName) + ) : super(elementToRename, editor, editor.project, currentName, oldName) override fun acceptReference(reference: PsiReference): Boolean { val refElement = reference.element diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt index 429a0cfb1cd..0736e42c3ad 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt @@ -37,7 +37,7 @@ class RenameBackingFieldReferenceHandler: KotlinVariableInplaceRenameHandler() { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to backing field reference", "Rename", null) } - override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext) { // Do nothing: this method is called not from editor } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt.181 similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt.181 index 0736e42c3ad..429a0cfb1cd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameBackingFieldReferenceHandler.kt.181 @@ -37,7 +37,7 @@ class RenameBackingFieldReferenceHandler: KotlinVariableInplaceRenameHandler() { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to backing field reference", "Rename", null) } - override fun invoke(project: Project, elements: Array, dataContext: DataContext) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { // Do nothing: this method is called not from editor } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt index f25b34c26e9..1cd984b5101 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt @@ -40,7 +40,7 @@ class RenameDynamicMemberHandler: KotlinVariableInplaceRenameHandler() { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to dynamically invoked members", "Rename", null) } - override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext) { // Do nothing: this method is called not from editor } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt.181 similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt.181 index 1cd984b5101..f25b34c26e9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt.181 @@ -40,7 +40,7 @@ class RenameDynamicMemberHandler: KotlinVariableInplaceRenameHandler() { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to dynamically invoked members", "Rename", null) } - override fun invoke(project: Project, elements: Array, dataContext: DataContext) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { // Do nothing: this method is called not from editor } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt index 0223d7fd33d..69899681368 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt @@ -40,7 +40,7 @@ class RenameKotlinImplicitLambdaParameter : KotlinVariableInplaceRenameHandler() } } - override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext) { // Do nothing: this method is called not from editor } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt.181 similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt.181 index 69899681368..0223d7fd33d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt.181 @@ -40,7 +40,7 @@ class RenameKotlinImplicitLambdaParameter : KotlinVariableInplaceRenameHandler() } } - override fun invoke(project: Project, elements: Array, dataContext: DataContext) { + override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { // Do nothing: this method is called not from editor } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt index 9ccdea1addf..21e7d4bb786 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt @@ -29,9 +29,7 @@ import org.jetbrains.kotlin.psi.* class RenameOnSecondaryConstructorHandler : RenameHandler { - override fun isAvailableOnDataContext(dataContext: DataContext?): Boolean { - if (dataContext == null) return false - + override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: return false val file = CommonDataKeys.PSI_FILE.getData(dataContext) ?: return false @@ -42,7 +40,7 @@ class RenameOnSecondaryConstructorHandler : RenameHandler { return element != null } - override fun isRenaming(dataContext: DataContext?): Boolean = isAvailableOnDataContext(dataContext) + override fun isRenaming(dataContext: DataContext): Boolean = isAvailableOnDataContext(dataContext) override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt.181 similarity index 92% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt.181 index 21e7d4bb786..9ccdea1addf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt.181 @@ -29,7 +29,9 @@ import org.jetbrains.kotlin.psi.* class RenameOnSecondaryConstructorHandler : RenameHandler { - override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { + override fun isAvailableOnDataContext(dataContext: DataContext?): Boolean { + if (dataContext == null) return false + val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: return false val file = CommonDataKeys.PSI_FILE.getData(dataContext) ?: return false @@ -40,7 +42,7 @@ class RenameOnSecondaryConstructorHandler : RenameHandler { return element != null } - override fun isRenaming(dataContext: DataContext): Boolean = isAvailableOnDataContext(dataContext) + override fun isRenaming(dataContext: DataContext?): Boolean = isAvailableOnDataContext(dataContext) override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt index 82bc397664d..da3f102f65d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt @@ -18,15 +18,14 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { - override fun isAvailableOnDataContext(dataContext: DataContext?): Boolean { - if (dataContext == null) return false + override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { val file = CommonDataKeys.PSI_FILE.getData(dataContext) ?: return false val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: return false val refExpression = file.findElementForRename(editor.caretModel.offset) ?: return false return (refExpression.resolveToCall()?.resultingDescriptor)?.isSynthesized ?: false } - override fun isRenaming(dataContext: DataContext?) = isAvailableOnDataContext(dataContext) + override fun isRenaming(dataContext: DataContext) = isAvailableOnDataContext(dataContext) override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to synthetic declaration", "Rename", null) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.182 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 similarity index 91% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 index da3f102f65d..82bc397664d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 @@ -18,14 +18,15 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { - override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { + override fun isAvailableOnDataContext(dataContext: DataContext?): Boolean { + if (dataContext == null) return false val file = CommonDataKeys.PSI_FILE.getData(dataContext) ?: return false val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: return false val refExpression = file.findElementForRename(editor.caretModel.offset) ?: return false return (refExpression.resolveToCall()?.resultingDescriptor)?.isSynthesized ?: false } - override fun isRenaming(dataContext: DataContext) = isAvailableOnDataContext(dataContext) + override fun isRenaming(dataContext: DataContext?) = isAvailableOnDataContext(dataContext) override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to synthetic declaration", "Rename", null) diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt index 8c69c6ac451..add6789767a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt @@ -75,8 +75,6 @@ sealed class KotlinUsageContextDataFlowPanelBase( override fun isToShowPreviewButton() = false - override fun isToShowCloseButton() = false - override fun isAutoScroll() = false override fun setAutoScroll(autoScroll: Boolean) {} diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.182 b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.181 similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.181 index add6789767a..8c69c6ac451 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.181 @@ -75,6 +75,8 @@ sealed class KotlinUsageContextDataFlowPanelBase( override fun isToShowPreviewButton() = false + override fun isToShowCloseButton() = false + override fun isAutoScroll() = false override fun setAutoScroll(autoScroll: Boolean) {} diff --git a/idea/testData/inspections/removeToStringInStringTemplate/inspectionData/expected.xml b/idea/testData/inspections/removeToStringInStringTemplate/inspectionData/expected.xml.181 similarity index 100% rename from idea/testData/inspections/removeToStringInStringTemplate/inspectionData/expected.xml rename to idea/testData/inspections/removeToStringInStringTemplate/inspectionData/expected.xml.181 diff --git a/idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test b/idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test.181 similarity index 100% rename from idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test rename to idea/testData/inspections/twoSetOfTypeparameters/inspectionData/inspections.test.181 diff --git a/idea/testData/refactoring/changeSignatureMultiModule/suspendImpls/before/JS/src/test/test.kt b/idea/testData/refactoring/changeSignatureMultiModule/suspendImpls/before/JS/src/test/test.kt.181 similarity index 100% rename from idea/testData/refactoring/changeSignatureMultiModule/suspendImpls/before/JS/src/test/test.kt rename to idea/testData/refactoring/changeSignatureMultiModule/suspendImpls/before/JS/src/test/test.kt.181 diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt index 46f2a10fae6..16a65845444 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt @@ -193,32 +193,6 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY -> jarFromDist } - protected fun configure(module: Module, jarState: FileState, configurator: KotlinProjectConfigurator) { - if (configurator is KotlinJavaModuleConfigurator) { - configure(listOf(module), jarState, - configurator as KotlinWithLibraryConfigurator, - pathToExistentRuntimeJar, pathToNonexistentRuntimeJar) - } - if (configurator is KotlinJsModuleConfigurator) { - configure(listOf(module), jarState, - configurator as KotlinWithLibraryConfigurator, - pathToExistentJsJar, pathToNonexistentJsJar) - } - } - - private val pathToNonexistentRuntimeJar: String - get() { - val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/kotlin-runtime.jar" - PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) - return pathToTempKotlinRuntimeJar - } - - private val pathToNonexistentJsJar: String - get() { - val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME - PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) - return pathToTempKotlinRuntimeJar - } private val pathToExistentRuntimeJar: String get() = PathUtil.kotlinPathsForDistDirectory.stdlibPath.parent @@ -256,6 +230,37 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { } } + protected fun configure(module: Module, jarState: FileState, configurator: KotlinProjectConfigurator) { + if (configurator is KotlinJavaModuleConfigurator) { + configure( + listOf(module), jarState, + configurator as KotlinWithLibraryConfigurator, + pathToExistentRuntimeJar, pathToNonexistentRuntimeJar + ) + } + if (configurator is KotlinJsModuleConfigurator) { + configure( + listOf(module), jarState, + configurator as KotlinWithLibraryConfigurator, + pathToExistentJsJar, pathToNonexistentJsJar + ) + } + } + + private val pathToNonexistentRuntimeJar: String + get() { + val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/kotlin-runtime.jar" + myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) + return pathToTempKotlinRuntimeJar + } + + private val pathToNonexistentJsJar: String + get() { + val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME + myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) + return pathToTempKotlinRuntimeJar + } + override fun getTestProjectJdk(): Sdk { val projectRootManager = ProjectRootManager.getInstance(project) return projectRootManager.projectSdk ?: throw IllegalStateException("SDK ${projectRootManager.projectSdkName} was not found") diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.181 similarity index 87% rename from idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.181 index 16a65845444..46f2a10fae6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.181 @@ -193,6 +193,32 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY -> jarFromDist } + protected fun configure(module: Module, jarState: FileState, configurator: KotlinProjectConfigurator) { + if (configurator is KotlinJavaModuleConfigurator) { + configure(listOf(module), jarState, + configurator as KotlinWithLibraryConfigurator, + pathToExistentRuntimeJar, pathToNonexistentRuntimeJar) + } + if (configurator is KotlinJsModuleConfigurator) { + configure(listOf(module), jarState, + configurator as KotlinWithLibraryConfigurator, + pathToExistentJsJar, pathToNonexistentJsJar) + } + } + + private val pathToNonexistentRuntimeJar: String + get() { + val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/kotlin-runtime.jar" + PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) + return pathToTempKotlinRuntimeJar + } + + private val pathToNonexistentJsJar: String + get() { + val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME + PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) + return pathToTempKotlinRuntimeJar + } private val pathToExistentRuntimeJar: String get() = PathUtil.kotlinPathsForDistDirectory.stdlibPath.parent @@ -230,37 +256,6 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { } } - protected fun configure(module: Module, jarState: FileState, configurator: KotlinProjectConfigurator) { - if (configurator is KotlinJavaModuleConfigurator) { - configure( - listOf(module), jarState, - configurator as KotlinWithLibraryConfigurator, - pathToExistentRuntimeJar, pathToNonexistentRuntimeJar - ) - } - if (configurator is KotlinJsModuleConfigurator) { - configure( - listOf(module), jarState, - configurator as KotlinWithLibraryConfigurator, - pathToExistentJsJar, pathToNonexistentJsJar - ) - } - } - - private val pathToNonexistentRuntimeJar: String - get() { - val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/kotlin-runtime.jar" - myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) - return pathToTempKotlinRuntimeJar - } - - private val pathToNonexistentJsJar: String - get() { - val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME - myFilesToDelete.add(File(pathToTempKotlinRuntimeJar)) - return pathToTempKotlinRuntimeJar - } - override fun getTestProjectJdk(): Sdk { val projectRootManager = ProjectRootManager.getInstance(project) return projectRootManager.projectSdk ?: throw IllegalStateException("SDK ${projectRootManager.projectSdkName} was not found") diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java index 449b59c4b5d..fa3e7cb1485 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java @@ -98,12 +98,12 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { Module[] modules = getModules(); for (Module module : modules) { if (module.getName().equals("module1")) { - Companion.configure(module, KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY, Companion.getJAVA_CONFIGURATOR()); + configure(module, KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY, Companion.getJAVA_CONFIGURATOR()); Companion.assertConfigured(module, Companion.getJAVA_CONFIGURATOR()); } else if (module.getName().equals("module2")) { Companion.assertNotConfigured(module, Companion.getJAVA_CONFIGURATOR()); - Companion.configure(module, KotlinWithLibraryConfigurator.FileState.EXISTS, Companion.getJAVA_CONFIGURATOR()); + configure(module, KotlinWithLibraryConfigurator.FileState.EXISTS, Companion.getJAVA_CONFIGURATOR()); Companion.assertConfigured(module, Companion.getJAVA_CONFIGURATOR()); } } @@ -157,7 +157,7 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { } public void testJsLibraryWrongKind() { - AbstractConfigureKotlinTest.Companion.assertProperlyConfigured(getModule(), AbstractConfigureKotlinTest.Companion.getJS_CONFIGURATOR()); + doTestOneJsModule(KotlinWithLibraryConfigurator.FileState.EXISTS); assertEquals(1, ModuleRootManager.getInstance(getModule()).orderEntries().process(new LibraryCountingRootPolicy(), 0).intValue()); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.182 b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 similarity index 97% rename from idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.182 rename to idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 index fa3e7cb1485..449b59c4b5d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 @@ -98,12 +98,12 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { Module[] modules = getModules(); for (Module module : modules) { if (module.getName().equals("module1")) { - configure(module, KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY, Companion.getJAVA_CONFIGURATOR()); + Companion.configure(module, KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY, Companion.getJAVA_CONFIGURATOR()); Companion.assertConfigured(module, Companion.getJAVA_CONFIGURATOR()); } else if (module.getName().equals("module2")) { Companion.assertNotConfigured(module, Companion.getJAVA_CONFIGURATOR()); - configure(module, KotlinWithLibraryConfigurator.FileState.EXISTS, Companion.getJAVA_CONFIGURATOR()); + Companion.configure(module, KotlinWithLibraryConfigurator.FileState.EXISTS, Companion.getJAVA_CONFIGURATOR()); Companion.assertConfigured(module, Companion.getJAVA_CONFIGURATOR()); } } @@ -157,7 +157,7 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { } public void testJsLibraryWrongKind() { - doTestOneJsModule(KotlinWithLibraryConfigurator.FileState.EXISTS); + AbstractConfigureKotlinTest.Companion.assertProperlyConfigured(getModule(), AbstractConfigureKotlinTest.Companion.getJS_CONFIGURATOR()); assertEquals(1, ModuleRootManager.getInstance(getModule()).orderEntries().process(new LibraryCountingRootPolicy(), 0).intValue()); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt index 3c512431aac..e2fc31f0346 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt @@ -45,6 +45,13 @@ internal class KotlinOutputChecker( private val JDI_BUG_OUTPUT_PATTERN_2 = Regex("JDWP\\s+exit\\s+error\\s+AGENT_ERROR_NO_JNI_ENV.*]") } + private lateinit var myTestName: String + + override fun init(testName: String) { + super.init(testName) + this.myTestName = Character.toLowerCase(testName[0]) + testName.substring(1) + } + // Copied from the base OutputChecker.checkValid(). Need to intercept call to base preprocessBuffer() method override fun checkValid(jdk: Sdk, sortClassPath: Boolean) { if (IdeaLogger.ourErrorsOccurred != null) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt.181 similarity index 96% rename from idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt.181 index e2fc31f0346..3c512431aac 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinOutputChecker.kt.181 @@ -45,13 +45,6 @@ internal class KotlinOutputChecker( private val JDI_BUG_OUTPUT_PATTERN_2 = Regex("JDWP\\s+exit\\s+error\\s+AGENT_ERROR_NO_JNI_ENV.*]") } - private lateinit var myTestName: String - - override fun init(testName: String) { - super.init(testName) - this.myTestName = Character.toLowerCase(testName[0]) + testName.substring(1) - } - // Copied from the base OutputChecker.checkValid(). Need to intercept call to base preprocessBuffer() method override fun checkValid(jdk: Sdk, sortClassPath: Boolean) { if (IdeaLogger.ourErrorsOccurred != null) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java index 9e33ade96ad..05494e802d3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java @@ -76,7 +76,7 @@ public abstract class AbstractKotlinFoldingTest extends KotlinLightCodeInsightFi private void doExpandSettingsTest(String fileText) { try { - VirtualFile tempFile = PlatformTestCase.createTempFile("kt", null, fileText, Charset.defaultCharset()); + VirtualFile tempFile = createTempFile("kt", null, fileText, Charset.defaultCharset()); assertFoldingRegionsForFile(tempFile.getPath()); } catch (IOException e) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java.182 b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java.181 similarity index 97% rename from idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java.182 rename to idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java.181 index 05494e802d3..9e33ade96ad 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java.181 @@ -76,7 +76,7 @@ public abstract class AbstractKotlinFoldingTest extends KotlinLightCodeInsightFi private void doExpandSettingsTest(String fileText) { try { - VirtualFile tempFile = createTempFile("kt", null, fileText, Charset.defaultCharset()); + VirtualFile tempFile = PlatformTestCase.createTempFile("kt", null, fileText, Charset.defaultCharset()); assertFoldingRegionsForFile(tempFile.getPath()); } catch (IOException e) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt similarity index 100% rename from idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt diff --git a/ultimate/resources/META-INF/kotlin-spring.xml.182 b/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt.181 similarity index 100% rename from ultimate/resources/META-INF/kotlin-spring.xml.182 rename to idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt.181 diff --git a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt index 3bac7699ec1..2b5053783e4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt @@ -107,7 +107,7 @@ private fun setupJsTestOutput(module: Module) { } private fun AbstractMultiModuleTest.createModule(name: String): Module { - val moduleDir = PlatformTestCase.createTempDir("") + val moduleDir = createTempDir("") val module = createModule(moduleDir.toString() + "/" + name, StdModuleTypes.JAVA) val root = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(moduleDir) TestCase.assertNotNull(root) diff --git a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt.181 similarity index 99% rename from idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt.181 index 2b5053783e4..3bac7699ec1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt.181 @@ -107,7 +107,7 @@ private fun setupJsTestOutput(module: Module) { } private fun AbstractMultiModuleTest.createModule(name: String): Module { - val moduleDir = createTempDir("") + val moduleDir = PlatformTestCase.createTempDir("") val module = createModule(moduleDir.toString() + "/" + name, StdModuleTypes.JAVA) val root = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(moduleDir) TestCase.assertNotNull(root) diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt index 504c9448f77..42988bce5cb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt @@ -17,21 +17,21 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction +import com.intellij.lang.jvm.JvmClass import com.intellij.lang.jvm.JvmElement import com.intellij.lang.jvm.JvmModifier import com.intellij.lang.jvm.actions.* import com.intellij.lang.jvm.types.JvmSubstitutor import com.intellij.openapi.project.Project import com.intellij.openapi.util.Pair.pair -import com.intellij.psi.JavaPsiFacade -import com.intellij.psi.PsiJvmSubstitutor -import com.intellij.psi.PsiSubstitutor -import com.intellij.psi.PsiType +import com.intellij.psi.* import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.psi.KtModifierListOwner import org.jetbrains.uast.UParameter import org.jetbrains.uast.UastContext import org.jetbrains.uast.toUElement @@ -44,9 +44,11 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private val modifiers: Collection = emptyList(), private val returnType: ExpectedTypes = emptyList(), private val annotations: Collection = emptyList(), - private val parameters: List>> = emptyList(), + parameters: List = emptyList(), private val targetSubstitutor: JvmSubstitutor = PsiJvmSubstitutor(project, PsiSubstitutor.EMPTY) ) : CreateMethodRequest { + private val expectedParameters = parameters + override fun getTargetSubstitutor(): JvmSubstitutor = targetSubstitutor override fun getModifiers() = modifiers @@ -55,7 +57,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { override fun getAnnotations() = annotations - override fun getParameters() = parameters + override fun getExpectedParameters(): List = expectedParameters override fun getReturnType() = returnType @@ -181,6 +183,71 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { ) } + fun testAddAnnotation() { + myFixture.configureByText( + "foo.kt", """class Foo { + | fun bar(){} + |}""".trim().trimMargin() + ) + + myFixture.launchAction( + createAddAnnotationActions( + myFixture.findElementByText("bar", KtModifierListOwner::class.java).toLightElements().single() as PsiMethod, + annotationRequest("kotlin.jvm.JvmName", stringAttribute("name", "foo")) + ).single() + ) + myFixture.checkResult( + """class Foo { + | @JvmName(name = "foo") + | fun bar(){} + |}""".trim().trimMargin(), true + ) + } + + fun testAddJavaAnnotationValue() { + + myFixture.addFileToProject( + "pkg/myannotation/JavaAnnotation.java", """ + package pkg.myannotation + + public @interface JavaAnnotation { + String value(); + int param() default 0; + } + """.trimIndent() + ) + + myFixture.configureByText( + "foo.kt", """class Foo { + | fun bar(){} + | fun baz(){} + |}""".trim().trimMargin() + ) + + myFixture.launchAction( + createAddAnnotationActions( + myFixture.findElementByText("bar", KtModifierListOwner::class.java).toLightElements().single() as PsiMethod, + annotationRequest("pkg.myannotation.JavaAnnotation", stringAttribute("value", "foo"), intAttribute("param", 2)) + ).single() + ) + myFixture.launchAction( + createAddAnnotationActions( + myFixture.findElementByText("baz", KtModifierListOwner::class.java).toLightElements().single() as PsiMethod, + annotationRequest("pkg.myannotation.JavaAnnotation", intAttribute("param", 2), stringAttribute("value", "foo")) + ).single() + ) + myFixture.checkResult( + """import pkg.myannotation.JavaAnnotation + | + |class Foo { + | @JavaAnnotation("foo", param = 2) + | fun bar(){} + | @JavaAnnotation(param = 2, value = "foo") + | fun baz(){} + |}""".trim().trimMargin(), true + ) + } + fun testDontMakePublicPublic() { myFixture.configureByText( "foo.kt", """class Foo { @@ -380,6 +447,68 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { """.trim().trimMargin(), true) } + fun testAddStringVarField() { + myFixture.configureByText( + "foo.kt", """ + |class Foo { + | fun bar() {} + |} + """.trim().trimMargin() + ) + myFixture.launchAction( + createFieldActions( + myFixture.atCaret(), + FieldRequest(project, emptyList(), "java.util.Date", "baz") + ).findWithText("Add 'var' property 'baz' to 'Foo'") + ) + myFixture.checkResult( + """ + |import java.util.Date + | + |class Foo { + | @JvmField + | var baz: Date = TODO("initialize me") + | + | fun bar() {} + |} + """.trim().trimMargin(), true + ) + } + + fun testAddLateInitStringVarField() { + myFixture.configureByText( + "foo.kt", """ + |class Foo { + | fun bar() {} + |} + """.trim().trimMargin() + ) + + myFixture.launchAction( + createFieldActions( + myFixture.atCaret(), + FieldRequest(project, listOf(JvmModifier.PRIVATE), "java.lang.String", "baz") + ).findWithText("Add 'lateinit var' property 'baz' to 'Foo'") + ) + myFixture.checkResult( + """ + |class Foo { + | private lateinit var baz: String + | + | fun bar() {} + |} + """.trim().trimMargin(), true + ) + } + + + + private fun createPropertyActions(atCaret: JvmClass, property: MemberRequest.Property): List = + com.intellij.lang.jvm.actions.EP_NAME.extensions.flatMap { it.createAddPropertyActions(atCaret, property) } + + private fun createFieldActions(atCaret: JvmClass, fieldRequest: CreateFieldRequest): List = + com.intellij.lang.jvm.actions.EP_NAME.extensions.flatMap { it.createAddFieldActions(atCaret, fieldRequest) } + fun testAddStringValProperty() { myFixture.configureByText("foo.kt", """ |class Foo { @@ -418,7 +547,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private fun expectedTypes(vararg psiTypes: PsiType) = psiTypes.map { expectedType(it) } private fun expectedParams(vararg psyTypes: PsiType) = - psyTypes.mapIndexed { index, psiType -> NameInfo("param$index") to expectedTypes(psiType) } + psyTypes.mapIndexed { index, psiType -> expectedParameter(expectedTypes(psiType), "param$index") } private inline fun CodeInsightTestFixture.atCaret() = elementAtCaret.toUElement() as T @@ -426,5 +555,28 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private fun List.findWithText(text: String): IntentionAction = this.firstOrNull { it.text == text } ?: Assert.fail("intention with text '$text' was not found, only ${this.joinToString { "\"${it.text}\"" }} available") as Nothing + + class FieldRequest( + private val project: Project, + val modifiers: List, + val type: String, + val name: String + ) : CreateFieldRequest { + override fun getTargetSubstitutor(): JvmSubstitutor = PsiJvmSubstitutor(project, PsiSubstitutor.EMPTY) + + override fun getModifiers(): Collection = modifiers + + override fun isConstant(): Boolean = false + + override fun getFieldType(): List = + com.intellij.lang.jvm.actions.expectedTypes(PsiType.getTypeByName(type, project, project.allScope())) + + override fun getFieldName(): String = name + + override fun isValid(): Boolean = true + } + + } + diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 similarity index 72% rename from idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 index 42988bce5cb..504c9448f77 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 @@ -17,21 +17,21 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction -import com.intellij.lang.jvm.JvmClass import com.intellij.lang.jvm.JvmElement import com.intellij.lang.jvm.JvmModifier import com.intellij.lang.jvm.actions.* import com.intellij.lang.jvm.types.JvmSubstitutor import com.intellij.openapi.project.Project import com.intellij.openapi.util.Pair.pair -import com.intellij.psi.* +import com.intellij.psi.JavaPsiFacade +import com.intellij.psi.PsiJvmSubstitutor +import com.intellij.psi.PsiSubstitutor +import com.intellij.psi.PsiType import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase -import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor -import org.jetbrains.kotlin.psi.KtModifierListOwner import org.jetbrains.uast.UParameter import org.jetbrains.uast.UastContext import org.jetbrains.uast.toUElement @@ -44,11 +44,9 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private val modifiers: Collection = emptyList(), private val returnType: ExpectedTypes = emptyList(), private val annotations: Collection = emptyList(), - parameters: List = emptyList(), + private val parameters: List>> = emptyList(), private val targetSubstitutor: JvmSubstitutor = PsiJvmSubstitutor(project, PsiSubstitutor.EMPTY) ) : CreateMethodRequest { - private val expectedParameters = parameters - override fun getTargetSubstitutor(): JvmSubstitutor = targetSubstitutor override fun getModifiers() = modifiers @@ -57,7 +55,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { override fun getAnnotations() = annotations - override fun getExpectedParameters(): List = expectedParameters + override fun getParameters() = parameters override fun getReturnType() = returnType @@ -183,71 +181,6 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { ) } - fun testAddAnnotation() { - myFixture.configureByText( - "foo.kt", """class Foo { - | fun bar(){} - |}""".trim().trimMargin() - ) - - myFixture.launchAction( - createAddAnnotationActions( - myFixture.findElementByText("bar", KtModifierListOwner::class.java).toLightElements().single() as PsiMethod, - annotationRequest("kotlin.jvm.JvmName", stringAttribute("name", "foo")) - ).single() - ) - myFixture.checkResult( - """class Foo { - | @JvmName(name = "foo") - | fun bar(){} - |}""".trim().trimMargin(), true - ) - } - - fun testAddJavaAnnotationValue() { - - myFixture.addFileToProject( - "pkg/myannotation/JavaAnnotation.java", """ - package pkg.myannotation - - public @interface JavaAnnotation { - String value(); - int param() default 0; - } - """.trimIndent() - ) - - myFixture.configureByText( - "foo.kt", """class Foo { - | fun bar(){} - | fun baz(){} - |}""".trim().trimMargin() - ) - - myFixture.launchAction( - createAddAnnotationActions( - myFixture.findElementByText("bar", KtModifierListOwner::class.java).toLightElements().single() as PsiMethod, - annotationRequest("pkg.myannotation.JavaAnnotation", stringAttribute("value", "foo"), intAttribute("param", 2)) - ).single() - ) - myFixture.launchAction( - createAddAnnotationActions( - myFixture.findElementByText("baz", KtModifierListOwner::class.java).toLightElements().single() as PsiMethod, - annotationRequest("pkg.myannotation.JavaAnnotation", intAttribute("param", 2), stringAttribute("value", "foo")) - ).single() - ) - myFixture.checkResult( - """import pkg.myannotation.JavaAnnotation - | - |class Foo { - | @JavaAnnotation("foo", param = 2) - | fun bar(){} - | @JavaAnnotation(param = 2, value = "foo") - | fun baz(){} - |}""".trim().trimMargin(), true - ) - } - fun testDontMakePublicPublic() { myFixture.configureByText( "foo.kt", """class Foo { @@ -447,68 +380,6 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { """.trim().trimMargin(), true) } - fun testAddStringVarField() { - myFixture.configureByText( - "foo.kt", """ - |class Foo { - | fun bar() {} - |} - """.trim().trimMargin() - ) - myFixture.launchAction( - createFieldActions( - myFixture.atCaret(), - FieldRequest(project, emptyList(), "java.util.Date", "baz") - ).findWithText("Add 'var' property 'baz' to 'Foo'") - ) - myFixture.checkResult( - """ - |import java.util.Date - | - |class Foo { - | @JvmField - | var baz: Date = TODO("initialize me") - | - | fun bar() {} - |} - """.trim().trimMargin(), true - ) - } - - fun testAddLateInitStringVarField() { - myFixture.configureByText( - "foo.kt", """ - |class Foo { - | fun bar() {} - |} - """.trim().trimMargin() - ) - - myFixture.launchAction( - createFieldActions( - myFixture.atCaret(), - FieldRequest(project, listOf(JvmModifier.PRIVATE), "java.lang.String", "baz") - ).findWithText("Add 'lateinit var' property 'baz' to 'Foo'") - ) - myFixture.checkResult( - """ - |class Foo { - | private lateinit var baz: String - | - | fun bar() {} - |} - """.trim().trimMargin(), true - ) - } - - - - private fun createPropertyActions(atCaret: JvmClass, property: MemberRequest.Property): List = - com.intellij.lang.jvm.actions.EP_NAME.extensions.flatMap { it.createAddPropertyActions(atCaret, property) } - - private fun createFieldActions(atCaret: JvmClass, fieldRequest: CreateFieldRequest): List = - com.intellij.lang.jvm.actions.EP_NAME.extensions.flatMap { it.createAddFieldActions(atCaret, fieldRequest) } - fun testAddStringValProperty() { myFixture.configureByText("foo.kt", """ |class Foo { @@ -547,7 +418,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private fun expectedTypes(vararg psiTypes: PsiType) = psiTypes.map { expectedType(it) } private fun expectedParams(vararg psyTypes: PsiType) = - psyTypes.mapIndexed { index, psiType -> expectedParameter(expectedTypes(psiType), "param$index") } + psyTypes.mapIndexed { index, psiType -> NameInfo("param$index") to expectedTypes(psiType) } private inline fun CodeInsightTestFixture.atCaret() = elementAtCaret.toUElement() as T @@ -555,28 +426,5 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private fun List.findWithText(text: String): IntentionAction = this.firstOrNull { it.text == text } ?: Assert.fail("intention with text '$text' was not found, only ${this.joinToString { "\"${it.text}\"" }} available") as Nothing - - class FieldRequest( - private val project: Project, - val modifiers: List, - val type: String, - val name: String - ) : CreateFieldRequest { - override fun getTargetSubstitutor(): JvmSubstitutor = PsiJvmSubstitutor(project, PsiSubstitutor.EMPTY) - - override fun getModifiers(): Collection = modifiers - - override fun isConstant(): Boolean = false - - override fun getFieldType(): List = - com.intellij.lang.jvm.actions.expectedTypes(PsiType.getTypeByName(type, project, project.allScope())) - - override fun getFieldName(): String = name - - override fun isValid(): Boolean = true - } - - } - diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt index fe2ab245670..b2aa9e52232 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt @@ -21,7 +21,6 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement -import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PsiTestUtil import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsHandler import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory @@ -40,7 +39,7 @@ class MoveKotlinDeclarationsHandlerTest : KotlinMultiFileTestCase() { private fun doTest(action: (rootDir: VirtualFile, handler: MoveKotlinDeclarationsHandler) -> Unit) { val path = "$testDataPath$testRoot/${getTestName(true)}" - val rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, PlatformTestCase.myFilesToDelete, false) + val rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, myFilesToDelete, false) prepareProject(rootDir) PsiDocumentManager.getInstance(myProject).commitAllDocuments() action(rootDir, MoveKotlinDeclarationsHandler()) diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 similarity index 98% rename from idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 index b2aa9e52232..fe2ab245670 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 @@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement +import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PsiTestUtil import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsHandler import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory @@ -39,7 +40,7 @@ class MoveKotlinDeclarationsHandlerTest : KotlinMultiFileTestCase() { private fun doTest(action: (rootDir: VirtualFile, handler: MoveKotlinDeclarationsHandler) -> Unit) { val path = "$testDataPath$testRoot/${getTestName(true)}" - val rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, myFilesToDelete, false) + val rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, PlatformTestCase.myFilesToDelete, false) prepareProject(rootDir) PsiDocumentManager.getInstance(myProject).commitAllDocuments() action(rootDir, MoveKotlinDeclarationsHandler()) diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt index 4d9498a72a7..c12fd5ab47e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt @@ -29,7 +29,6 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiManager import com.intellij.refactoring.RefactoringFactory import com.intellij.testFramework.MapDataContext -import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PsiTestUtil import org.jetbrains.kotlin.idea.MainFunctionDetector import org.jetbrains.kotlin.idea.caches.resolve.analyze @@ -240,11 +239,11 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() { private fun configureModule(moduleDir: String, outputParentDir: VirtualFile, configModule: Module = module): CreateModuleResult { val srcPath = moduleDir + "/src" - val srcDir = PsiTestUtil.createTestProjectStructure(project, configModule, srcPath, PlatformTestCase.myFilesToDelete, true) + val srcDir = PsiTestUtil.createTestProjectStructure(project, configModule, srcPath, myFilesToDelete, true) val testPath = moduleDir + "/test" if (File(testPath).exists()) { - val testDir = PsiTestUtil.createTestProjectStructure(project, configModule, testPath, PlatformTestCase.myFilesToDelete, false) + val testDir = PsiTestUtil.createTestProjectStructure(project, configModule, testPath, myFilesToDelete, false) PsiTestUtil.addSourceRoot(module, testDir, true) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 similarity index 98% rename from idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.182 rename to idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 index c12fd5ab47e..4d9498a72a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 @@ -29,6 +29,7 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiManager import com.intellij.refactoring.RefactoringFactory import com.intellij.testFramework.MapDataContext +import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PsiTestUtil import org.jetbrains.kotlin.idea.MainFunctionDetector import org.jetbrains.kotlin.idea.caches.resolve.analyze @@ -239,11 +240,11 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() { private fun configureModule(moduleDir: String, outputParentDir: VirtualFile, configModule: Module = module): CreateModuleResult { val srcPath = moduleDir + "/src" - val srcDir = PsiTestUtil.createTestProjectStructure(project, configModule, srcPath, myFilesToDelete, true) + val srcDir = PsiTestUtil.createTestProjectStructure(project, configModule, srcPath, PlatformTestCase.myFilesToDelete, true) val testPath = moduleDir + "/test" if (File(testPath).exists()) { - val testDir = PsiTestUtil.createTestProjectStructure(project, configModule, testPath, myFilesToDelete, false) + val testDir = PsiTestUtil.createTestProjectStructure(project, configModule, testPath, PlatformTestCase.myFilesToDelete, false) PsiTestUtil.addSourceRoot(module, testDir, true) } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt index 57df3205bd7..f9be4d4a121 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt @@ -35,7 +35,6 @@ import com.intellij.psi.augment.TypeAnnotationModifier import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.impl.JavaClassSupersImpl import com.intellij.psi.impl.PsiTreeChangePreprocessor -import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy import com.intellij.psi.meta.MetaDataContributor import com.intellij.psi.stubs.BinaryFileStubBuilders import com.intellij.psi.util.JavaClassSupers @@ -78,7 +77,17 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases) override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun hasHardcodedContracts(element: PsiElement): Boolean = false - override fun getPredefinedNotNulls() = emptyList() + override fun getNullables() = emptyList() + override fun setNullables(vararg p0: String) = Unit + override fun getNotNulls() = emptyList() + override fun setNotNulls(vararg p0: String) = Unit + override fun getDefaultNullable() = "" + override fun setDefaultNullable(defaultNullable: String) = Unit + override fun getDefaultNotNull() = "" + override fun setDefaultNotNull(p0: String) = Unit + override fun setInstrumentedNotNulls(p0: List) = Unit + override fun getInstrumentedNotNulls() = emptyList() + override fun isJsr305Default(psiAnnotation: PsiAnnotation, p1: Array) = null }) applicationEnvironment.application.registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java) @@ -102,7 +111,6 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider::class.java) - CoreApplicationEnvironment.registerExtensionPoint(area, ClsCustomNavigationPolicy.EP_NAME, ClsCustomNavigationPolicy::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier::class.java) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.182 b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.181 similarity index 89% rename from j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.182 rename to j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.181 index f9be4d4a121..57df3205bd7 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.182 +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.181 @@ -35,6 +35,7 @@ import com.intellij.psi.augment.TypeAnnotationModifier import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.impl.JavaClassSupersImpl import com.intellij.psi.impl.PsiTreeChangePreprocessor +import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy import com.intellij.psi.meta.MetaDataContributor import com.intellij.psi.stubs.BinaryFileStubBuilders import com.intellij.psi.util.JavaClassSupers @@ -77,17 +78,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases) override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun hasHardcodedContracts(element: PsiElement): Boolean = false - override fun getNullables() = emptyList() - override fun setNullables(vararg p0: String) = Unit - override fun getNotNulls() = emptyList() - override fun setNotNulls(vararg p0: String) = Unit - override fun getDefaultNullable() = "" - override fun setDefaultNullable(defaultNullable: String) = Unit - override fun getDefaultNotNull() = "" - override fun setDefaultNotNull(p0: String) = Unit - override fun setInstrumentedNotNulls(p0: List) = Unit - override fun getInstrumentedNotNulls() = emptyList() - override fun isJsr305Default(psiAnnotation: PsiAnnotation, p1: Array) = null + override fun getPredefinedNotNulls() = emptyList() }) applicationEnvironment.application.registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java) @@ -111,6 +102,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider::class.java) + CoreApplicationEnvironment.registerExtensionPoint(area, ClsCustomNavigationPolicy.EP_NAME, ClsCustomNavigationPolicy::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier::class.java) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 859dbd402cd..de078b9f02b 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { compile(project(":kotlin-reflect")) fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) } - fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-java-1.3") } + fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-1.3.0") } fatJarContentsStripServices(intellijDep("jps-standalone")) { includeJars("jps-model") } fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j") } } diff --git a/prepare/compiler/build.gradle.kts.182 b/prepare/compiler/build.gradle.kts.181 similarity index 99% rename from prepare/compiler/build.gradle.kts.182 rename to prepare/compiler/build.gradle.kts.181 index de078b9f02b..859dbd402cd 100644 --- a/prepare/compiler/build.gradle.kts.182 +++ b/prepare/compiler/build.gradle.kts.181 @@ -71,7 +71,7 @@ dependencies { compile(project(":kotlin-reflect")) fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) } - fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-1.3.0") } + fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-java-1.3") } fatJarContentsStripServices(intellijDep("jps-standalone")) { includeJars("jps-model") } fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j") } } diff --git a/ultimate/resources/META-INF/kotlin-spring.xml b/ultimate/resources/META-INF/kotlin-spring.xml.181 similarity index 100% rename from ultimate/resources/META-INF/kotlin-spring.xml rename to ultimate/resources/META-INF/kotlin-spring.xml.181 diff --git a/ultimate/resources/META-INF/ultimate-plugin.xml b/ultimate/resources/META-INF/ultimate-plugin.xml index dfd991b050e..1de2dfef1e5 100644 --- a/ultimate/resources/META-INF/ultimate-plugin.xml +++ b/ultimate/resources/META-INF/ultimate-plugin.xml @@ -1,10 +1,3 @@ - com.intellij.spring - com.intellij.javaee - com.intellij.persistence - com.intellij.database - com.intellij.css - com.intellij.jsp - com.intellij.diagram NodeJS \ No newline at end of file diff --git a/ultimate/resources/META-INF/ultimate-plugin.xml.181 b/ultimate/resources/META-INF/ultimate-plugin.xml.181 new file mode 100644 index 00000000000..dfd991b050e --- /dev/null +++ b/ultimate/resources/META-INF/ultimate-plugin.xml.181 @@ -0,0 +1,10 @@ + + com.intellij.spring + com.intellij.javaee + com.intellij.persistence + com.intellij.database + com.intellij.css + com.intellij.jsp + com.intellij.diagram + NodeJS + \ No newline at end of file diff --git a/ultimate/resources/META-INF/ultimate-plugin.xml.182 b/ultimate/resources/META-INF/ultimate-plugin.xml.182 deleted file mode 100644 index 1de2dfef1e5..00000000000 --- a/ultimate/resources/META-INF/ultimate-plugin.xml.182 +++ /dev/null @@ -1,3 +0,0 @@ - - NodeJS - \ No newline at end of file diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/KotlinSpringLocalModelDependenciesDiagramProvider.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/KotlinSpringLocalModelDependenciesDiagramProvider.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/KotlinSpringLocalModelDependenciesDiagramProvider.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/KotlinSpringLocalModelDependenciesDiagramProvider.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/KotlinSpringLocalModelDependenciesDiagramProvider.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/KotlinSpringLocalModelDependenciesDiagramProvider.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesAction.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesAction.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesAction.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesAction.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesModuleDiagramAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesModuleDiagramAction.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesModuleDiagramAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesModuleDiagramAction.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesModuleDiagramAction.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/diagram/OpenKotlinSpringModelDependenciesModuleDiagramAction.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringComponentScanInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringComponentScanInspection.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringComponentScanInspection.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringComponentScanInspection.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringComponentScanInspection.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringComponentScanInspection.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/SpringKotlinAutowiredMembersInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/SpringKotlinAutowiredMembersInspection.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/SpringKotlinAutowiredMembersInspection.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/SpringKotlinAutowiredMembersInspection.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/SpringKotlinAutowiredMembersInspection.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/SpringKotlinAutowiredMembersInspection.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt.181 similarity index 100% rename from ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt.181 diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt.182 b/ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test index 34b475331cb..93b10c2c128 100644 --- a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test +++ b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test @@ -1,2 +1,2 @@ -// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.SpringKotlinAutowiredMembersInspection +// INSPECTION_CLASS: com.intellij.spring.model.highlighting.autowire.SpringUastAutowiredMembersInspection // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.181 b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.181 new file mode 100644 index 00000000000..34b475331cb --- /dev/null +++ b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.181 @@ -0,0 +1,2 @@ +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.SpringKotlinAutowiredMembersInspection +// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.182 b/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.182 deleted file mode 100644 index 93b10c2c128..00000000000 --- a/ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.182 +++ /dev/null @@ -1,2 +0,0 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.autowire.SpringUastAutowiredMembersInspection -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/autowiring/ambiguousConstructors.kt b/ultimate/testData/inspections/spring/autowiring/ambiguousConstructors.kt.181 similarity index 100% rename from ultimate/testData/inspections/spring/autowiring/ambiguousConstructors.kt rename to ultimate/testData/inspections/spring/autowiring/ambiguousConstructors.kt.181 diff --git a/ultimate/testData/inspections/spring/autowiring/ambiguousConstructors.kt.182 b/ultimate/testData/inspections/spring/autowiring/ambiguousConstructors.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml index 968b0f33f60..589f18259fa 100644 --- a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml +++ b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml @@ -1,48 +1,4 @@ - - ambiguousConstructors.kt - 52 - - Autowiring for Bean Class (Kotlin) - Class doesn't contain matching constructor for autowiring - - - ambiguousConstructors.kt - 58 - - Autowiring for Bean Class (Kotlin) - Class doesn't contain matching constructor for autowiring - - - - multipleAutowiredConstructors.kt - 30 - - Autowiring for Bean Class (Kotlin) - Only one constructor can have @Autowired annotation - - - multipleAutowiredConstructors.kt - 31 - - Autowiring for Bean Class (Kotlin) - Only one constructor can have @Autowired annotation - - - multipleAutowiredConstructors.kt - 35 - - Autowiring for Bean Class (Kotlin) - Only one constructor can have @Autowired annotation - - - multipleAutowiredConstructors.kt - 36 - - Autowiring for Bean Class (Kotlin) - Only one constructor can have @Autowired annotation - - invalidAutowiredResource.kt 24 diff --git a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.182 b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.181 similarity index 56% rename from ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.182 rename to ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.181 index 589f18259fa..968b0f33f60 100644 --- a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.182 +++ b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.181 @@ -1,4 +1,48 @@ + + ambiguousConstructors.kt + 52 + + Autowiring for Bean Class (Kotlin) + Class doesn't contain matching constructor for autowiring + + + ambiguousConstructors.kt + 58 + + Autowiring for Bean Class (Kotlin) + Class doesn't contain matching constructor for autowiring + + + + multipleAutowiredConstructors.kt + 30 + + Autowiring for Bean Class (Kotlin) + Only one constructor can have @Autowired annotation + + + multipleAutowiredConstructors.kt + 31 + + Autowiring for Bean Class (Kotlin) + Only one constructor can have @Autowired annotation + + + multipleAutowiredConstructors.kt + 35 + + Autowiring for Bean Class (Kotlin) + Only one constructor can have @Autowired annotation + + + multipleAutowiredConstructors.kt + 36 + + Autowiring for Bean Class (Kotlin) + Only one constructor can have @Autowired annotation + + invalidAutowiredResource.kt 24 diff --git a/ultimate/testData/inspections/spring/autowiring/multipleAutowiredConstructors.kt b/ultimate/testData/inspections/spring/autowiring/multipleAutowiredConstructors.kt.181 similarity index 100% rename from ultimate/testData/inspections/spring/autowiring/multipleAutowiredConstructors.kt rename to ultimate/testData/inspections/spring/autowiring/multipleAutowiredConstructors.kt.181 diff --git a/ultimate/testData/inspections/spring/autowiring/multipleAutowiredConstructors.kt.182 b/ultimate/testData/inspections/spring/autowiring/multipleAutowiredConstructors.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml b/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml index 5fb321c5795..7b45656e2b0 100644 --- a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml +++ b/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml @@ -2,17 +2,17 @@ test.kt 14 - light_idea_test_case - - @ComponentScan setup (Kotlin) - Cannot resolve package bar + <default> + + @ComponentScan setup + Cannot resolve symbol 'bar' test.kt 18 - light_idea_test_case - - @ComponentScan setup (Kotlin) - Cannot resolve package bar + <default> + + @ComponentScan setup + Cannot resolve symbol 'bar' diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.181 b/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.181 new file mode 100644 index 00000000000..5fb321c5795 --- /dev/null +++ b/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.181 @@ -0,0 +1,18 @@ + + + test.kt + 14 + light_idea_test_case + + @ComponentScan setup (Kotlin) + Cannot resolve package bar + + + test.kt + 18 + light_idea_test_case + + @ComponentScan setup (Kotlin) + Cannot resolve package bar + + diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.182 b/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.182 deleted file mode 100644 index 7b45656e2b0..00000000000 --- a/ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.182 +++ /dev/null @@ -1,18 +0,0 @@ - - - test.kt - 14 - <default> - - @ComponentScan setup - Cannot resolve symbol 'bar' - - - test.kt - 18 - <default> - - @ComponentScan setup - Cannot resolve symbol 'bar' - - diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test b/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test index bfa89cff534..3f1dea3c44a 100644 --- a/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test +++ b/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test @@ -1,3 +1,3 @@ -// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringComponentScanInspection +// INSPECTION_CLASS: com.intellij.spring.model.highlighting.jam.SpringComponentScanInspection // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension // CONFIGURE_SPRING_FILE_SET \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.182 b/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.181 similarity index 52% rename from ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.182 rename to ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.181 index 3f1dea3c44a..bfa89cff534 100644 --- a/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.182 +++ b/ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.181 @@ -1,3 +1,3 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.jam.SpringComponentScanInspection +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringComponentScanInspection // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension // CONFIGURE_SPRING_FILE_SET \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test index fb5dcfc78a1..dbe03e885bd 100644 --- a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test +++ b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test @@ -1,3 +1,3 @@ -// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringFacetCodeInspection +// INSPECTION_CLASS: com.intellij.spring.model.highlighting.config.SpringFacetUastInspection // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension // FORBID_SPRING_FILE_SET_AUTOCONFIGURE \ No newline at end of file diff --git a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.182 b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.181 similarity index 55% rename from ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.182 rename to ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.181 index dbe03e885bd..fb5dcfc78a1 100644 --- a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.182 +++ b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.181 @@ -1,3 +1,3 @@ -// INSPECTION_CLASS: com.intellij.spring.model.highlighting.config.SpringFacetUastInspection +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringFacetCodeInspection // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension // FORBID_SPRING_FILE_SET_AUTOCONFIGURE \ No newline at end of file diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml b/ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml rename to ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml.182 b/ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after.181 similarity index 100% rename from ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after.181 diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after.182 b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt.182 b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test.182 b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml.182 b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt.182 b/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test b/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test rename to ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test.182 b/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml b/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml rename to ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml.182 b/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt.182 b/ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test b/ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test rename to ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test.182 b/ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredProperty/config.xml b/ultimate/testData/spring/core/gutter/autowiredProperty/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredProperty/config.xml rename to ultimate/testData/spring/core/gutter/autowiredProperty/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredProperty/config.xml.182 b/ultimate/testData/spring/core/gutter/autowiredProperty/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt.182 b/ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test b/ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test rename to ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test.182 b/ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/autowiredSetter/config.xml b/ultimate/testData/spring/core/gutter/autowiredSetter/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/autowiredSetter/config.xml rename to ultimate/testData/spring/core/gutter/autowiredSetter/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/autowiredSetter/config.xml.182 b/ultimate/testData/spring/core/gutter/autowiredSetter/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutter/Bean.kt b/ultimate/testData/spring/core/gutter/classGutter/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutter/Bean.kt rename to ultimate/testData/spring/core/gutter/classGutter/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/classGutter/Bean.kt.182 b/ultimate/testData/spring/core/gutter/classGutter/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutter/classGutter.test b/ultimate/testData/spring/core/gutter/classGutter/classGutter.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutter/classGutter.test rename to ultimate/testData/spring/core/gutter/classGutter/classGutter.test.181 diff --git a/ultimate/testData/spring/core/gutter/classGutter/classGutter.test.182 b/ultimate/testData/spring/core/gutter/classGutter/classGutter.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutter/config.xml b/ultimate/testData/spring/core/gutter/classGutter/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutter/config.xml rename to ultimate/testData/spring/core/gutter/classGutter/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/classGutter/config.xml.182 b/ultimate/testData/spring/core/gutter/classGutter/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt.182 b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt.181 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt.182 b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt.181 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt.182 b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test.181 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test.182 b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml.181 diff --git a/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml.182 b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScan/Bean.kt b/ultimate/testData/spring/core/gutter/componentScan/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScan/Bean.kt rename to ultimate/testData/spring/core/gutter/componentScan/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScan/Bean.kt.182 b/ultimate/testData/spring/core/gutter/componentScan/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt b/ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt rename to ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt.182 b/ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt b/ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt rename to ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt.182 b/ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt b/ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt rename to ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt.182 b/ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScan/componentScan.test b/ultimate/testData/spring/core/gutter/componentScan/componentScan.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScan/componentScan.test rename to ultimate/testData/spring/core/gutter/componentScan/componentScan.test.181 diff --git a/ultimate/testData/spring/core/gutter/componentScan/componentScan.test.182 b/ultimate/testData/spring/core/gutter/componentScan/componentScan.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/Config.kt b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/Config.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/Config.kt rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/Config.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/Config.kt.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/Config.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/bar/beans.kt b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/bar/beans.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/bar/beans.kt rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/bar/beans.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/bar/beans.kt.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/bar/beans.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/componentScanWithBasePackageClasses.test b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/componentScanWithBasePackageClasses.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/componentScanWithBasePackageClasses.test rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/componentScanWithBasePackageClasses.test.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/componentScanWithBasePackageClasses.test.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/componentScanWithBasePackageClasses.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/foo/beans.kt b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/foo/beans.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/foo/beans.kt rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/foo/beans.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/foo/beans.kt.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackageClasses/foo/beans.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/Config.kt b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/Config.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackages/Config.kt rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackages/Config.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/Config.kt.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/Config.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/bar/beans.kt b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/bar/beans.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackages/bar/beans.kt rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackages/bar/beans.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/bar/beans.kt.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/bar/beans.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/componentScanWithBasePackages.test b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/componentScanWithBasePackages.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackages/componentScanWithBasePackages.test rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackages/componentScanWithBasePackages.test.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/componentScanWithBasePackages.test.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/componentScanWithBasePackages.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/foo/beans.kt b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/foo/beans.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/componentScanWithBasePackages/foo/beans.kt rename to ultimate/testData/spring/core/gutter/componentScanWithBasePackages/foo/beans.kt.181 diff --git a/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/foo/beans.kt.182 b/ultimate/testData/spring/core/gutter/componentScanWithBasePackages/foo/beans.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt.181 diff --git a/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt.182 b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt.181 diff --git a/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt.182 b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test.181 diff --git a/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test.182 b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt.181 diff --git a/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt.182 b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test.181 diff --git a/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test.182 b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/pkg/FooBar.kt b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/pkg/FooBar.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/pkg/FooBar.kt rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/pkg/FooBar.kt.181 diff --git a/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/pkg/FooBar.kt.182 b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/pkg/FooBar.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/Config.kt b/ultimate/testData/spring/core/gutter/importConfigClasses/Config.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/importConfigClasses/Config.kt rename to ultimate/testData/spring/core/gutter/importConfigClasses/Config.kt.181 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/Config.kt.182 b/ultimate/testData/spring/core/gutter/importConfigClasses/Config.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/bar/beans.kt b/ultimate/testData/spring/core/gutter/importConfigClasses/bar/beans.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/importConfigClasses/bar/beans.kt rename to ultimate/testData/spring/core/gutter/importConfigClasses/bar/beans.kt.181 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/bar/beans.kt.182 b/ultimate/testData/spring/core/gutter/importConfigClasses/bar/beans.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/baz/Config2.kt b/ultimate/testData/spring/core/gutter/importConfigClasses/baz/Config2.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/importConfigClasses/baz/Config2.kt rename to ultimate/testData/spring/core/gutter/importConfigClasses/baz/Config2.kt.181 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/baz/Config2.kt.182 b/ultimate/testData/spring/core/gutter/importConfigClasses/baz/Config2.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/foo/beans.kt b/ultimate/testData/spring/core/gutter/importConfigClasses/foo/beans.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/importConfigClasses/foo/beans.kt rename to ultimate/testData/spring/core/gutter/importConfigClasses/foo/beans.kt.181 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/foo/beans.kt.182 b/ultimate/testData/spring/core/gutter/importConfigClasses/foo/beans.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/importConfigClasses.test b/ultimate/testData/spring/core/gutter/importConfigClasses/importConfigClasses.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/importConfigClasses/importConfigClasses.test rename to ultimate/testData/spring/core/gutter/importConfigClasses/importConfigClasses.test.181 diff --git a/ultimate/testData/spring/core/gutter/importConfigClasses/importConfigClasses.test.182 b/ultimate/testData/spring/core/gutter/importConfigClasses/importConfigClasses.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt b/ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt rename to ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt.182 b/ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/innerBean/innerBean.test b/ultimate/testData/spring/core/gutter/innerBean/innerBean.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/innerBean/innerBean.test rename to ultimate/testData/spring/core/gutter/innerBean/innerBean.test.181 diff --git a/ultimate/testData/spring/core/gutter/innerBean/innerBean.test.182 b/ultimate/testData/spring/core/gutter/innerBean/innerBean.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml b/ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml rename to ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml.181 diff --git a/ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml.182 b/ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt.182 b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml.182 b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test.182 b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt.182 b/ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml b/ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml.182 b/ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test b/ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test rename to ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test.182 b/ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt.182 b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml.182 b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test.182 b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt.182 b/ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml b/ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml.182 b/ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test b/ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test.181 diff --git a/ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test.182 b/ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt.181 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt.182 b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml.181 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml.182 b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test.181 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test.182 b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt.181 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt.182 b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml.181 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml.182 b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test.181 diff --git a/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test.182 b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt b/ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt rename to ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt.181 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt.182 b/ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt b/ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt rename to ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt.181 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt.182 b/ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt b/ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt rename to ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt.181 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt.182 b/ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test rename to ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test.181 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test.182 b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml.181 similarity index 100% rename from ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml rename to ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml.181 diff --git a/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml.182 b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt.181 similarity index 100% rename from ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt.181 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt.182 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java.181 similarity index 100% rename from ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java.181 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java.182 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 similarity index 100% rename from ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.182 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java.181 similarity index 100% rename from ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java.181 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java.182 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt.181 similarity index 100% rename from ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt.181 diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt.182 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt.182 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt index 7bf4c35d5bc..ea8e33807d5 100644 --- a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt +++ b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt @@ -18,8 +18,6 @@ package org.jetbrains.kotlin.tests import org.jetbrains.kotlin.generators.tests.generator.* import org.jetbrains.kotlin.idea.spring.tests.findUsages.AbstractSpringFindUsagesTest -import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest -import org.jetbrains.kotlin.idea.spring.tests.gutter.AbstractSpringClassAnnotatorTest import org.jetbrains.kotlin.idea.spring.tests.inspections.AbstractSpringInspectionTest import org.jetbrains.kotlin.idea.spring.tests.quickfixes.AbstractSpringQuickFixTest import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest @@ -39,10 +37,6 @@ fun main(args: Array) { model("quickFixes/spring", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true) } - testClass() { - model("spring/core/gutter", extension = "test", singleClass = true) - } - testClass() { model("spring/core/references/completion/handler") } @@ -55,10 +49,6 @@ fun main(args: Array) { model("spring/core/references/navigation") } - testClass() { - model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true) - } - testClass() { model("spring/core/rename", extension = "test", singleClass = true) } diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt.182 b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt.181 similarity index 83% rename from ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt.182 rename to ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt.181 index ea8e33807d5..7bf4c35d5bc 100644 --- a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt.182 +++ b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt.181 @@ -18,6 +18,8 @@ package org.jetbrains.kotlin.tests import org.jetbrains.kotlin.generators.tests.generator.* import org.jetbrains.kotlin.idea.spring.tests.findUsages.AbstractSpringFindUsagesTest +import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest +import org.jetbrains.kotlin.idea.spring.tests.gutter.AbstractSpringClassAnnotatorTest import org.jetbrains.kotlin.idea.spring.tests.inspections.AbstractSpringInspectionTest import org.jetbrains.kotlin.idea.spring.tests.quickfixes.AbstractSpringQuickFixTest import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest @@ -37,6 +39,10 @@ fun main(args: Array) { model("quickFixes/spring", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true) } + testClass() { + model("spring/core/gutter", extension = "test", singleClass = true) + } + testClass() { model("spring/core/references/completion/handler") } @@ -49,6 +55,10 @@ fun main(args: Array) { model("spring/core/references/navigation") } + testClass() { + model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true) + } + testClass() { model("spring/core/rename", extension = "test", singleClass = true) } diff --git a/versions.gradle.kts b/versions.gradle.kts index 2f5a282b768..2ce5c57df69 100644 --- a/versions.gradle.kts +++ b/versions.gradle.kts @@ -1,5 +1,4 @@ - -extra["versions.intellijSdk"] = "181.5540.7" +extra["versions.intellijSdk"] = "182.3684.101" extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.idea.NodeJS"] = "181.3494.12" //extra["versions.androidStudioRelease"] = "3.1.0.5" @@ -31,7 +30,7 @@ val platform = androidStudioVersion?.let { "AS$it" } ?: platformBaseVersion when (platform) { "182" -> { extra["versions.jar.guava"] = "23.6-jre" - extra["versions.jar.groovy-all"] = "2.4.12" + extra["versions.jar.groovy-all"] = "2.4.15" extra["versions.jar.lombok-ast"] = "0.2.3" extra["versions.jar.swingx-core"] = "1.6.2-2" extra["versions.jar.kxml2"] = "2.3.0" diff --git a/versions.gradle.kts.182 b/versions.gradle.kts.181 similarity index 98% rename from versions.gradle.kts.182 rename to versions.gradle.kts.181 index 2ce5c57df69..2f5a282b768 100644 --- a/versions.gradle.kts.182 +++ b/versions.gradle.kts.181 @@ -1,4 +1,5 @@ -extra["versions.intellijSdk"] = "182.3684.101" + +extra["versions.intellijSdk"] = "181.5540.7" extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.idea.NodeJS"] = "181.3494.12" //extra["versions.androidStudioRelease"] = "3.1.0.5" @@ -30,7 +31,7 @@ val platform = androidStudioVersion?.let { "AS$it" } ?: platformBaseVersion when (platform) { "182" -> { extra["versions.jar.guava"] = "23.6-jre" - extra["versions.jar.groovy-all"] = "2.4.15" + extra["versions.jar.groovy-all"] = "2.4.12" extra["versions.jar.lombok-ast"] = "0.2.3" extra["versions.jar.swingx-core"] = "1.6.2-2" extra["versions.jar.kxml2"] = "2.3.0"