Remove unused contentEntry parameter from JetLightProjectDescriptor

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java

@@ -22,6 +22,7 @@ import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.util.io.FileUtilRt;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.test.MockLibraryUtil;
 
 import java.io.File;
@@ -44,7 +45,7 @@ public class JdkAndMockLibraryProjectDescriptor extends JetLightProjectDescripto
     }
 
     @Override
-    public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) {
+    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model) {
         File libraryJar = MockLibraryUtil.compileLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, isJsLibrary);
         String jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.getAbsolutePath()) + "!/";
 

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetJdkAndLibraryProjectDescriptor.java

@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 
-public class JetJdkAndLibraryProjectDescriptor implements LightProjectDescriptor {
+public class JetJdkAndLibraryProjectDescriptor extends JetLightProjectDescriptor {
     public static final String LIBRARY_NAME = "myLibrary";
 
     private final File libraryFile;
@@ -52,7 +52,7 @@ public class JetJdkAndLibraryProjectDescriptor implements LightProjectDescriptor
     }
 
     @Override
-    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @Nullable ContentEntry contentEntry) {
+    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model) {
         NewLibraryEditor editor = new NewLibraryEditor();
         editor.setName(LIBRARY_NAME);
         editor.addRoot(VfsUtil.getUrlForLibraryRoot(libraryFile), OrderRootType.CLASSES);

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightProjectDescriptor.java

@@ -23,6 +23,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.testFramework.LightProjectDescriptor;
+import org.jetbrains.annotations.NotNull;
 
 public class JetLightProjectDescriptor implements LightProjectDescriptor {
     protected JetLightProjectDescriptor() {
@@ -41,6 +42,10 @@ public class JetLightProjectDescriptor implements LightProjectDescriptor {
     }
 
     @Override
-    public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) {
+    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
+        configureModule(module, model);
+    }
+
+    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model) {
     }
 }

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

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.test
 
 import com.intellij.testFramework.LightProjectDescriptor
 
-public trait KotlinStdJSProjectDescriptor : LightProjectDescriptor {
+public open class KotlinStdJSProjectDescriptor : JetLightProjectDescriptor() {
     companion object {
         public val instance: KotlinStdJSProjectDescriptor
                 = Class.forName("org.jetbrains.kotlin.test.KotlinStdJSProjectDescriptorImpl").newInstance() as KotlinStdJSProjectDescriptor

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java

@@ -31,8 +31,8 @@ public class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLigh
     public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
 
     @Override
-    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @Nullable ContentEntry contentEntry) {
-        super.configureModule(module, model, contentEntry);
+    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model) {
+        super.configureModule(module, model);
 
         Library library = model.getModuleLibraryTable().getLibraryByName(LIBRARY_NAME);
         assert library != null;

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

@@ -37,7 +37,7 @@ public enum class ModuleKind {
     KOTLIN_JAVASCRIPT
 }
 
-public fun Module.configureAs(descriptor: LightProjectDescriptor) {
+public fun Module.configureAs(descriptor: JetLightProjectDescriptor) {
     val module = this
     updateModel(module, object : Consumer<ModifiableRootModel> {
         override fun consume(model: ModifiableRootModel) {
@@ -45,8 +45,12 @@ public fun Module.configureAs(descriptor: LightProjectDescriptor) {
                 model.setSdk(descriptor.getSdk())
             }
             val entries = model.getContentEntries()
-            val entry = if (entries.size() > 0) entries[0] else null
-            descriptor.configureModule(module, model, entry)
+            if (entries.isEmpty()) {
+                descriptor.configureModule(module, model)
+            }
+            else {
+                descriptor.configureModule(module, model, entries[0])
+            }
         }
     })
 }