Move CliScriptDefinition provider to the plugin too, fix tests

compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java

@@ -26,12 +26,11 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.PathUtil;
+import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.KtNodeTypes;
 import org.jetbrains.kotlin.TestsCompilerError;
-import org.jetbrains.kotlin.cli.common.script.CliScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.script.ScriptDefinitionProvider;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase;
 
@@ -39,14 +38,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import kotlin.jvm.functions.Function1;
-
 public abstract class AbstractParsingTest extends KtParsingTestCase {
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        getProject().registerService(ScriptDefinitionProvider.class, CliScriptDefinitionProvider.class);
-    }
 
     @Override
     protected String getTestDataPath() {

compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java

@@ -6,6 +6,8 @@
 package org.jetbrains.kotlin.parsing;
 
 import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.script.ScriptDefinitionProvider;
+import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TargetBackend;
@@ -2473,6 +2475,13 @@ public class ParsingTestGenerated extends AbstractParsingTest {
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Script extends AbstractParsingTest {
+
+            @Override
+            protected void setUp() throws Exception {
+                super.setUp();
+                getProject().registerService(ScriptDefinitionProvider.class, CliScriptDefinitionProvider.class);
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doParsingTest, TargetBackend.ANY, testDataFilePath);
             }

compiler/tests/org/jetbrains/kotlin/scripts/ScriptProviderTest.kt

@@ -5,9 +5,9 @@
 
 package org.jetbrains.kotlin.scripts
 
-import org.jetbrains.kotlin.cli.common.script.CliScriptDefinitionProvider
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
 import org.jetbrains.kotlin.script.ScriptDefinitionsSource
+import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import org.junit.Assert
 import org.junit.Test