-
Notifications
You must be signed in to change notification settings - Fork 379
Add support for searching within the log details view #9712
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.
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
Open
kenzieschmoll
wants to merge
1
commit into
flutter:master
Choose a base branch
from
kenzieschmoll:logging-search
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
packages/devtools_app/lib/src/screens/logging/log_details_controller.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Copyright 2024 The Flutter Authors | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. | ||
|
|
||
| import 'package:devtools_app_shared/utils.dart'; | ||
| import 'package:flutter/foundation.dart'; | ||
|
|
||
| import '../../shared/primitives/utils.dart'; | ||
| import '../../shared/ui/search.dart'; | ||
| import 'logging_controller.dart'; | ||
|
|
||
| /// A controller for the log details view that provides search functionality. | ||
| class LogDetailsController extends DisposableController | ||
| with SearchControllerMixin<LogDetailsMatch>, AutoDisposeControllerMixin { | ||
| LogDetailsController({required ValueListenable<LogData?> selectedLog}) { | ||
| init(); | ||
| addAutoDisposeListener(selectedLog, () { | ||
| _selectedLog = selectedLog.value; | ||
| refreshSearchMatches(); | ||
| }); | ||
| } | ||
|
|
||
| LogData? _selectedLog; | ||
|
|
||
| @override | ||
| List<LogDetailsMatch> matchesForSearch( | ||
| String search, { | ||
| bool searchPreviousMatches = false, | ||
| }) { | ||
| if (search.isEmpty || _selectedLog == null) return []; | ||
| final matches = <LogDetailsMatch>[]; | ||
|
|
||
| final text = _selectedLog!.prettyPrinted(); | ||
| if (text == null) return []; | ||
|
|
||
| final regex = RegExp(search, caseSensitive: false); | ||
| final allMatches = regex.allMatches(text); | ||
| for (final match in allMatches) { | ||
| matches.add(LogDetailsMatch(match.start, match.end)); | ||
| } | ||
| return matches; | ||
| } | ||
|
|
||
| @override | ||
| void dispose() { | ||
| _selectedLog = null; | ||
| super.dispose(); | ||
| } | ||
| } | ||
|
|
||
| /// A search match in the log details view. | ||
| class LogDetailsMatch with SearchableDataMixin { | ||
| LogDetailsMatch(this.start, this.end); | ||
|
|
||
| final int start; | ||
| final int end; | ||
|
|
||
| Range get range => Range(start, end); | ||
|
|
||
| @override | ||
| bool matchesSearchToken(RegExp regExpSearch) => false; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider pulling some of this into a shared helper that can be used here and in the codeview highlighter - looks like there is some shared logic here but not sure how much work it would be to refactor