DevTools: Make sure UISC content is up-to-date when running performSearchInContent()

Source/devtools/front_end/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 97 matching lines @@
      * @param {function()} callback
      * @param {!Array.<string>} files
      */
     _processMatchingFilesForProject: function(searchId, project, progress, callback, files)
     {
         if (searchId !== this._searchId) {
             this._searchFinishedCallback(false);
             return;
         }
 
+        addDirtyFiles();
+
         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);
 
+        function addDirtyFiles()
+        {
+            var matchingFiles = new StringSet();
+            files.forEach(matchingFiles.put.bind(matchingFiles));

[pfeldman, 2014/03/31 19:20:51]

While you are here, could you rename StringSet's put into add? Also, sounds like
StringSet.fromArray would make my eyes hurt less.

[apavlov, 2014/04/01 07:26:00]

Done.

+
+            project.uiSourceCodes().filter(dirtySourceCodeFilter).forEach(appendFilePath);

[pfeldman, 2014/03/31 19:20:51]

my 8 lines against your 20

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))
        files.push(path);
}

[apavlov, 2014/04/01 07:26:00]

Accepted!

+
+            /**
+             * @param {!WebInspector.UISourceCode} uiSourceCode
+             */
+            function dirtySourceCodeFilter(uiSourceCode)
+            {
+                return uiSourceCode.isDirty();
+            }
+
+            /**
+             * @param {!WebInspector.UISourceCode} uiSourceCode
+             */
+            function appendFilePath(uiSourceCode)
+            {
+                var path = uiSourceCode.path();
+                if (!matchingFiles.contains(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);
                 return;
             }
-            uiSourceCode.requestContent(contentLoaded.bind(this, path));
+            if (uiSourceCode.isDirty())
+                contentLoaded.call(this, uiSourceCode.path(), uiSourceCode.workingCopy());
+            else
+                uiSourceCode.checkContentUpdated(contentUpdated.bind(this, uiSourceCode));
         }
 
         /**
+         * @param {!WebInspector.UISourceCode} uiSourceCode
+         * @this {WebInspector.SourcesSearchScope}
+         */
+        function contentUpdated(uiSourceCode)
+        {
+            uiSourceCode.requestContent(contentLoaded.bind(this, uiSourceCode.path()));

[pfeldman, 2014/03/31 19:20:51]

... and when do we start using promises once again? :)

[apavlov, 2014/04/01 07:26:00]

Uhm... We've never used them... and will not, I promise! :)

+        }
+
+        /**
          * @this {WebInspector.SourcesSearchScope}
          */
         function scheduleSearchInNextFileOrFinish()
         {
             if (fileIndex >= files.length) {
                 if (!callbacksLeft) {
                     progress.done();
                     callback();
                     return;
                 }
@@ skipping 48 matching lines @@
 
     /**
      * @param {!WebInspector.SearchConfig} searchConfig
      * @return {!WebInspector.FileBasedSearchResultsPane}
      */
     createSearchResultsPane: function(searchConfig)
     {
         return new WebInspector.FileBasedSearchResultsPane(searchConfig);
     }
 }