diff --git a/idea/resources-en/messages/KotlinBundle.properties b/idea/resources-en/messages/KotlinBundle.properties
index 7a3536e6bf2..2bcbf9fcc28 100644
--- a/idea/resources-en/messages/KotlinBundle.properties
+++ b/idea/resources-en/messages/KotlinBundle.properties
@@ -1850,7 +1850,6 @@ destination.directory=&Destination directory
language.version=&Language version
add.prefix.to.paths.in.source.map=Add prefix to paths in source map:
api.version=AP&I version
-compiler.coroutines=Coro&utines
embed.source.code.into.source.map=Embed source code into source map:
enable.incremental.compilation=Enable incremental compilation
keep.compiler.process.alive.between.invocations=Keep compiler process alive between invocations
@@ -2222,4 +2221,4 @@ hints.codevision.inheritors.to_many.format={0,number}+ Inheritors
hints.codevision.overrides.format={0, choice, 1#1 Override|2#{0,number} Overrides}
hints.codevision.overrides.to_many.format={0,number}+ Overrides
hints.codevision.settings=Settings...
-inspection.unused.result.of.data.class.copy=Unused result of data class copy
\ No newline at end of file
+inspection.unused.result.of.data.class.copy=Unused result of data class copy
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 9e9e89f373f..745e6a86801 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -331,30 +331,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 d3ba8f912a1..7c1ce14f70d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -103,7 +103,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
private JPanel k2jsPanel;
private JComboBox jvmVersionComboBox;
private JComboBox languageVersionComboBox;
- private JComboBox coroutineSupportComboBox;
private JComboBox apiVersionComboBox;
private JPanel scriptPanel;
private JLabel labelForOutputPrefixFile;
@@ -141,7 +140,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
additionalArgsOptionsField.attachLabel(additionalArgsLabel);
fillLanguageAndAPIVersionList();
- fillCoroutineSupportList();
if (CidrUtil.isRunningInCidrIde()) {
keepAliveCheckBox.setVisible(false);
@@ -382,14 +380,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
apiVersionComboBox.setRenderer(new DescriptionListCellRenderer());
}
- @SuppressWarnings("unchecked")
- private void fillCoroutineSupportList() {
- for (LanguageFeature.State coroutineSupport : languageFeatureStates) {
- coroutineSupportComboBox.addItem(coroutineSupport);
- }
- coroutineSupportComboBox.setRenderer(new DescriptionListCellRenderer());
- }
-
public void setTargetPlatform(@Nullable IdePlatformKind targetPlatform) {
k2jsPanel.setVisible(JsIdePlatformUtil.isJavaScript(targetPlatform));
scriptPanel.setVisible(JvmIdePlatformUtil.isJvm(targetPlatform));
@@ -444,7 +434,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
return isModified(reportWarningsCheckBox, !commonCompilerArguments.getSuppressWarnings()) ||
!getSelectedLanguageVersionView().equals(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)) ||
!getSelectedAPIVersionView().equals(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)) ||
- !getSelectedCoroutineState().equals(commonCompilerArguments.getCoroutinesState()) ||
!additionalArgsOptionsField.getText().equals(compilerSettings.getAdditionalArguments()) ||
isModified(scriptTemplatesField, compilerSettings.getScriptTemplates()) ||
isModified(scriptTemplatesClasspathField, compilerSettings.getScriptTemplatesClasspath()) ||
@@ -492,26 +481,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
return item != null ? (VersionView) item : VersionView.LatestStable.INSTANCE;
}
- @NotNull
- private String getSelectedCoroutineState() {
- if (getSelectedLanguageVersionView().getVersion().compareTo(LanguageVersion.KOTLIN_1_3) >= 0) {
- return CommonCompilerArguments.DEFAULT;
- }
-
- LanguageFeature.State state = (LanguageFeature.State) coroutineSupportComboBox.getSelectedItem();
- if (state == null) return CommonCompilerArguments.DEFAULT;
- switch (state) {
- case ENABLED:
- return CommonCompilerArguments.ENABLE;
- case ENABLED_WITH_WARNING:
- return CommonCompilerArguments.WARN;
- case ENABLED_WITH_ERROR:
- return CommonCompilerArguments.ERROR;
- default:
- return CommonCompilerArguments.DEFAULT;
- }
- }
-
public void applyTo(
CommonCompilerArguments commonCompilerArguments,
K2JVMCompilerArguments k2jvmCompilerArguments,
@@ -522,7 +491,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
boolean shouldInvalidateCaches =
!getSelectedLanguageVersionView().equals(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)) ||
!getSelectedAPIVersionView().equals(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)) ||
- !getSelectedCoroutineState().equals(commonCompilerArguments.getCoroutinesState()) ||
!additionalArgsOptionsField.getText().equals(compilerSettings.getAdditionalArguments());
if (shouldInvalidateCaches) {
@@ -542,8 +510,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
KotlinFacetSettingsKt.setLanguageVersionView(commonCompilerArguments, getSelectedLanguageVersionView());
KotlinFacetSettingsKt.setApiVersionView(commonCompilerArguments, getSelectedAPIVersionView());
- commonCompilerArguments.setCoroutinesState(getSelectedCoroutineState());
-
compilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText());
compilerSettings.setScriptTemplates(scriptTemplatesField.getText());
compilerSettings.setScriptTemplatesClasspath(scriptTemplatesClasspathField.getText());
@@ -595,7 +561,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
setSelectedItem(languageVersionComboBox, KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments));
onLanguageLevelChanged((VersionView) languageVersionComboBox.getSelectedItem()); // getSelectedLanguageVersionView() replaces null
setSelectedItem(apiVersionComboBox, KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments));
- coroutineSupportComboBox.setSelectedItem(CoroutineSupport.byCompilerArguments(commonCompilerArguments));
additionalArgsOptionsField.setText(compilerSettings.getAdditionalArguments());
scriptTemplatesField.setText(compilerSettings.getScriptTemplates());
scriptTemplatesClasspathField.setText(compilerSettings.getScriptTemplatesClasspath());
@@ -701,10 +666,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
return apiVersionComboBox;
}
- public JComboBox getCoroutineSupportComboBox() {
- return coroutineSupportComboBox;
- }
-
public void setEnabled(boolean value) {
isEnabled = value;
UIUtil.setEnabled(getContentPane(), value, true);
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
index 369626ef947..c48330588e9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
@@ -347,7 +347,6 @@ class KotlinFacetEditorGeneralTab(
doValidate()
}
apiVersionComboBox.validateOnChange()
- coroutineSupportComboBox.validateOnChange()
}
editor.targetPlatformSelectSingleCombobox.validateOnChange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt b/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt
index 4e487f54677..eb51021232b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt
@@ -45,7 +45,6 @@ class MultipleKotlinFacetEditor(
helper.bind(scriptTemplatesClasspathField, editors) { it.compilerConfigurable.scriptTemplatesClasspathField }
helper.bind(languageVersionComboBox, editors) { it.compilerConfigurable.languageVersionComboBox }
helper.bind(apiVersionComboBox, editors) { it.compilerConfigurable.apiVersionComboBox }
- helper.bind(coroutineSupportComboBox, editors) { it.compilerConfigurable.coroutineSupportComboBox }
}
}
}
@@ -56,4 +55,4 @@ class MultipleKotlinFacetEditor(
// Their settings might have changed to non-project one due to UI control binding
editors.map { it.tabEditor }.filter { it.useProjectSettingsCheckBox.isSelected }.forEach { it.updateCompilerConfigurable() }
}
-}
\ No newline at end of file
+}