diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties index 42b489d8e84..b49379ba29d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties @@ -214,7 +214,7 @@ add.test.to.classpath=Add kotlin-test.jar to the classpath # Kotlin Compiler Settings Tab #Common -kotlin.compiler.option.generate.no.warnings=Generate no &warnings +kotlin.compiler.option.generate.no.warnings=Report compiler &warnings kotlin.compiler.option.additional.command.line.parameters=&Additional command line parameters: kotlin.compiler.option.additional.command.line.parameters.dialog.title=Additional command line parameters @@ -226,8 +226,8 @@ kotlin.compiler.js.option.panel.title=Kotlin to JavaScript kotlin.compiler.js.option.generate.sourcemaps=Generate &source maps kotlin.compiler.js.option.output.prefix=File to &prepend to generated code: kotlin.compiler.js.option.output.postfix=File to append to generated c&ode: -kotlin.compiler.js.option.output.prefix.browse.title=Choose output file prefix -kotlin.compiler.js.option.output.postfix.browse.title=Choose output file postfix +kotlin.compiler.js.option.output.prefix.browse.title=Choose file to prepend to generated code +kotlin.compiler.js.option.output.postfix.browse.title=Choose file to append to generated code kotlin.compiler.js.option.output.copy.files=&Copy library runtime files kotlin.compiler.js.option.output.copy.dir=O&utput directory for library &runtime files: diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form index 011708c90ae..b132a5e938b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form @@ -1,9 +1,9 @@
- + - + @@ -12,181 +12,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -196,20 +28,9 @@ - - - - - - - - - - - - + @@ -223,9 +44,7 @@ - - - + @@ -281,12 +100,21 @@ + + + + + + + + + - + @@ -298,9 +126,7 @@ - - - + @@ -317,9 +143,7 @@ - - - + @@ -339,7 +163,7 @@ - + @@ -365,6 +189,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java index cf5d5f84338..f3febb403cb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -85,7 +85,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co private K2JVMCompilerArguments k2jvmCompilerArguments; private CompilerSettings compilerSettings; private JPanel contentPane; - private ThreeStateCheckBox generateNoWarningsCheckBox; + private ThreeStateCheckBox reportWarningsCheckBox; private RawCommandLineEditor additionalArgsOptionsField; private JLabel additionalArgsLabel; private ThreeStateCheckBox generateSourceMapsCheckBox; @@ -105,9 +105,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co private JPanel k2jsPanel; private JComboBox jvmVersionComboBox; private JComboBox languageVersionComboBox; - private JPanel languageVersionPanel; private JComboBox coroutineSupportComboBox; - private JPanel apiVersionPanel; private JComboBox apiVersionComboBox; private JPanel scriptPanel; private JLabel labelForOutputPrefixFile; @@ -183,7 +181,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co k2jvmPanel.setVisible(false); } - generateNoWarningsCheckBox.setThirdStateEnabled(isMultiEditor); + reportWarningsCheckBox.setThirdStateEnabled(isMultiEditor); generateSourceMapsCheckBox.setThirdStateEnabled(isMultiEditor); copyRuntimeFilesCheckBox.setThirdStateEnabled(isMultiEditor); keepAliveCheckBox.setThirdStateEnabled(isMultiEditor); @@ -346,7 +344,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co @Override public boolean isModified() { - return ComparingUtils.isModified(generateNoWarningsCheckBox, commonCompilerArguments.suppressWarnings) || + return ComparingUtils.isModified(reportWarningsCheckBox, !commonCompilerArguments.suppressWarnings) || !getSelectedLanguageVersion().equals(getLanguageVersionOrDefault(commonCompilerArguments.languageVersion)) || !getSelectedAPIVersion().equals(getLanguageVersionOrDefault(commonCompilerArguments.apiVersion)) || !coroutineSupportComboBox.getSelectedItem().equals(CoroutineSupport.byCompilerArguments(commonCompilerArguments)) || @@ -413,7 +411,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co } } - commonCompilerArguments.suppressWarnings = generateNoWarningsCheckBox.isSelected(); + commonCompilerArguments.suppressWarnings = !reportWarningsCheckBox.isSelected(); commonCompilerArguments.languageVersion = getSelectedLanguageVersion(); commonCompilerArguments.apiVersion = getSelectedAPIVersion(); LanguageFeature.State coroutineSupport = (LanguageFeature.State) coroutineSupportComboBox.getSelectedItem(); @@ -461,7 +459,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co @Override public void reset() { - generateNoWarningsCheckBox.setSelected(commonCompilerArguments.suppressWarnings); + reportWarningsCheckBox.setSelected(!commonCompilerArguments.suppressWarnings); languageVersionComboBox.setSelectedItem(getLanguageVersionOrDefault(commonCompilerArguments.languageVersion)); apiVersionComboBox.setSelectedItem(getLanguageVersionOrDefault(commonCompilerArguments.apiVersion)); restrictAPIVersions(); @@ -506,8 +504,8 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co return contentPane; } - public ThreeStateCheckBox getGenerateNoWarningsCheckBox() { - return generateNoWarningsCheckBox; + public ThreeStateCheckBox getReportWarningsCheckBox() { + return reportWarningsCheckBox; } public RawCommandLineEditor getAdditionalArgsOptionsField() { diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt index 2d7f0bff810..db21b2c01ae 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt @@ -237,7 +237,7 @@ class KotlinFacetEditorGeneralTab( validatorsManager.registerValidator(coroutineValidator) with(editor.compilerConfigurable) { - generateNoWarningsCheckBox.validateOnChange() + reportWarningsCheckBox.validateOnChange() additionalArgsOptionsField.textField.validateOnChange() generateSourceMapsCheckBox.validateOnChange() outputPrefixFile.textField.validateOnChange() diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt b/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt index 396720f6982..1759bca27a4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt @@ -41,7 +41,7 @@ class MultipleKotlinFacetEditor( helper.bind(useProjectSettingsCheckBox, editors) { it.tabEditor.useProjectSettingsCheckBox } helper.bind(targetPlatformComboBox, editors) { it.tabEditor.targetPlatformComboBox } with(compilerConfigurable) { - helper.bind(generateNoWarningsCheckBox, editors) { it.compilerConfigurable.generateNoWarningsCheckBox } + helper.bind(reportWarningsCheckBox, editors) { it.compilerConfigurable.reportWarningsCheckBox } helper.bind(additionalArgsOptionsField.textField, editors) { it.compilerConfigurable.additionalArgsOptionsField.textField } helper.bind(generateSourceMapsCheckBox, editors) { it.compilerConfigurable.generateSourceMapsCheckBox} helper.bind(outputPrefixFile.textField, editors) { it.compilerConfigurable.outputPrefixFile.textField }