Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Unified Diff: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

Issue 2939473002: DevTools: show all descendants if a console.group message title matches the filter
Patch Set: ac Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/console/console-filter-test-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
index 1ff7edd084e721664e7d035b8390dfcfa6cace57..d3f748ec103ce6972a9fa5ddd72b30a913bfba86 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
@@ -465,7 +465,8 @@ Console.ConsoleView = class extends UI.VBox {
* @param {!Console.ConsoleViewMessage} viewMessage
*/
_appendMessageToEnd(viewMessage) {
- if (!this._filter.shouldBeVisible(viewMessage)) {
+ var ignoreTextFilter = this._currentGroup.showAllChildren();
+ if (!this._filter.shouldBeVisible(viewMessage, ignoreTextFilter)) {
this._hiddenByFilterCount++;
return;
}
@@ -489,8 +490,10 @@ Console.ConsoleView = class extends UI.VBox {
this._searchMessage(this._visibleViewMessages.length - 1);
}
- if (viewMessage.consoleMessage().isGroupStartMessage())
- this._currentGroup = new Console.ConsoleGroup(this._currentGroup, viewMessage);
+ if (viewMessage.consoleMessage().isGroupStartMessage()) {
+ var showAllChildren = ignoreTextFilter || this._filter.matchesTextOrRegex(viewMessage);
+ this._currentGroup = new Console.ConsoleGroup(this._currentGroup, viewMessage, showAllChildren);
+ }
this._messageAppendedForTests();
}
@@ -1136,9 +1139,10 @@ Console.ConsoleViewFilter = class {
/**
* @param {!Console.ConsoleViewMessage} viewMessage
+ * @param {boolean} ignoreTextFilter
* @return {boolean}
*/
- shouldBeVisible(viewMessage) {
+ shouldBeVisible(viewMessage, ignoreTextFilter) {
var message = viewMessage.consoleMessage();
var executionContext = UI.context.flavor(SDK.ExecutionContext);
@@ -1167,13 +1171,8 @@ Console.ConsoleViewFilter = class {
if (!levels[message.level])
return false;
- if (this._filterRegex) {
- if (!viewMessage.matchesFilterRegex(this._filterRegex))
- return false;
- } else if (this._filterText) {
- if (!viewMessage.matchesFilterText(this._filterText))
- return false;
- }
+ if (!ignoreTextFilter && (this._filterRegex || this._filterText) && !this.matchesTextOrRegex(viewMessage))
+ return false;
if (this._filterByConsoleAPISetting.get() &&
message.source !== ConsoleModel.ConsoleMessage.MessageSource.ConsoleAPI)
@@ -1182,6 +1181,18 @@ Console.ConsoleViewFilter = class {
return true;
}
+ /**
+ * @param {!Console.ConsoleViewMessage} viewMessage
+ * @return {boolean}
+ */
+ matchesTextOrRegex(viewMessage) {
+ if (this._filterRegex)
+ return viewMessage.matchesFilterRegex(this._filterRegex);
+ if (this._filterText)
+ return viewMessage.matchesFilterText(this._filterText);
+ return false;
+ }
+
reset() {
this._messageURLFiltersSetting.set({});
this._messageLevelFiltersSetting.set(Console.ConsoleViewFilter.defaultLevelsFilterValue());
@@ -1279,19 +1290,21 @@ Console.ConsoleGroup = class {
/**
* @param {?Console.ConsoleGroup} parentGroup
* @param {?Console.ConsoleViewMessage} groupMessage
+ * @param {boolean} showAllChildren
*/
- constructor(parentGroup, groupMessage) {
+ constructor(parentGroup, groupMessage, showAllChildren) {
this._parentGroup = parentGroup;
this._nestingLevel = parentGroup ? parentGroup.nestingLevel() + 1 : 0;
this._messagesHidden =
groupMessage && groupMessage.collapsed() || this._parentGroup && this._parentGroup.messagesHidden();
+ this._showAllChildren = showAllChildren;
}
/**
* @return {!Console.ConsoleGroup}
*/
static createTopGroup() {
- return new Console.ConsoleGroup(null, null);
+ return new Console.ConsoleGroup(null, null, false);
}
/**
@@ -1301,6 +1314,13 @@ Console.ConsoleGroup = class {
return this._messagesHidden;
}
+ /**
+ * @return {boolean}
+ */
+ showAllChildren() {
+ return this._showAllChildren;
+ }
+
/**
* @return {number}
*/
« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/console/console-filter-test-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698