Changeset 158404 in webkit

Timestamp:

Oct 31, 2013 4:12:10 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Breakpoints in auto-formatted JavaScript editors are not working
​https://bugs.webkit.org/show_bug.cgi?id=123589

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2013-10-31
Reviewed by Timothy Hatcher.

The internal this._ignoreCodeMirrorContentDidChangeEvent flag was being used
in two places that could be nested, meaning the flag was deleted while it
was still expected to be set. Change it instead to a counter, to handle nesting.

• UserInterface/TextEditor.js:

(WebInspector.TextEditor):
(WebInspector.TextEditor.prototype.set string):
(WebInspector.TextEditor.prototype.set formatted):
(WebInspector.TextEditor.prototype._contentChanged):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/TextEditor.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-10-31  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Breakpoints in auto-formatted JavaScript editors are not working
+        https://bugs.webkit.org/show_bug.cgi?id=123589
+
+        Reviewed by Timothy Hatcher.
+
+        The internal this._ignoreCodeMirrorContentDidChangeEvent flag was being used
+        in two places that could be nested, meaning the flag was deleted while it
+        was still expected to be set. Change it instead to a counter, to handle nesting.
+
+        * UserInterface/TextEditor.js:
+        (WebInspector.TextEditor):
+        (WebInspector.TextEditor.prototype.set string):
+        (WebInspector.TextEditor.prototype.set formatted):
+        (WebInspector.TextEditor.prototype._contentChanged):
+
 2013-10-31  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/TextEditor.js

@@ -62 +62 @@
     this._searchResults = [];
     this._currentSearchResultIndex = -1;
+    this._ignoreCodeMirrorContentDidChangeEvent = 0;
 
     this._formatted = false;
@@ -135 +136 @@
         }
 
-        this._ignoreCodeMirrorContentDidChangeEvent = true;
+        this._ignoreCodeMirrorContentDidChangeEvent++;
         this._codeMirror.operation(update.bind(this));
-        delete this._ignoreCodeMirrorContentDidChangeEvent;
+        this._ignoreCodeMirrorContentDidChangeEvent--;
+        console.assert(this._ignoreCodeMirrorContentDidChangeEvent >= 0);
     },
 
@@ -164 +166 @@
             return;
 
-        this._ignoreCodeMirrorContentDidChangeEvent = true;
+        this._ignoreCodeMirrorContentDidChangeEvent++;
         this._prettyPrint(formatted);
-        delete this._ignoreCodeMirrorContentDidChangeEvent;
+        this._ignoreCodeMirrorContentDidChangeEvent--;
+        console.assert(this._ignoreCodeMirrorContentDidChangeEvent >= 0);
 
         this._formatted = formatted;
@@ -593 +596 @@
     _contentChanged: function(codeMirror, change)
     {
-        if (this._ignoreCodeMirrorContentDidChangeEvent)
+        if (this._ignoreCodeMirrorContentDidChangeEvent > 0)
             return;