Build: fix API differences between 201 and 202 in scratch tests

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt

@@ -318,13 +318,16 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() {
     }
 
     override fun tearDown() {
+//        myFixture?.file?.virtualFile?.let {
+//            runWriteAction {
+//                if (it.isValid) {
+//                    it.delete(this)
+//                }
+//            }
+//        }
         super.tearDown()
 
         VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
-
-        ScratchFileService.getInstance().scratchesMapping.mappings.forEach { file, _ ->
-            runWriteAction { file.delete(this) }
-        }
     }
 
     companion object {

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt.201

@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.idea.scratch
 
 import com.intellij.ide.scratch.ScratchFileService
 import com.intellij.ide.scratch.ScratchRootType
-import com.intellij.lang.Language
-import com.intellij.lang.PerFileMappingsEx
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.module.Module
@@ -26,6 +24,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.actions.KOTLIN_WORKSHEET_EXTENSION
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
+import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingUtil
 import org.jetbrains.kotlin.idea.scratch.actions.ClearScratchAction
 import org.jetbrains.kotlin.idea.scratch.actions.RunScratchAction
@@ -323,9 +322,9 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() {
 
         VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
 
-//        (ScratchFileService.getInstance().scratchesMapping as PerFileMappingsEx<Language>).mappings.forEach { (file, _) ->
+        ScratchFileService.getInstance().scratchesMapping.mappings.forEach { file, _ ->
-//            runWriteAction { file.delete(this) }
+            runWriteAction { file.delete(this) }
-//        }
+        }
     }
 
     companion object {

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTest.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.scratch
 import com.intellij.codeInsight.daemon.LineMarkerInfo
 import com.intellij.ide.scratch.ScratchFileService
 import com.intellij.ide.scratch.ScratchRootType
+import com.intellij.openapi.application.Application
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.util.io.FileUtil
@@ -54,13 +55,8 @@ abstract class AbstractScratchLineMarkersTest : FileEditorManagerTestCase() {
         val markers = doAndCheckHighlighting(document, data, File(path))
 
         AbstractLineMarkersTest.assertNavigationElements(myFixture.project, myFixture.file as KtFile, markers)
-    }
+        runWriteAction {
-
+            scratchVirtualFile.delete(this)
-    override fun tearDown() {
-        super.tearDown()
-
-        ScratchFileService.getInstance().scratchesMapping.mappings.forEach { file, _ ->
-            runWriteAction { file.delete(this) }
         }
     }
 

idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTest.kt.as42

@@ -1,74 +0,0 @@
-/*
- * Copyright 2010-2019 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.scratch
-
-import com.intellij.codeInsight.daemon.LineMarkerInfo
-import com.intellij.ide.scratch.ScratchFileService
-import com.intellij.ide.scratch.ScratchRootType
-import com.intellij.openapi.editor.Document
-import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.testFramework.ExpectedHighlightingData
-import com.intellij.testFramework.FileEditorManagerTestCase
-import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.idea.codeInsight.AbstractLineMarkersTest
-import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
-import org.jetbrains.kotlin.idea.scratch.AbstractScratchRunActionTest.Companion.configureOptions
-import org.jetbrains.kotlin.psi.KtFile
-import java.io.File
-
-abstract class AbstractScratchLineMarkersTest : FileEditorManagerTestCase() {
-    fun doScratchTest(path: String) {
-        val fileText = FileUtil.loadFile(File(path))
-
-        val scratchVirtualFile = ScratchRootType.getInstance().createScratchFile(
-            project,
-            "scratch.kts",
-            KotlinLanguage.INSTANCE,
-            fileText,
-            ScratchFileService.Option.create_if_missing
-        ) ?: error("Couldn't create scratch file")
-
-        myFixture.openFileInEditor(scratchVirtualFile)
-
-        ScriptConfigurationManager.updateScriptDependenciesSynchronously(myFixture.file)
-
-        val scratchFileEditor = getScratchEditorForSelectedFile(FileEditorManager.getInstance(project), myFixture.file.virtualFile)
-            ?: error("Couldn't find scratch panel")
-
-        configureOptions(scratchFileEditor, fileText, null)
-
-        val project = myFixture.project
-        val document = myFixture.editor.document
-
-        val data = ExpectedHighlightingData(document, false, false, false)
-        data.init()
-
-        PsiDocumentManager.getInstance(project).commitAllDocuments()
-
-        val markers = doAndCheckHighlighting(document, data, File(path))
-
-        AbstractLineMarkersTest.assertNavigationElements(myFixture.project, myFixture.file as KtFile, markers)
-    }
-
-    override fun tearDown() {
-        super.tearDown()
-
-//        (ScratchFileService.getInstance().scratchesMapping as PerFileMappingsEx<Language>).mappings.forEach { file, _ ->
-//            runWriteAction { file.delete(this) }
-//        }
-    }
-
-    private fun doAndCheckHighlighting(
-        documentToAnalyze: Document, expectedHighlighting: ExpectedHighlightingData, expectedFile: File
-    ): List<LineMarkerInfo<*>> {
-        myFixture.doHighlighting()
-
-        return AbstractLineMarkersTest.checkHighlighting(myFixture.file, documentToAnalyze, expectedHighlighting, expectedFile)
-    }
-
-}