Changeset 142998 in webkit

Timestamp:

Feb 15, 2013 7:45:50 AM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Pass original selection to textModel to correctly restore it after undo.
​https://bugs.webkit.org/show_bug.cgi?id=109911

Reviewed by Pavel Feldman.

Source/WebCore:

We can distinguish backspace pressed with and without selection now.

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.TextEditorMainPanel.prototype._applyDomUpdates):
(WebInspector.DefaultTextEditor.WordMovementController.prototype._handleCtrlBackspace):

• inspector/front-end/TextEditorModel.js:

(WebInspector.TextEditorCommand):
(WebInspector.TextEditorModel.endsWithBracketRegex.):

LayoutTests:

• inspector/editor/text-editor-undo-redo-expected.txt:
• inspector/editor/text-editor-undo-redo.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-undo-redo-expected.txt (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-undo-redo.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/TextEditorModel.js (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-15  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Pass original selection to textModel to correctly restore it after undo.
+        https://bugs.webkit.org/show_bug.cgi?id=109911
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/editor/text-editor-undo-redo-expected.txt:
+        * inspector/editor/text-editor-undo-redo.html:
+
 2013-02-15  Andrew Wilson  <atwilson@chromium.org>
 

trunk/LayoutTests/inspector/editor/text-editor-undo-redo-expected.txt

@@ -135 +135 @@
 
 
+Running: testSelectionAfterUndoRedo
+Text before edit:
+function foo()
+{
+
+}
+
+Text after backspace:
+function foo()
+{|
+}
+
+Text after first undo:
+function foo()
+{
+|
+}
+
+Text after first redo:
+function foo()
+{|
+}
+
+Text after second undo:
+function foo()
+{>
+<
+}
+
+Text after deleting selection:
+function foo()
+{|
+}
+
+Text after first undo:
+function foo()
+{>
+<
+}
+
+Text after first redo:
+function foo()
+{|
+}
+
+Text after second undo:
+function foo()
+{>
+<
+}
+
+

trunk/LayoutTests/inspector/editor/text-editor-undo-redo.html

@@ -19 +19 @@
         return range;
     }
+
+    function typeBackspace(textModel, startRange, count)
+    {
+        var count = count || 1;
+        var range = startRange;
+        for (var i = 0; i < count; ++i) {
+            var backspaceRange = range.isEmpty() ? textModel.growRangeLeft(range) : range;
+            range = textModel.editRange(backspaceRange, "", range).collapseToEnd();
+        }
+        return range;
+    }
+
     InspectorTest.runTestSuite([
         function testUndoRedoTab(next)
@@ -75 +87 @@
             dumpTextModel("Text after second redo:\n", textModel, range);
             next();
+        },
+
+        function testSelectionAfterUndoRedo(next)
+        {
+            var textModel = new WebInspector.TextEditorModel();
+            var functionText = "    bar();\n    baz();\n    foo();";
+            textModel.setText("function foo()\n{\n\n}\n");
+            dumpTextModel("Text before edit:\n", textModel);
+            range = typeBackspace(textModel, new WebInspector.TextRange(2, 0, 2, 0), 1);
+            dumpTextModel("Text after backspace:\n", textModel, range);
+            range = textModel.undo();
+            dumpTextModel("Text after first undo:\n", textModel, range);
+            range = textModel.redo();
+            dumpTextModel("Text after first redo:\n", textModel, range);
+            range = textModel.undo();
+            dumpTextModel("Text after second undo:\n", textModel, range);
+            range = typeBackspace(textModel, new WebInspector.TextRange(1, 1, 2, 0), 1);
+            dumpTextModel("Text after deleting selection:\n", textModel, range);
+            range = textModel.undo();
+            dumpTextModel("Text after first undo:\n", textModel, range);
+            range = textModel.redo();
+            dumpTextModel("Text after first redo:\n", textModel, range);
+            range = textModel.undo();
+            dumpTextModel("Text after second undo:\n", textModel, range);
+            next();
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Pass original selection to textModel to correctly restore it after undo.
+        https://bugs.webkit.org/show_bug.cgi?id=109911
+
+        Reviewed by Pavel Feldman.
+
+        We can distinguish backspace pressed with and without selection now.
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.TextEditorMainPanel.prototype._applyDomUpdates):
+        (WebInspector.DefaultTextEditor.WordMovementController.prototype._handleCtrlBackspace):
+        * inspector/front-end/TextEditorModel.js:
+        (WebInspector.TextEditorCommand):
+        (WebInspector.TextEditorModel.endsWithBracketRegex.):
+
 2013-02-15  Joe Mason  <jmason@rim.com>
 

trunk/Source/WebCore/inspector/front-end/DefaultTextEditor.js

@@ -2468 +2468 @@
         var endLine = dirtyLines.end;
 
+        var originalSelection = this._lastSelection;
         var editInfo = this._guessEditRangeBasedOnSelection(startLine, endLine, lines);
         if (!editInfo) {
@@ -2492 +2493 @@
         }
 
-        this._textModel.editRange(editInfo.range, editInfo.text);
+        this._textModel.editRange(editInfo.range, editInfo.text, originalSelection);
         this._restoreSelection(selection);
     },
@@ -3400 +3401 @@
 
         var newSelection = this._rangeForCtrlArrowMove(selection, "left");
-        this._textModel.editRange(newSelection.normalize(), "");
+        this._textModel.editRange(newSelection.normalize(), "", selection);
 
         this._textEditor.setSelection(newSelection.collapseToEnd());

trunk/Source/WebCore/inspector/front-end/TextEditorModel.js

@@ -148 +148 @@
  * @param {WebInspector.TextRange} newRange
  * @param {string} originalText
+ * @param {WebInspector.TextRange} originalSelection
  */
-WebInspector.TextEditorCommand = function(newRange, originalText)
+WebInspector.TextEditorCommand = function(newRange, originalText, originalSelection)
 {
     this.newRange = newRange;
     this.originalText = originalText;
+    this.originalSelection = originalSelection;
 }
 
@@ -251 +253 @@
      * @param {WebInspector.TextRange} range
      * @param {string} text
-     * @return {WebInspector.TextRange}
-     */
-    editRange: function(range, text)
+     * @param {WebInspector.TextRange=} originalSelection
+     * @return {WebInspector.TextRange}
+     */
+    editRange: function(range, text, originalSelection)
     {   
         if (this._lastEditedRange && (!text || text.indexOf("\n") !== -1 || this._lastEditedRange.endLine !== range.startLine || this._lastEditedRange.endColumn !== range.startColumn))
             this._markUndoableState();
-        return this._innerEditRange(range, text);
+        return this._innerEditRange(range, text, originalSelection);
     },
 
@@ -263 +266 @@
      * @param {WebInspector.TextRange} range
      * @param {string} text
-     * @return {WebInspector.TextRange}
-     */
-    _innerEditRange: function(range, text)
+     * @param {WebInspector.TextRange=} originalSelection
+     * @return {WebInspector.TextRange}
+     */
+    _innerEditRange: function(range, text, originalSelection)
     {
         var originalText = this.copyRange(range);
         var newRange = this._innerSetText(range, text);
-        this._pushUndoableCommand(newRange, originalText);
         this._lastEditedRange = newRange;
+        this._pushUndoableCommand(newRange, originalText, originalSelection || range);
         this.dispatchEventToListeners(WebInspector.TextEditorModel.Events.TextChanged, { oldRange: range, newRange: newRange, editRange: true });
         return newRange;
@@ -460 +464 @@
      * @param {WebInspector.TextRange} newRange
      * @param {string} originalText
+     * @param {WebInspector.TextRange} originalSelection
      * @return {WebInspector.TextEditorCommand}
      */
-    _pushUndoableCommand: function(newRange, originalText)
-    {
-        var command = new WebInspector.TextEditorCommand(newRange.clone(), originalText);
+    _pushUndoableCommand: function(newRange, originalText, originalSelection)
+    {
+        var command = new WebInspector.TextEditorCommand(newRange.clone(), originalText, originalSelection);
         if (this._inUndo)
             this._redoStack.push(command);
@@ -518 +523 @@
             var command = stack[i];
             stack.length = i;
-            range = this._innerEditRange(command.newRange, command.originalText);
+            this._innerEditRange(command.newRange, command.originalText);
+            range = command.originalSelection;
             if (i > 0 && stack[i - 1].explicit)
                 return range;