azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests for js

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-11-23 14:49:48 +03:00
parent ac8dd1262c
commit a7636126a1
12 changed files with 30 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java
-2
View File
@@ -27,7 +27,6 @@ import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VfsUtil;
import kotlin.jvm.functions.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager;
import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.utils.PathUtil;
@@ -87,7 +86,6 @@ public class ConfigLibraryUtil {
public static void unConfigureKotlinJsRuntimeAndSdk(Module module, Sdk sdk) {
configureSdk(module, sdk);
removeLibrary(module, DEFAULT_KOTLIN_JS_STDLIB_NAME);
removeLibrary(module, KotlinJavaScriptLibraryManager.LIBRARY_NAME);
}
public static void configureSdk(@NotNull final Module module, @NotNull final Sdk sdk) {
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
-2
View File
@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
import org.jetbrains.kotlin.idea.decompiler.KotlinClassFileViewProvider
import org.jetbrains.kotlin.idea.decompiler.KtClsFile
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver
import org.jetbrains.kotlin.psi.KtFile
import java.util.*
@@ -68,7 +67,6 @@ public fun Module.configureAs(kind: ModuleKind) {
this.configureAs(ProjectDescriptorWithStdlibSources.INSTANCE)
ModuleKind.KOTLIN_JAVASCRIPT -> {
this.configureAs(KotlinStdJSProjectDescriptor.instance)
KotlinJavaScriptLibraryManager.getInstance(this.getProject()).syncUpdateProjectLibrary()
}
else -> throw IllegalArgumentException("Unknown kind=$kind")