Merge pull request #5282 from adobe/nj/issue-5279

Don't reparse HTML files on save
adobe · Sep 20, 2013 · dd28c6a · dd28c6a
2 parents b57dfc9 + 7b76015
commit dd28c6a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/LiveDevelopment/Documents/HTMLDocument.js b/src/LiveDevelopment/Documents/HTMLDocument.js
@@ -70,10 +70,8 @@ define(function HTMLDocumentModule(require, exports, module) {
         this._instrumentationEnabled = false;
 
         this.onCursorActivity = this.onCursorActivity.bind(this);
-        this.onDocumentSaved = this.onDocumentSaved.bind(this);
 
         $(this.editor).on("cursorActivity", this.onCursorActivity);
-        $(DocumentManager).on("documentSaved", this.onDocumentSaved);
 
         // Experimental code
         if (LiveDevelopment.config.experimental) {
@@ -130,7 +128,6 @@ define(function HTMLDocumentModule(require, exports, module) {
         }
 
         $(this.editor).off("cursorActivity", this.onCursorActivity);
-        $(DocumentManager).off("documentSaved", this.onDocumentSaved);
 
         // Experimental code
         if (LiveDevelopment.config.experimental) {
@@ -312,14 +309,6 @@ define(function HTMLDocumentModule(require, exports, module) {
         this._highlight = codeMirror.markText(from, to, { className: "highlight" });
     };
 
-    /** Triggered when a document is saved */
-    HTMLDocument.prototype.onDocumentSaved = function onDocumentSaved(event, doc) {
-        if (doc === this.doc) {
-            HTMLInstrumentation.scanDocument(this.doc);
-            HTMLInstrumentation._markText(this.editor);
-        }
-    };
-
     // Export the class
     module.exports = HTMLDocument;
 });
diff --git a/src/brackets.js b/src/brackets.js
@@ -158,6 +158,7 @@ define(function (require, exports, module) {
             UpdateNotification      : require("utils/UpdateNotification"),
             InstallExtensionDialog  : require("extensibility/InstallExtensionDialog"),
             RemoteAgent             : require("LiveDevelopment/Agents/RemoteAgent"),
+            HTMLInstrumentation     : require("language/HTMLInstrumentation"),
             doneLoading             : false
         };
 

diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js
@@ -803,7 +803,7 @@ define(function (require, exports, module) {
                     // Spy on RemoteAgent
                     spyOn(testWindow.brackets.test.RemoteAgent, "call").andCallThrough();
 
-                    // Create syntax errors
+                    // Edit text
                     doc =  DocumentManager.getCurrentDocument();
                     doc.replaceRange("Live Preview in ", {line: 11, ch: 33});
                 });
@@ -819,6 +819,31 @@ define(function (require, exports, module) {
                     expect(edit.content).toEqual("Live Preview in Brackets is awesome!");
                 });
             });
+
+            it("should not reparse page on save (#5279)", function () {
+                var doc, saveDeferred = new $.Deferred();
+
+                _openSimpleHTML();
+
+                runs(function () {
+                    // Make an edit.
+                    doc = DocumentManager.getCurrentDocument();
+                    doc.replaceRange("Live Preview in ", {line: 11, ch: 33});
+
+                    // Save the document and see if "scanDocument" (which reparses the page) is called.
+                    spyOn(testWindow.brackets.test.HTMLInstrumentation, "scanDocument").andCallThrough();
+                    testWindow.$(DocumentManager).one("documentSaved", function (e, savedDoc) {
+                        expect(savedDoc === doc);
+                        saveDeferred.resolve();
+                    });
+                    CommandManager.execute(Commands.FILE_SAVE, { doc: doc });
+                    waitsForDone(saveDeferred.promise(), "file finished saving");
+                });
+
+                runs(function () {
+                    expect(testWindow.brackets.test.HTMLInstrumentation.scanDocument.callCount).toBe(0);
+                });
+            });
 
         });