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

add dependency on idea-js to idea-test-framework and fix testUtils

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-04-30 16:03:04 +03:00
parent 9f3154e6c0
commit 533e4ac812
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/idea-test-framework.iml
+1
View File
@@ -13,5 +13,6 @@
<orderEntry type="module" module-name="idea-analysis" /> <orderEntry type="module" module-name="idea-analysis" />
<orderEntry type="module" module-name="idea-core" /> <orderEntry type="module" module-name="idea-core" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="idea-js" scope="TEST" />
</component> </component>
</module> </module>
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
+5 -1
View File
@@ -26,6 +26,7 @@ import com.intellij.util.Consumer
import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager
import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
@@ -53,8 +54,11 @@ public fun Module.configureAs(kind: ModuleKind) {
when(kind) { when(kind) {
ModuleKind.KOTLIN_JVM_WITH_STDLIB_SOURCES -> ModuleKind.KOTLIN_JVM_WITH_STDLIB_SOURCES ->
this.configureAs(ProjectDescriptorWithStdlibSources.INSTANCE) this.configureAs(ProjectDescriptorWithStdlibSources.INSTANCE)
ModuleKind.KOTLIN_JAVASCRIPT -> ModuleKind.KOTLIN_JAVASCRIPT -> {
this.configureAs(KotlinStdJSProjectDescriptor.instance) this.configureAs(KotlinStdJSProjectDescriptor.instance)
KotlinJavaScriptLibraryManager.getInstance(this.getProject()).syncUpdateProjectLibrary()
}
else -> throw IllegalArgumentException("Unknown kind=$kind") else -> throw IllegalArgumentException("Unknown kind=$kind")
} }
} }