azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

201: TemplateManagerImpl.setTemplateTesting() parameter removed

Browse Source
This commit is contained in:
Nikolay Krasko
2020-01-28 21:55:15 +03:00
committed by Nikolay Krasko
parent b17a28381b
commit 75f05d8329
7 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
+1 -1
View File
@@ -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() {
idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt
+15
View File
@@ -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)
}
idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201
+15
View File
@@ -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)
}
idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt
+2 -2
View File
@@ -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')
idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
+2 -1
View File
@@ -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<Any>(project) {
override fun run() {
idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.191
+2 -1
View File
@@ -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<Any>(project) {
override fun run() {
idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt.as40
+2 -1
View File
@@ -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<Any>(project) {
override fun run() {