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

Minor: Fix facet/project settings editor

Browse Source
This commit is contained in:
Alexey Sedunov
2017-08-02 14:13:24 +03:00
parent f0becd0040
commit e38cf54dac
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+4 -4
View File
@@ -208,10 +208,10 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
@SuppressWarnings("unused")
public KotlinCompilerConfigurableTab(Project project) {
this(project,
KotlinCommonCompilerArgumentsHolder.Companion.getInstance(project).getSettings(),
Kotlin2JsCompilerArgumentsHolder.Companion.getInstance(project).getSettings(),
Kotlin2JvmCompilerArgumentsHolder.Companion.getInstance(project).getSettings(),
KotlinCompilerSettings.Companion.getInstance(project).getSettings(),
(CommonCompilerArguments) KotlinCommonCompilerArgumentsHolder.Companion.getInstance(project).getSettings().unfrozen(),
(K2JSCompilerArguments) Kotlin2JsCompilerArgumentsHolder.Companion.getInstance(project).getSettings().unfrozen(),
(K2JVMCompilerArguments) Kotlin2JvmCompilerArgumentsHolder.Companion.getInstance(project).getSettings().unfrozen(),
(CompilerSettings) KotlinCompilerSettings.Companion.getInstance(project).getSettings().unfrozen(),
ServiceManager.getService(project, KotlinCompilerWorkspaceSettings.class),
true,
false);
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+6 -6
View File
@@ -67,9 +67,9 @@ class KotlinFacetEditorGeneralTab(
else {
editableCommonArguments = configuration!!.settings.compilerArguments!!
editableJvmArguments = editableCommonArguments as? K2JVMCompilerArguments
?: Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings
?: Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments
editableJsArguments = editableCommonArguments as? K2JSCompilerArguments
?: Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings
?: Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments
editableCompilerSettings = configuration.settings.compilerSettings!!
}
@@ -132,10 +132,10 @@ class KotlinFacetEditorGeneralTab(
compilerConfigurable.setTargetPlatform(chosenPlatform)
compilerConfigurable.setEnabled(!useProjectSettings)
if (useProjectSettings) {
compilerConfigurable.commonCompilerArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).settings
compilerConfigurable.k2jvmCompilerArguments = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings
compilerConfigurable.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings
compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings
compilerConfigurable.commonCompilerArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as CommonCompilerArguments?
compilerConfigurable.k2jvmCompilerArguments = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments?
compilerConfigurable.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments?
compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings.unfrozen() as CompilerSettings?
}
else {
compilerConfigurable.commonCompilerArguments = editableCommonArguments