diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart index 147454dcf68..e15d825a808 100644 --- a/packages/devtools_app/lib/src/shared/feature_flags.dart +++ b/packages/devtools_app/lib/src/shared/feature_flags.dart @@ -85,14 +85,6 @@ extension FeatureFlags on Never { enabled: true, ); - /// Flag to enable refactors in the Flutter Property Editor sidebar. - /// - /// https://github.com/flutter/devtools/issues/9214 - static final propertyEditorRefactors = BooleanFeatureFlag( - name: 'propertyEditorRefactors', - enabled: true, - ); - /// A set of all the boolean feature flags for debugging purposes. /// /// When adding a new boolean flag, you are responsible for adding it to this @@ -103,7 +95,6 @@ extension FeatureFlags on Never { devToolsExtensions, dapDebugging, inspectorV2, - propertyEditorRefactors, }; /// A set of all the Flutter channel feature flags for debugging purposes. diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart index 2be618ea209..684fae414ed 100644 --- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart +++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart @@ -11,7 +11,6 @@ import '../../../shared/analytics/analytics.dart' as ga; import '../../../shared/analytics/constants.dart' as gac; import '../../../shared/editor/api_classes.dart'; import '../../../shared/editor/editor_client.dart'; -import '../../../shared/feature_flags.dart'; import '../../../shared/ui/filter.dart'; import '../../../shared/utils/utils.dart'; import 'property_editor_types.dart'; @@ -223,8 +222,7 @@ class PropertyEditorController extends DisposableController CodeActionResult? refactorsResult; // TODO(https://github.com/flutter/devtools/issues/8652): Enable refactors // in the Property Editor by default. - if (editableArgsResult != null && - FeatureFlags.propertyEditorRefactors.isEnabled) { + if (editableArgsResult != null) { // Fetch the refactors using the start of the editable arguments' range, // which corresponds to the widget constructor name. This ensures that the // refactors are always available, even when the cursor is within the diff --git a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart index 6e79255e461..1ac9a1a0dac 100644 --- a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart +++ b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart @@ -21,7 +21,6 @@ void main() { expect(FeatureFlags.devToolsExtensions.isEnabled, isExternalBuild); expect(FeatureFlags.dapDebugging.isEnabled, false); expect(FeatureFlags.inspectorV2.isEnabled, true); - expect(FeatureFlags.propertyEditorRefactors.isEnabled, true); }); group('FlutterChannelFeatureFlag', () { diff --git a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart index adf33b1d908..1145e402241 100644 --- a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart +++ b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart @@ -9,7 +9,6 @@ import 'dart:ui'; import 'package:devtools_app/devtools_app.dart'; import 'package:devtools_app/src/shared/analytics/constants.dart' as gac; import 'package:devtools_app/src/shared/editor/api_classes.dart'; -import 'package:devtools_app/src/shared/feature_flags.dart'; import 'package:devtools_app/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart'; import 'package:devtools_app/src/standalone_ui/ide_shared/property_editor/property_editor_refactors.dart'; import 'package:devtools_app/src/standalone_ui/ide_shared/property_editor/property_editor_types.dart'; @@ -927,8 +926,6 @@ void main() { ); setUp(() { - FeatureFlags.propertyEditorRefactors.setEnabledForTests(true); - refactorCount = 0; when( // ignore: discarded_futures, for mocking purposes.