From 72caf429ae5a7f975e7c31d84ea2da7d5ecec7b7 Mon Sep 17 00:00:00 2001 From: Jaime Wren Date: Wed, 20 Nov 2024 11:23:46 -0800 Subject: [PATCH] Remove unused experimental settings (#7803) --- .../src/io/flutter/FlutterBundle.properties | 3 -- .../FlutterSearchableOptionContributor.java | 3 -- .../sdk/FlutterSettingsConfigurable.form | 31 ++-------------- .../sdk/FlutterSettingsConfigurable.java | 35 ------------------- 4 files changed, 2 insertions(+), 70 deletions(-) diff --git a/flutter-idea/src/io/flutter/FlutterBundle.properties b/flutter-idea/src/io/flutter/FlutterBundle.properties index 886d2d9550..35f90ef5fa 100644 --- a/flutter-idea/src/io/flutter/FlutterBundle.properties +++ b/flutter-idea/src/io/flutter/FlutterBundle.properties @@ -189,9 +189,7 @@ flutter.androidstudio.open.hide.notification.text=Hide flutter.androidstudio.open.hide.notification.description=Hide notification until IDE restart settings.try.out.features.still.under.development=Try out features still under development (a restart may be required) -settings.enable.android.gradle.sync=Enable code completion, navigation, etc. for Java / Kotlin (requires restart to do Gradle build) settings.report.google.analytics=&Report usage information to Google Analytics -settings.enable.hot.ui=Enable Hot UI (an early preview of property editing in the outline view) settings.enable.verbose.logging=Enable &verbose logging settings.format.code.on.save=Format code on save settings.organize.imports.on.save=Organize imports on save @@ -202,7 +200,6 @@ settings.enable.bazel.hot.restart=Enable Bazel hot restart (refreshes generated settings.allow.tests.in.sources=Allow files ending with _test.dart to be recognized as tests settings.allow.tests.tooltip=The directory must be marked as a sources root, such as lib. settings.font.packages=Font Packages -settings.show.all.configs=Show all possible run configurations for apps or tests, even if a created configuration already exists settings.show.all.configs.tooltip=If there is a defined run configuration to watch a specific test and one to just run it, show both. settings.jcef.browser=Use JCEF browser to show embedded DevTools settings.jcef.browser.tooltip=JCEF is a browser included in IntelliJ that is an alternative to using JxBrowser for showing embedded DevTools. diff --git a/flutter-idea/src/io/flutter/sdk/FlutterSearchableOptionContributor.java b/flutter-idea/src/io/flutter/sdk/FlutterSearchableOptionContributor.java index 7487068ff2..ba8cc37a28 100644 --- a/flutter-idea/src/io/flutter/sdk/FlutterSearchableOptionContributor.java +++ b/flutter-idea/src/io/flutter/sdk/FlutterSearchableOptionContributor.java @@ -18,10 +18,8 @@ public class FlutterSearchableOptionContributor extends SearchableOptionContribu public void processOptions(@NotNull SearchableOptionProcessor processor) { // Keep these in the same order as FlutterBundle.properties add(processor, FlutterBundle.message("settings.try.out.features.still.under.development")); - add(processor, FlutterBundle.message("settings.enable.android.gradle.sync")); // For some reason the word "report" is ignored by the search feature, but the other words work. add(processor, FlutterBundle.message("settings.report.google.analytics")); - add(processor, FlutterBundle.message("settings.enable.hot.ui")); add(processor, FlutterBundle.message("settings.enable.verbose.logging")); add(processor, FlutterBundle.message("settings.format.code.on.save")); add(processor, FlutterBundle.message("settings.organize.imports.on.save")); @@ -32,7 +30,6 @@ public void processOptions(@NotNull SearchableOptionProcessor processor) { add(processor, FlutterBundle.message("settings.allow.tests.in.sources")); add(processor, FlutterBundle.message("settings.allow.tests.tooltip")); add(processor, FlutterBundle.message("settings.font.packages")); - add(processor, FlutterBundle.message("settings.show.all.configs")); add(processor, FlutterBundle.message("settings.show.all.configs.tooltip")); add(processor, FlutterBundle.message("settings.enable.androi.gradle.sync.tooltip")); add(processor, FlutterBundle.message("settings.experiments")); diff --git a/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.form b/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.form index c304e0c112..ee9843bd0e 100644 --- a/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.form +++ b/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.form @@ -224,7 +224,7 @@ - + @@ -240,36 +240,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.java b/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.java index 6e676a472e..c24b2ad116 100644 --- a/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.java +++ b/flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.java @@ -8,7 +8,6 @@ import com.intellij.execution.process.ProcessOutput; import com.intellij.ide.actions.ShowSettingsUtilImpl; import com.intellij.ide.actionsOnSave.ActionsOnSaveConfigurable; -import com.intellij.ide.browsers.BrowserLauncher; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; @@ -30,7 +29,6 @@ import com.intellij.ui.DocumentAdapter; import com.intellij.ui.components.ActionLink; import com.intellij.ui.components.JBLabel; -import com.intellij.ui.components.labels.LinkLabel; import com.intellij.util.PlatformIcons; import icons.FlutterIcons; import io.flutter.*; @@ -48,8 +46,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.text.JTextComponent; import java.awt.datatransfer.StringSelection; -import java.net.URI; -import java.net.URISyntaxException; import java.util.List; import java.util.concurrent.Semaphore; @@ -70,12 +66,8 @@ public class FlutterSettingsConfigurable implements SearchableConfigurable { private JCheckBox myOrganizeImportsOnSaveCheckBox; private JCheckBox myShowStructuredErrors; private JCheckBox myIncludeAllStackTraces; - private JCheckBox mySyncAndroidLibrariesCheckBox; - private JCheckBox myEnableHotUiCheckBox; private JCheckBox myEnableBazelHotRestartCheckBox; - private JCheckBox myShowAllRunConfigurationsInContextCheckBox; - private JCheckBox myEnableJcefBrowserCheckBox; private JCheckBox myShowBuildMethodGuides; @@ -143,13 +135,6 @@ protected void textChanged(@NotNull final DocumentEvent e) { myShowStructuredErrors.addChangeListener( (e) -> myIncludeAllStackTraces.setEnabled(myShowStructuredErrors.isSelected())); - // There are other experiments so it is alright to show the experiments - // panel even if the syncAndroidLibraries experiment is hidden. - // If there are only experiments available on Android studio then add back - // the following statement: - // experimentsPanel.setVisible(FlutterUtils.isAndroidStudio()); - mySyncAndroidLibrariesCheckBox.setVisible(FlutterUtils.isAndroidStudio()); - myEnableBazelHotRestartCheckBox.setVisible(WorkspaceCache.getInstance(myProject).isBazel()); } @@ -228,14 +213,6 @@ public boolean isModified() { return true; } - if (settings.isSyncingAndroidLibraries() != mySyncAndroidLibrariesCheckBox.isSelected()) { - return true; - } - - if (settings.isEnableHotUi() != myEnableHotUiCheckBox.isSelected()) { - return true; - } - if (settings.isEnableBazelHotRestart() != myEnableBazelHotRestartCheckBox.isSelected()) { return true; } @@ -248,11 +225,6 @@ public boolean isModified() { return true; } - //noinspection RedundantIfStatement - if (settings.showAllRunConfigurationsInContext() != myShowAllRunConfigurationsInContextCheckBox.isSelected()) { - return true; - } - return settings.isEnableJcefBrowser() != myEnableJcefBrowserCheckBox.isSelected(); } @@ -303,11 +275,8 @@ public void apply() throws ConfigurationException { settings.setOpenInspectorOnAppLaunch(myOpenInspectorOnAppLaunchCheckBox.isSelected()); settings.setPerserveLogsDuringHotReloadAndRestart(myEnableLogsPreserveAfterHotReloadOrRestart.isSelected()); settings.setVerboseLogging(myEnableVerboseLoggingCheckBox.isSelected()); - settings.setSyncingAndroidLibraries(mySyncAndroidLibrariesCheckBox.isSelected()); - settings.setEnableHotUi(myEnableHotUiCheckBox.isSelected()); settings.setEnableBazelHotRestart(myEnableBazelHotRestartCheckBox.isSelected()); settings.setAllowTestsInSourcesRoot(myAllowTestsInSourcesRoot.isSelected()); - settings.setShowAllRunConfigurationsInContext(myShowAllRunConfigurationsInContextCheckBox.isSelected()); settings.setFontPackages(myFontPackagesTextArea.getText()); settings.setEnableJcefBrowser(myEnableJcefBrowserCheckBox.isSelected()); @@ -368,9 +337,6 @@ public void reset() { myOpenInspectorOnAppLaunchCheckBox.setSelected(settings.isOpenInspectorOnAppLaunch()); myEnableLogsPreserveAfterHotReloadOrRestart.setSelected(settings.isPerserveLogsDuringHotReloadAndRestart()); myEnableVerboseLoggingCheckBox.setSelected(settings.isVerboseLogging()); - mySyncAndroidLibrariesCheckBox.setSelected(settings.isSyncingAndroidLibraries()); - - myEnableHotUiCheckBox.setSelected(settings.isEnableHotUi()); myEnableBazelHotRestartCheckBox.setSelected(settings.isEnableBazelHotRestart()); myAllowTestsInSourcesRoot.setSelected(settings.isAllowTestsInSourcesRoot()); @@ -378,7 +344,6 @@ public void reset() { myOrganizeImportsOnSaveCheckBox.setEnabled(myFormatCodeOnSaveCheckBox.isSelected()); myIncludeAllStackTraces.setEnabled(myShowStructuredErrors.isSelected()); - myShowAllRunConfigurationsInContextCheckBox.setSelected(settings.showAllRunConfigurationsInContext()); myEnableJcefBrowserCheckBox.setSelected(settings.isEnableJcefBrowser()); myFontPackagesTextArea.setText(settings.getFontPackages()); }