Skip to content

Commit b69e42e

Browse files
committed
Clean up
1 parent b1be0cd commit b69e42e

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,12 @@ class PropertyEditorController extends DisposableController
150150
super.filterData(filter);
151151
final filtered = (_editableWidgetData.value?.properties ?? [])
152152
.where((property) => property.matchesQuery(filter.queryFilter.query))
153-
.where((property) => !filteredOutBySettings(property, filter: filter));
153+
.where((property) => !_filteredOutBySettings(property, filter: filter));
154154
filteredData
155155
..clear()
156156
..addAll(filtered);
157157
}
158158

159-
bool filteredOutBySettings(
160-
EditableProperty property, {
161-
required Filter filter,
162-
}) => filter.settingFilters.any(
163-
(settingFilter) => !settingFilter.includeData(property),
164-
);
165-
166159
Future<EditArgumentResponse?> editArgument<T>({
167160
required String name,
168161
required T value,
@@ -221,6 +214,13 @@ class PropertyEditorController extends DisposableController
221214
});
222215
}
223216

217+
bool _filteredOutBySettings(
218+
EditableProperty property, {
219+
required Filter filter,
220+
}) => filter.settingFilters.any(
221+
(settingFilter) => !settingFilter.includeData(property),
222+
);
223+
224224
@visibleForTesting
225225
void initForTestsOnly({
226226
EditableArgumentsResult? editableArgsResult,

packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,11 +999,12 @@ Future<void> _setFilter(
999999
String filterSettingText, {
10001000
required WidgetTester tester,
10011001
}) async {
1002+
// Click the filter button.
10021003
final filterButtonFinder = find.byType(DevToolsFilterButton);
1003-
expect(filterButtonFinder, findsOneWidget);
10041004
await tester.tap(filterButtonFinder);
10051005
await tester.pumpAndSettle();
10061006

1007+
// Find the checkbox for the filter and click it.
10071008
final rowFinder = find.ancestor(
10081009
of: find.textContaining(filterSettingText),
10091010
matching: find.byType(Row),
@@ -1015,6 +1016,7 @@ Future<void> _setFilter(
10151016
await tester.tap(checkboxFinder);
10161017
await tester.pumpAndSettle();
10171018

1019+
// Click "Apply" to apply the filter and close the dialog.
10181020
final applyFilterButtonFinder = find.byType(DialogApplyButton);
10191021
await tester.tap(applyFilterButtonFinder);
10201022
await tester.pumpAndSettle();

0 commit comments

Comments
 (0)