diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt index 1d76d6f6c0d..24faeb6e628 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt @@ -28,7 +28,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() { override fun setUp() { super.setUp() myFixture.testDataPath = File(TEST_DATA_BASE_PATH).path + File.separator - TemplateManagerImpl.setTemplateTesting(module.project, testRootDisposable) + setTemplateTestingCompat(module.project, testRootDisposable) } fun testSout() { diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt new file mode 100644 index 00000000000..be64290252b --- /dev/null +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.liveTemplates + +import com.intellij.codeInsight.template.impl.TemplateManagerImpl +import com.intellij.openapi.Disposable +import com.intellij.openapi.project.Project + +// BUNCH: 193 +fun setTemplateTestingCompat(project: Project, disposable: Disposable) { + TemplateManagerImpl.setTemplateTesting(project, disposable) +} \ No newline at end of file diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201 b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201 new file mode 100644 index 00000000000..20bde361ca3 --- /dev/null +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201 @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.liveTemplates + +import com.intellij.codeInsight.template.impl.TemplateManagerImpl +import com.intellij.openapi.Disposable +import com.intellij.openapi.project.Project + +// BUNCH: 193 +fun setTemplateTestingCompat(project: Project, disposable: Disposable) { + TemplateManagerImpl.setTemplateTesting(disposable) +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt index 5956d0ccd28..145244d4f52 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.codeInsight.postfix -import com.intellij.codeInsight.template.impl.TemplateManagerImpl +import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils @@ -30,7 +30,7 @@ abstract class AbstractPostfixTemplateProviderTest : KotlinLightCodeInsightFixtu myFixture.configureByFile(fileName) val template = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// TEMPLATE:") if (template != null) { - TemplateManagerImpl.setTemplateTesting(project, testRootDisposable) + setTemplateTestingCompat(project, testRootDisposable) myFixture.type(template.replace("\\t", "\t")) } else { myFixture.type('\t') diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index 54c73e1801e..e5c06e8f70e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -15,6 +15,7 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.fixtures.CodeInsightTestUtil import junit.framework.TestCase +import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat import org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter @@ -201,7 +202,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() { val project = editor.project!! - TemplateManagerImpl.setTemplateTesting(project, testRootDisposable) + setTemplateTestingCompat(project, testRootDisposable) object : WriteCommandAction.Simple(project) { override fun run() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.191 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.191 index beda0e405d4..0e1140da639 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.191 +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.191 @@ -15,6 +15,7 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.fixtures.CodeInsightTestUtil import junit.framework.TestCase +import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat import org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter @@ -199,7 +200,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() { val project = editor.project!! - TemplateManagerImpl.setTemplateTesting(project, testRootDisposable) + setTemplateTestingCompat(project, testRootDisposable) object : WriteCommandAction.Simple(project) { override fun run() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.as40 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.as40 index 54c73e1801e..e5c06e8f70e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.as40 +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.as40 @@ -15,6 +15,7 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.fixtures.CodeInsightTestUtil import junit.framework.TestCase +import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat import org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter @@ -201,7 +202,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() { val project = editor.project!! - TemplateManagerImpl.setTemplateTesting(project, testRootDisposable) + setTemplateTestingCompat(project, testRootDisposable) object : WriteCommandAction.Simple(project) { override fun run() {