Skip to content

Simplify QueryFilter.parse #9072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srawlins merged 2 commits into from
Mar 27, 2025
Merged

Simplify QueryFilter.parse #9072

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c20f77d
Simplify QueryFilter.parse
srawlins Mar 27, 2025
00ad01b
cascades
srawlins Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 19 additions & 27 deletions packages/devtools_app/lib/src/shared/ui/filter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ class _SettingFilterElement extends StatelessWidget {
class Filter<T> {
Filter({required this.queryFilter, required this.settingFilters});

final QueryFilter queryFilter;
final QueryFilter<T> queryFilter;

final SettingFilters<T> settingFilters;

Expand Down Expand Up @@ -455,8 +455,8 @@ class SettingFilter<T, V> {

class QueryFilter<T> {
const QueryFilter._({
QueryFilterArgs<T> filterArguments = const {},
this.substringExpressions = const <Pattern>[],
required QueryFilterArgs<T> filterArguments,
required this.substringExpressions,
this.isEmpty = false,
}) : _filterArguments = filterArguments;

Expand Down Expand Up @@ -488,23 +488,19 @@ class QueryFilter<T> {
final querySeparatorIndex = part.indexOf(':');
if (querySeparatorIndex != -1) {
final value = part.substring(querySeparatorIndex + 1).trim();
if (value.isNotEmpty) {
for (final arg in args.values) {
if (arg.matchesKey(part)) {
arg.isNegative = part.startsWith(
QueryFilterArgument.negativePrefix,
);
final valueStrings = value.split(
QueryFilterArgument.valueSeparator,
);
arg.values =
useRegExp
? valueStrings
.map((v) => RegExp(v, caseSensitive: false))
.toList()
: valueStrings;
}
}
if (value.isEmpty) {
continue;
}
final valueStrings = value.split(QueryFilterArgument.valueSeparator);
for (final arg in args.values.where((arg) => arg.matchesKey(part))) {
arg
..isNegative = part.startsWith(QueryFilterArgument.negativePrefix)
..values =
useRegExp
? valueStrings
.map((v) => RegExp(v, caseSensitive: false))
.toList()
: valueStrings;
}
} else {
substringExpressions.add(
Expand All @@ -513,13 +509,9 @@ class QueryFilter<T> {
}
}

bool validArgumentFilter = false;
for (final arg in args.values) {
if (arg.values.isNotEmpty) {
validArgumentFilter = true;
break;
}
}
final bool validArgumentFilter = args.values.any(
(a) => a.values.isNotEmpty,
);
if (!validArgumentFilter && substringExpressions.isEmpty) {
return QueryFilter.empty(args: args);
}
Expand Down