From 1e8dff6a7cab59b43f520dd9cd3fd23b475c3f1a Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 4 May 2020 15:47:10 +0300 Subject: [PATCH] Fix bunch files after removing IDE option Follow-up of c01a171d --- .../KotlinCompilerConfigurableTab.java.191 | 14 +------------- .../KotlinCompilerConfigurableTab.java.192 | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.191 b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.191 index dadf430da8e..02e0563a089 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.191 +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.191 @@ -37,7 +37,6 @@ import org.jetbrains.kotlin.idea.PluginStartupComponent; import org.jetbrains.kotlin.idea.KotlinBundle; import org.jetbrains.kotlin.idea.facet.DescriptionListCellRenderer; import org.jetbrains.kotlin.idea.facet.KotlinFacet; -import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent; import org.jetbrains.kotlin.idea.roots.RootUtilsKt; import org.jetbrains.kotlin.idea.util.CidrUtil; import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt; @@ -112,7 +111,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { private JLabel labelForSourceMapPrefix; private JComboBox sourceMapEmbedSources; private JPanel coroutinesPanel; - private ThreeStateCheckBox enableNewInferenceInIDECheckBox; private boolean isEnabled = true; public KotlinCompilerConfigurableTab( @@ -153,7 +151,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { } reportWarningsCheckBox.setThirdStateEnabled(isMultiEditor); - enableNewInferenceInIDECheckBox.setThirdStateEnabled(isMultiEditor); if (isProjectSettings) { List modulesOverridingProjectSettings = ArraysKt.mapNotNull( @@ -211,7 +208,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { keepAliveCheckBox.setVisible(false); k2jvmPanel.setVisible(false); enableIncrementalCompilationForJsCheckBox.setVisible(false); - enableNewInferenceInIDECheckBox.setVisible(false); } updateOutputDirEnabled(); @@ -443,7 +439,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { @Override public boolean isModified() { return isModified(reportWarningsCheckBox, !commonCompilerArguments.getSuppressWarnings()) || - isModified(enableNewInferenceInIDECheckBox, NewInferenceForIDEAnalysisComponent.isEnabled(project)) || !getSelectedLanguageVersionView().equals(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)) || !getSelectedAPIVersionView().equals(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)) || !getSelectedCoroutineState().equals(commonCompilerArguments.getCoroutinesState()) || @@ -521,8 +516,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { !getSelectedLanguageVersionView().equals(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)) || !getSelectedAPIVersionView().equals(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)) || !getSelectedCoroutineState().equals(commonCompilerArguments.getCoroutinesState()) || - !additionalArgsOptionsField.getText().equals(compilerSettings.getAdditionalArguments()) || - enableNewInferenceInIDECheckBox.isSelected() != NewInferenceForIDEAnalysisComponent.isEnabled(project); + !additionalArgsOptionsField.getText().equals(compilerSettings.getAdditionalArguments()); if (shouldInvalidateCaches) { ApplicationUtilsKt.runWriteAction( @@ -538,7 +532,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { } commonCompilerArguments.setSuppressWarnings(!reportWarningsCheckBox.isSelected()); - NewInferenceForIDEAnalysisComponent.setEnabled(project, enableNewInferenceInIDECheckBox.isSelected()); KotlinFacetSettingsKt.setLanguageVersionView(commonCompilerArguments, getSelectedLanguageVersionView()); KotlinFacetSettingsKt.setApiVersionView(commonCompilerArguments, getSelectedAPIVersionView()); @@ -591,7 +584,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { @Override public void reset() { reportWarningsCheckBox.setSelected(!commonCompilerArguments.getSuppressWarnings()); - enableNewInferenceInIDECheckBox.setSelected(NewInferenceForIDEAnalysisComponent.isEnabled(project)); languageVersionComboBox.setSelectedItem(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)); onLanguageLevelChanged(getSelectedLanguageVersionView()); apiVersionComboBox.setSelectedItem(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)); @@ -644,10 +636,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { return reportWarningsCheckBox; } - public ThreeStateCheckBox getEnableNewInferenceInIDECheckBox() { - return enableNewInferenceInIDECheckBox; - } - public RawCommandLineEditor getAdditionalArgsOptionsField() { return additionalArgsOptionsField; } diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192 b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192 index aa561e58869..1357af1dcd1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192 +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192 @@ -38,7 +38,6 @@ import org.jetbrains.kotlin.idea.configuration.ProjectUtilsKt; import org.jetbrains.kotlin.idea.KotlinBundle; import org.jetbrains.kotlin.idea.facet.DescriptionListCellRenderer; import org.jetbrains.kotlin.idea.facet.KotlinFacet; -import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent; import org.jetbrains.kotlin.idea.roots.RootUtilsKt; import org.jetbrains.kotlin.idea.util.CidrUtil; import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt; @@ -113,7 +112,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { private JLabel labelForSourceMapPrefix; private JComboBox sourceMapEmbedSources; private JPanel coroutinesPanel; - private ThreeStateCheckBox enableNewInferenceInIDECheckBox; private boolean isEnabled = true; public KotlinCompilerConfigurableTab( @@ -154,7 +152,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { } reportWarningsCheckBox.setThirdStateEnabled(isMultiEditor); - enableNewInferenceInIDECheckBox.setThirdStateEnabled(isMultiEditor); if (isProjectSettings) { List modulesOverridingProjectSettings = ArraysKt.mapNotNull( @@ -212,7 +209,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { keepAliveCheckBox.setVisible(false); k2jvmPanel.setVisible(false); enableIncrementalCompilationForJsCheckBox.setVisible(false); - enableNewInferenceInIDECheckBox.setVisible(false); } updateOutputDirEnabled(); @@ -444,7 +440,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { @Override public boolean isModified() { return isModified(reportWarningsCheckBox, !commonCompilerArguments.getSuppressWarnings()) || - isModified(enableNewInferenceInIDECheckBox, NewInferenceForIDEAnalysisComponent.isEnabled(project)) || !getSelectedLanguageVersionView().equals(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)) || !getSelectedAPIVersionView().equals(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)) || !getSelectedCoroutineState().equals(commonCompilerArguments.getCoroutinesState()) || @@ -522,8 +517,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { !getSelectedLanguageVersionView().equals(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)) || !getSelectedAPIVersionView().equals(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)) || !getSelectedCoroutineState().equals(commonCompilerArguments.getCoroutinesState()) || - !additionalArgsOptionsField.getText().equals(compilerSettings.getAdditionalArguments()) || - enableNewInferenceInIDECheckBox.isSelected() != NewInferenceForIDEAnalysisComponent.isEnabled(project); + !additionalArgsOptionsField.getText().equals(compilerSettings.getAdditionalArguments()); if (shouldInvalidateCaches) { ApplicationUtilsKt.runWriteAction( @@ -539,7 +533,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { } commonCompilerArguments.setSuppressWarnings(!reportWarningsCheckBox.isSelected()); - NewInferenceForIDEAnalysisComponent.setEnabled(project, enableNewInferenceInIDECheckBox.isSelected()); KotlinFacetSettingsKt.setLanguageVersionView(commonCompilerArguments, getSelectedLanguageVersionView()); KotlinFacetSettingsKt.setApiVersionView(commonCompilerArguments, getSelectedAPIVersionView()); @@ -592,7 +585,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { @Override public void reset() { reportWarningsCheckBox.setSelected(!commonCompilerArguments.getSuppressWarnings()); - enableNewInferenceInIDECheckBox.setSelected(NewInferenceForIDEAnalysisComponent.isEnabled(project)); languageVersionComboBox.setSelectedItem(KotlinFacetSettingsKt.getLanguageVersionView(commonCompilerArguments)); onLanguageLevelChanged(getSelectedLanguageVersionView()); apiVersionComboBox.setSelectedItem(KotlinFacetSettingsKt.getApiVersionView(commonCompilerArguments)); @@ -645,10 +637,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { return reportWarningsCheckBox; } - public ThreeStateCheckBox getEnableNewInferenceInIDECheckBox() { - return enableNewInferenceInIDECheckBox; - } - public RawCommandLineEditor getAdditionalArgsOptionsField() { return additionalArgsOptionsField; }