DevTools: Search across files should work for file:folderName queries.

Source/devtools/front_end/sources/SourcesSearchScope.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 94 matching lines @@
         var projects = this._projects();
         var barrier = new CallbackBarrier();
         var compositeProgress = new WebInspector.CompositeProgress(progress);
         for (var i = 0; i < projects.length; ++i) {
             var project = projects[i];
             var weight = project.uiSourceCodes().length;
             var projectProgress = new WebInspector.CompositeProgress(compositeProgress.createSubProgress(weight));
             var findMatchingFilesProgress = projectProgress.createSubProgress();
             var searchContentProgress = projectProgress.createSubProgress();
             var barrierCallback = barrier.createCallback();
-            var callback = this._processMatchingFilesForProject.bind(this, this._searchId, project, searchContentProgress, barrierCallback);
-            project.findFilesMatchingSearchRequest(searchConfig, findMatchingFilesProgress, callback);
+            var filesMathingFileQuery = this._projectFilesMatchingFileQuery(project, searchConfig);
+            var callback = this._processMatchingFilesForProject.bind(this, this._searchId, project, filesMathingFileQuery, searchContentProgress, barrierCallback);
+            project.findFilesMatchingSearchRequest(searchConfig, filesMathingFileQuery, findMatchingFilesProgress, callback);
         }
         barrier.callWhenDone(this._searchFinishedCallback.bind(this, true));
     },
 
     /**
+     * @param {!WebInspector.Project} project
+     * @param {!WebInspector.ProjectSearchConfig} searchConfig
+     * @param {boolean=} dirtyOnly
+     * @return {!Array.<string>}
+     */
+    _projectFilesMatchingFileQuery: function(project, searchConfig, dirtyOnly)
+    {
+        var result = [];
+        var uiSourceCodes = project.uiSourceCodes();
+        for (var i = 0; i < uiSourceCodes.length; ++i) {
+            var uiSourceCode = uiSourceCodes[i];
+            if (dirtyOnly && !uiSourceCode.isDirty())
+                continue;
+            if (this._searchConfig.filePathMatchesFileQuery(uiSourceCode.fullDisplayName()))
+                result.push(uiSourceCode.path());
+        }
+        result = result.sort(String.naturalOrderComparator);
+        return result;
+    },
+
+    /**
      * @param {number} searchId
      * @param {!WebInspector.Project} project
+     * @param {!Array.<string>} filesMathingFileQuery
      * @param {!WebInspector.Progress} progress
      * @param {function()} callback
      * @param {!Array.<string>} files
      */
-    _processMatchingFilesForProject: function(searchId, project, progress, callback, files)
+    _processMatchingFilesForProject: function(searchId, project, filesMathingFileQuery, progress, callback, files)
     {
         if (searchId !== this._searchId) {
             this._searchFinishedCallback(false);
             return;
         }
 
-        addDirtyFiles.call(this);
+        files = files.sort(String.naturalOrderComparator);
+        files = files.intersectOrdered(filesMathingFileQuery, String.naturalOrderComparator);
+        var dirtyFiles = this._projectFilesMatchingFileQuery(project, this._searchConfig, true);
+        files = files.mergeOrdered(dirtyFiles);
 
         if (!files.length) {
             progress.done();
             callback();
             return;
         }
 
         progress.setTotalWork(files.length);
 
         var fileIndex = 0;
         var maxFileContentRequests = 20;
         var callbacksLeft = 0;
 
         for (var i = 0; i < maxFileContentRequests && i < files.length; ++i)
             scheduleSearchInNextFileOrFinish.call(this);
 
         /**
-         * @this {WebInspector.SourcesSearchScope}
-         */
-        function addDirtyFiles()
-        {
-            var matchingFiles = StringSet.fromArray(files);
-            var uiSourceCodes = project.uiSourceCodes();
-            for (var i = 0; i < uiSourceCodes.length; ++i) {
-                if (!uiSourceCodes[i].isDirty())
-                    continue;
-                var path = uiSourceCodes[i].path();
-                if (!matchingFiles.contains(path) && this._searchConfig.filePathMatchesFileQuery(path))
-                    files.push(path);
-            }
-        }
-
-        /**
          * @param {string} path
          * @this {WebInspector.SourcesSearchScope}
          */
         function searchInNextFile(path)
         {
             var uiSourceCode = project.uiSourceCode(path);
             if (!uiSourceCode) {
                 --callbacksLeft;
                 progress.worked(1);
                 scheduleSearchInNextFileOrFinish.call(this);
@@ skipping 76 matching lines @@
 
     /**
      * @param {!WebInspector.ProjectSearchConfig} searchConfig
      * @return {!WebInspector.FileBasedSearchResultsPane}
      */
     createSearchResultsPane: function(searchConfig)
     {
         return new WebInspector.FileBasedSearchResultsPane(searchConfig);
     }
 }