Merge 97851 - Web Inspector: Enable caseSensitive search / Regex support in advanced search.

Source/WebCore/inspector/front-end/AdvancedSearchController.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * 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 133 matching lines @@
     this._searchPanelElement = this.element.createChild("div");
     this._searchPanelElement.tabIndex = 0;
     this._searchPanelElement.className = "search-panel";
     this._searchPanelElement.addEventListener("keydown", this._onKeyDown.bind(this), false);
     
     this._searchResultsElement = this.element.createChild("div");
     this._searchResultsElement.className = "search-results";
     
     this._search = this._searchPanelElement.createChild("input");
     this._search.setAttribute("type", "search");
+    this._search.addStyleClass("search-config-search");
     this._search.setAttribute("results", "0");
     this._search.setAttribute("size", 20);
 
+    this._ignoreCaseLabel = this._searchPanelElement.createChild("label");
+    this._ignoreCaseLabel.addStyleClass("search-config-label");
+    this._ignoreCaseCheckbox = this._ignoreCaseLabel.createChild("input");
+    this._ignoreCaseCheckbox.setAttribute("type", "checkbox");
+    this._ignoreCaseCheckbox.addStyleClass("search-config-checkbox");
+    this._ignoreCaseLabel.appendChild(document.createTextNode(WebInspector.UIString("Ignore case")));
+    
+
+    this._regexLabel = this._searchPanelElement.createChild("label");
+    this._regexLabel.addStyleClass("search-config-label");
+    this._regexCheckbox = this._regexLabel.createChild("input");
+    this._regexCheckbox.setAttribute("type", "checkbox");
+    this._regexCheckbox.addStyleClass("search-config-checkbox");
+    this._regexLabel.appendChild(document.createTextNode(WebInspector.UIString("Regular expression")));
+    
     this._load();
 }
 
 // Number of recent search queries to store.
 WebInspector.SearchView.maxQueriesCount = 20;
 
 WebInspector.SearchView.prototype = {
     /**
      * @type {WebInspector.SearchConfig}
      */
     get searchConfig()
     {
         var searchConfig = {};
         searchConfig.query = this._search.value;
+        searchConfig.ignoreCase = this._ignoreCaseCheckbox.checked;
+        searchConfig.isRegex = this._regexCheckbox.checked;
         return searchConfig;
     },
     
     /**
      * @type {WebInspector.SearchResultsPane}
      */
     set resultsPane(resultsPane)
     {
         this._searchResultsElement.removeChildren();
         this._searchResultsElement.appendChild(resultsPane.element);
@@ skipping 48 matching lines @@
     _save: function()
     {
         var searchConfig = new WebInspector.SearchConfig(this.searchConfig.query, this.searchConfig.ignoreCase, this.searchConfig.isRegex); 
         WebInspector.settings.advancedSearchConfig.set(searchConfig);
     },
     
     _load: function()
     {
         var searchConfig = WebInspector.settings.advancedSearchConfig.get();
         this._search.value = searchConfig.query;
+        this._ignoreCaseCheckbox.checked = searchConfig.ignoreCase;
+        this._regexCheckbox.checked = searchConfig.isRegex;
     },
     
     _onAction: function()
     {
         this._save();
         this._controller.startSearch(this.searchConfig);
     }
 }
 
 WebInspector.SearchView.prototype.__proto__ = WebInspector.View.prototype;
@@ skipping 84 matching lines @@
      */
     createAnchor: function(file, lineNumber) { },
     
     /**
      * @param {Object} file
      * @return {string}
      */
     fileName: function(file) { },
     
     /**
+     * @return {RegExp}
+     */
+    _createSearchRegex: function()
+    {
+        var regexFlags = this._searchConfig.ignoreCase ? "gi" : "g";
+        var regexObject;
+        try {
+            regexObject = new RegExp(this._searchConfig.query, regexFlags);
+        } catch (e) {
+            // Silent catch.
+        }
+
+        if (!regexObject)
+            regexObject = createSearchRegex(this._searchConfig.query, regexFlags);
+        
+        return regexObject;
+    },
+    
+    /**
      * @param {Object} searchResult
      */
     addSearchResult: function(searchResult)
     {
         this._searchResults.push(searchResult);
         var file = searchResult.file;
         var fileName = this.fileName(file);
         var searchMatches = searchResult.searchMatches;
             
         // Expand first file with matches only.
         var fileTreeElement = this._addFileTreeElement(fileName, searchMatches.length, this._searchResults.length === 1);
         
-        var regexObject = createSearchRegex(this._searchConfig.query, "g");  
+        var regexObject = this._createSearchRegex();
         for (var i = 0; i < searchMatches.length; i++) {
             var lineNumber = searchMatches[i].lineNumber;
             
             var anchor = this.createAnchor(file, lineNumber);
             
             var numberString = numberToStringWithSpacesPadding(lineNumber + 1, 4);
             var lineNumberSpan = document.createElement("span");
             lineNumberSpan.addStyleClass("webkit-line-number");
             lineNumberSpan.addStyleClass("search-match-line-number");
             lineNumberSpan.textContent = numberString;
@@ skipping 59 matching lines @@
             matchRanges.push({ offset: match.index, length: match[0].length });
             match = regexObject.exec(lineContent);
         }
         highlightRangesWithStyleClass(contentSpan, matchRanges, "highlighted-match");
         
         return contentSpan;
     }
 }
 
 WebInspector.FileBasedSearchResultsPane.prototype.__proto__ = WebInspector.SearchResultsPane.prototype;
+
+/**
+ * @constructor
+ * @param {Object} file
+ * @param {Array.<Object>} searchMatches
+ */
+WebInspector.FileBasedSearchResultsPane.SearchResult = function(file, searchMatches) {
+    this.file = file;
+    this.searchMatches = searchMatches;
+}