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

Minor: Fix NPE in tests which doesn't use facets

Browse Source
This commit is contained in:
Alexey Sedunov
2018-04-16 16:10:03 +03:00
parent 9bce8759bb
commit e58f8763fe
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.181
+13 -13
View File
@@ -186,22 +186,22 @@ fun configureCompilerOptions(fileText: String, project: Project, module: Module)
val jvmTarget = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// JVM_TARGET: ") val jvmTarget = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// JVM_TARGET: ")
val options = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// COMPILER_ARGUMENTS: ") val options = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// COMPILER_ARGUMENTS: ")
if (version != null) { if (version != null || jvmTarget != null || options != null) {
configureLanguageAndApiVersion(project, module, version) configureLanguageAndApiVersion(project, module, version ?: LanguageVersion.LATEST_STABLE.versionString)
}
val facetSettings = KotlinFacet.get(module)!!.configuration.settings val facetSettings = KotlinFacet.get(module)!!.configuration.settings
if (jvmTarget != null) { if (jvmTarget != null) {
(facetSettings.compilerArguments as K2JVMCompilerArguments).jvmTarget = jvmTarget (facetSettings.compilerArguments as K2JVMCompilerArguments).jvmTarget = jvmTarget
} }
if (options != null) { if (options != null) {
val compilerSettings = facetSettings.compilerSettings ?: CompilerSettings().also { val compilerSettings = facetSettings.compilerSettings ?: CompilerSettings().also {
facetSettings.compilerSettings = it facetSettings.compilerSettings = it
}
compilerSettings.additionalArguments = options
facetSettings.updateMergedArguments()
} }
compilerSettings.additionalArguments = options
facetSettings.updateMergedArguments()
} }
} }