DevTools: show all descendants if a console.group message title matches the filter

third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 447 matching lines @@
   /**
    * @param {!Console.ConsoleViewMessage} viewMessage
    */
   _consoleMessageAddedForTest(viewMessage) {
   }
 
   /**
    * @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;
     }
 
     if (this._tryToCollapseMessages(viewMessage, this._visibleViewMessages.peekLast()))
       return;
 
     var lastMessage = this._visibleViewMessages.peekLast();
     if (viewMessage.consoleMessage().type === ConsoleModel.ConsoleMessage.MessageType.EndGroup) {
       if (lastMessage && !this._currentGroup.messagesHidden())
         lastMessage.incrementCloseGroupDecorationCount();
       this._currentGroup = this._currentGroup.parentGroup() || this._currentGroup;
       return;
     }
     if (!this._currentGroup.messagesHidden()) {
       var originatingMessage = viewMessage.consoleMessage().originatingMessage();
       if (lastMessage && originatingMessage && lastMessage.consoleMessage() === originatingMessage)
         lastMessage.toMessageElement().classList.add('console-adjacent-user-command-result');
 
       this._visibleViewMessages.push(viewMessage);
       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.hasFilterText() && this._filter.matchesTextOrRegex(viewMessage));

[chenwilliam, 2017/07/20 00:22:33]

I don't think you need hasFilterText here because
this._filter.matchesTextOrRegex(viewMessage) will handle the case where there's
no filter query properly.

[luoe, 2017/07/20 20:59:03]

Done.

+      this._currentGroup = new Console.ConsoleGroup(this._currentGroup, viewMessage, showAllChildren);
+    }
 
     this._messageAppendedForTests();
   }
 
   _messageAppendedForTests() {
     // This method is sniffed in tests.
   }
 
   /**
    * @param {!ConsoleModel.ConsoleMessage} message
@@ skipping 625 matching lines @@
 
   /**
    * @returns {!Object}
    */
   messageURLFilters() {
     return this._messageURLFiltersSetting.get();
   }
 
   /**
    * @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);
 
     if (this._filterByExecutionContextSetting.get() && executionContext) {
       if (message.runtimeModel() !== executionContext.runtimeModel)
         return false;
       if (message.executionContextId && message.executionContextId !== executionContext.id)
         return false;
     }
 
     if (this._hideNetworkMessagesSetting.get() &&
         viewMessage.consoleMessage().source === ConsoleModel.ConsoleMessage.MessageSource.Network)
       return false;
 
     if (viewMessage.consoleMessage().isGroupMessage())
       return true;
 
     if (message.type === ConsoleModel.ConsoleMessage.MessageType.Result ||
         message.type === ConsoleModel.ConsoleMessage.MessageType.Command)
       return true;
 
     if (message.url && this._messageURLFiltersSetting.get()[message.url])
       return false;
 
     var levels = this._messageLevelFiltersSetting.get();
     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.hasFilterText() && !this.matchesTextOrRegex(viewMessage))
+      return false;
 
     if (this._filterByConsoleAPISetting.get() &&
         message.source !== ConsoleModel.ConsoleMessage.MessageSource.ConsoleAPI)
       return false;
 
     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;
+  }
+
+  /**
+   * @return {boolean}
+   */
+  hasFilterText() {

[chenwilliam, 2017/07/20 00:22:33]

seems confusing since filterText has two meanings in this method. Let's call it
hasFilterQuery()?

[luoe, 2017/07/20 20:59:03]

Acknowledged.  Actually, per your previous comment, I only need hasFilterText()
once, so we can just inline it and remove this function.

+    return !!(this._filterRegex || this._filterText);
+  }
+
   reset() {
     this._messageURLFiltersSetting.set({});
     this._messageLevelFiltersSetting.set(Console.ConsoleViewFilter.defaultLevelsFilterValue());
     this._filterByExecutionContextSetting.set(false);
     this._filterByConsoleAPISetting.set(false);
     this._hideNetworkMessagesSetting.set(false);
     this._textFilterUI.setValue('');
     this._textFilterChanged();
   }
 };
@@ skipping 77 matching lines @@
       }
     }
     return element;
   }
 };
 
 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);
   }
 
   /**
    * @return {boolean}
    */
   messagesHidden() {
     return this._messagesHidden;
   }
 
   /**
+   * @return {boolean}
+   */
+  showAllChildren() {
+    return this._showAllChildren;
+  }
+
+  /**
    * @return {number}
    */
   nestingLevel() {
     return this._nestingLevel;
   }
 
   /**
    * @return {?Console.ConsoleGroup}
    */
   parentGroup() {
@@ skipping 24 matching lines @@
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;