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

Minor. Reformat KotlinFacetEditorGeneralTab

Browse Source
This commit is contained in:
Andrey Uskov
2019-06-28 16:42:22 +03:00
parent 9fc60be9d8
commit efb0e692ae
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+10 -7
View File
@@ -97,7 +97,7 @@ class KotlinFacetEditorGeneralTab(
.flatMap { it.componentPlatforms } .flatMap { it.componentPlatforms }
.distinct() .distinct()
.sortedBy { it.platformName } .sortedBy { it.platformName }
.associate { Pair(it, ThreeStateCheckBox(it.platformName).apply {isThirdStateEnabled = isMultiEditor} ) } .associate { Pair(it, ThreeStateCheckBox(it.platformName).apply { isThirdStateEnabled = isMultiEditor }) }
projectSettingsLink = HoverHyperlinkLabel("Edit project settings").apply { projectSettingsLink = HoverHyperlinkLabel("Edit project settings").apply {
addHyperlinkListener { addHyperlinkListener {
ShowSettingsUtilImpl.showSettingsDialog(project, compilerConfigurable.id, "") ShowSettingsUtilImpl.showSettingsDialog(project, compilerConfigurable.id, "")
@@ -147,12 +147,14 @@ class KotlinFacetEditorGeneralTab(
compilerConfigurable.setTargetPlatform(getChosenPlatform()?.idePlatformKind) compilerConfigurable.setTargetPlatform(getChosenPlatform()?.idePlatformKind)
compilerConfigurable.setEnabled(!useProjectSettings) compilerConfigurable.setEnabled(!useProjectSettings)
if (useProjectSettings) { if (useProjectSettings) {
compilerConfigurable.commonCompilerArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as CommonCompilerArguments? compilerConfigurable.commonCompilerArguments =
compilerConfigurable.k2jvmCompilerArguments = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments? KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as CommonCompilerArguments?
compilerConfigurable.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments? 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? compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings.unfrozen() as CompilerSettings?
} } else {
else {
compilerConfigurable.commonCompilerArguments = editableCommonArguments compilerConfigurable.commonCompilerArguments = editableCommonArguments
compilerConfigurable.k2jvmCompilerArguments = editableJvmArguments compilerConfigurable.k2jvmCompilerArguments = editableJvmArguments
compilerConfigurable.k2jsCompilerArguments = editableJsArguments compilerConfigurable.k2jsCompilerArguments = editableJsArguments
@@ -358,4 +360,5 @@ class KotlinFacetEditorGeneralTab(
} }
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val <T> ComboBox<T>.selectedItemTyped: T? get() = selectedItem as T? val <T> ComboBox<T>.selectedItemTyped: T?
get() = selectedItem as T?