Cleanup 193 compatibility fixes

idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt

@@ -25,7 +25,7 @@ abstract class KotlinHierarchyViewTestBase : KotlinLightCodeInsightFixtureTestCa
     ) {
         myFixture.configureByFiles(*fileNames)
         val expectedStructure = loadExpectedStructure()
-        doHierarchyTestCompat(hierarchyFixture, treeStructureComputable, expectedStructure)
+        HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure)
     }
 
     @Throws(IOException::class)

idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt

@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.idea.codeInsight.postfix
 
-import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat
+import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 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) {
-            setTemplateTestingCompat(project, testRootDisposable)
+            TemplateManagerImpl.setTemplateTesting(testRootDisposable)
             myFixture.type(template.replace("\\t", "\t"))
         } else {
             myFixture.type('\t')

idea/tests/org/jetbrains/kotlin/idea/compat.kt

@@ -5,22 +5,9 @@
 
 package org.jetbrains.kotlin.idea
 
-import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.extensions.ExtensionPointName
-import com.intellij.openapi.util.Computable
 import com.intellij.testFramework.ExtensionTestUtil
-import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
-
-// FIX ME WHEN BUNCH 193 REMOVED
-@Suppress("UNUSED_PARAMETER")
-fun doHierarchyTestCompat(
-    hierarchyFixture: HierarchyViewTestFixture,
-    treeStructureComputable: Computable<out HierarchyTreeStructure>,
-    expectedStructure: String,
-) {
-    HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure)
-}
 
 fun <T> maskExtensions(
     pointName: ExtensionPointName<T>,

idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt

@@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.hierarchy
 
 import com.intellij.ide.hierarchy.*
 import com.intellij.ide.hierarchy.actions.BrowseHierarchyActionBase
+import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure
 import com.intellij.ide.hierarchy.type.SubtypesHierarchyTreeStructure
 import com.intellij.ide.hierarchy.type.SupertypesHierarchyTreeStructure
 import com.intellij.ide.hierarchy.type.TypeHierarchyTreeStructure
@@ -15,10 +16,7 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.fileEditor.impl.text.TextEditorPsiDataProvider
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiMethod
+import com.intellij.psi.*
 import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException
 import com.intellij.rt.execution.junit.ComparisonDetailsExtractor
 import com.intellij.testFramework.LightProjectDescriptor
@@ -29,7 +27,6 @@ import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.KotlinHierarchyViewTestBase
 import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCalleeTreeStructure
 import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallerTreeStructure
-import org.jetbrains.kotlin.idea.hierarchy.calls.createCallerMethodsTreeStructure
 import org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideTreeStructure
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
@@ -124,10 +121,9 @@ abstract class AbstractHierarchyTest : KotlinHierarchyViewTestBase() {
 
     private val callerJavaHierarchyStructure: Computable<HierarchyTreeStructure>
         get() = Computable {
-            createCallerMethodsTreeStructure(
+            CallerMethodsTreeStructure(
                 project,
-                (getElementAtCaret(LanguageCallHierarchy.INSTANCE) as PsiMethod),
-                HierarchyBrowserBaseEx.SCOPE_PROJECT
+                (getElementAtCaret(LanguageCallHierarchy.INSTANCE) as PsiMethod) as PsiMember, HierarchyBrowserBaseEx.SCOPE_PROJECT
             )
         }
 

idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt

@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.CharsetToolkit
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
+import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import com.intellij.util.ArrayUtil
 import com.intellij.util.PathUtil
 import junit.framework.ComparisonFailure
@@ -335,7 +336,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
                     TestCase.fail("Action '$text' is available (but must not) in test $testFilePath")
                 }
 
-                invokeIntentionCompat(action, file, editor)
+                CodeInsightTestFixtureImpl.invokeIntention(action, file, editor)
 
                 if (!shouldBeAvailableAfterExecution) {
                     val afterAction = findActionByPattern(pattern, getAvailableActions())

idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt

@@ -1,16 +0,0 @@
-/*
- * 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.quickfix
-
-import com.intellij.codeInsight.intention.IntentionAction
-import com.intellij.openapi.editor.Editor
-import com.intellij.psi.PsiFile
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
-
-// FIX ME WHEN BUNCH 193 REMOVED
-fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) {
-    CodeInsightTestFixtureImpl.invokeIntention(action, file, editor)
-}

idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt

@@ -15,7 +15,6 @@ 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
@@ -202,7 +201,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() {
 
         val project = editor.project!!
 
-        setTemplateTestingCompat(project, testRootDisposable)
+        TemplateManagerImpl.setTemplateTesting(testRootDisposable)
 
         object : WriteCommandAction.Simple<Any>(project) {
             override fun run() {