Refactoring: inline implementation into KotlinStdJSProjectDescriptor

idea/idea-completion/idea-completion.iml

@@ -22,7 +22,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
-    <orderEntry type="module" module-name="idea" scope="RUNTIME" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="formatter" />
   </component>

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java

@@ -27,7 +27,7 @@ public abstract class AbstractJSBasicCompletionTest extends KotlinFixtureComplet
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return KotlinStdJSProjectDescriptor.Companion.getInstance();
+        return KotlinStdJSProjectDescriptor.INSTANCE;
     }
 
     @NotNull

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt

@@ -130,7 +130,7 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix
                     return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
                 }
                 else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "JS")) {
-                    return KotlinStdJSProjectDescriptor.instance
+                    return KotlinStdJSProjectDescriptor
                 }
             }
             catch (e: IOException) {

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,24 @@
 
 package org.jetbrains.kotlin.idea.test
 
-import com.intellij.testFramework.LightProjectDescriptor
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.module.ModuleType
+import com.intellij.openapi.module.StdModuleTypes
+import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor
+import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription
 
-open class KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() {
+object KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() {
-    companion object {
+    override fun getModuleType(): ModuleType<*> = StdModuleTypes.JAVA
-        val instance: KotlinStdJSProjectDescriptor
+    override fun getSdk(): Sdk? = null
-                = Class.forName("org.jetbrains.kotlin.test.KotlinStdJSProjectDescriptorImpl").newInstance() as KotlinStdJSProjectDescriptor
+
+    override fun configureModule(module: Module, model: ModifiableRootModel) {
+        val configuration = JSLibraryStdDescription(module.project).createNewLibraryForTests() ?: error("Configuration should exist")
+
+        val editor = NewLibraryEditor(configuration.libraryType, configuration.properties)
+        configuration.addRoots(editor)
+
+        ConfigLibraryUtil.addLibrary(editor, model)
     }
 }

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt

@@ -66,7 +66,7 @@ fun Module.configureAs(kind: ModuleKind) {
         ModuleKind.KOTLIN_JVM_WITH_STDLIB_SOURCES ->
             this.configureAs(ProjectDescriptorWithStdlibSources.INSTANCE)
         ModuleKind.KOTLIN_JAVASCRIPT -> {
-            this.configureAs(KotlinStdJSProjectDescriptor.instance)
+            this.configureAs(KotlinStdJSProjectDescriptor)
         }
 
         else -> throw IllegalArgumentException("Unknown kind=$kind")

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

@@ -22,7 +22,6 @@ import com.intellij.testFramework.LightProjectDescriptor
 import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.KtFile

idea/tests/org/jetbrains/kotlin/checkers/AbstractJsCheckerTest.java

@@ -25,7 +25,7 @@ public abstract class AbstractJsCheckerTest extends KotlinLightCodeInsightFixtur
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return KotlinStdJSProjectDescriptor.Companion.getInstance();
+        return KotlinStdJSProjectDescriptor.INSTANCE;
     }
 
     public void doTest(String filePath) {

idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt

@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.idea.imports
 
 import org.jetbrains.kotlin.AbstractImportsTest
-import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
 
 abstract class AbstractOptimizeImportsTest() : AbstractImportsTest() {
     override fun doTest(file: KtFile): String {
@@ -39,5 +39,5 @@ abstract class AbstractOptimizeImportsTest() : AbstractImportsTest() {
 abstract class AbstractJvmOptimizeImportsTest : AbstractOptimizeImportsTest()
 
 abstract class AbstractJsOptimizeImportsTest : AbstractOptimizeImportsTest() {
-    override fun getProjectDescriptor() = KotlinStdJSProjectDescriptor.instance
+    override fun getProjectDescriptor() = KotlinStdJSProjectDescriptor
 }

idea/tests/org/jetbrains/kotlin/test/KotlinStdJSProjectDescriptorImpl.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.test;
-
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleType;
-import com.intellij.openapi.module.StdModuleTypes;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.ModifiableRootModel;
-import com.intellij.openapi.roots.libraries.NewLibraryConfiguration;
-import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription;
-import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
-import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor;
-
-public class KotlinStdJSProjectDescriptorImpl extends KotlinStdJSProjectDescriptor {
-    @Override
-    public ModuleType getModuleType() {
-        return StdModuleTypes.JAVA;
-    }
-
-    @Override
-    public Sdk getSdk() {
-        return null;
-    }
-
-    @Override
-    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model) {
-        NewLibraryConfiguration configuration = new JSLibraryStdDescription(module.getProject()).createNewLibraryForTests();
-
-        assert configuration != null : "Configuration should exist";
-
-        NewLibraryEditor editor = new NewLibraryEditor(configuration.getLibraryType(), configuration.getProperties());
-        configuration.addRoots(editor);
-
-        ConfigLibraryUtil.addLibrary(editor, model);
-    }
-}