Changeset 112053 in webkit

Timestamp:

Mar 25, 2012 11:17:48 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Indenting fully selected line should not indent the line next to it
​https://bugs.webkit.org/show_bug.cgi?id=81758

Source/WebCore:

In the editor, you can select a whole line by moving caret at 0 column
position and pressing Shift + Arrow Down/Up. After that, pressing Tab
indents 2 lines: fully selected one and the line next to it. The patch
changes this behaviour to indent only fully selected line since that is
what pretty-match all the other code editors do.

Patch by Nikita Vasilyev <​me@elv1s.ru> on 2012-03-25
Reviewed by Pavel Feldman.

Test: inspector/editor/indentation.html

• inspector/front-end/TextViewer.js:

(WebInspector.TextEditorMainPanel.prototype._indentLines):

Do not insert indent at the begging of the last line if a selection
ends on its 0 column.

(WebInspector.TextEditorMainPanel.prototype._unindentLines):

Do not remove indent at the begging of the last line if a selection
ends on its 0 column.

LayoutTests:

Patch by Nikita Vasilyev <​me@elv1s.ru> on 2012-03-25
Reviewed by Pavel Feldman.

• inspector/editor/indentation-expected.txt: Added.
• inspector/editor/indentation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/indentation-expected.txt (added)
• LayoutTests/inspector/editor/indentation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/TextViewer.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-25  Nikita Vasilyev  <me@elv1s.ru>
+
+        Web Inspector: Indenting fully selected line should not indent the line next to it
+        https://bugs.webkit.org/show_bug.cgi?id=81758
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/editor/indentation-expected.txt: Added.
+        * inspector/editor/indentation.html: Added.
+
 2012-03-25  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-25  Nikita Vasilyev  <me@elv1s.ru>
+
+        Web Inspector: Indenting fully selected line should not indent the line next to it
+        https://bugs.webkit.org/show_bug.cgi?id=81758
+
+        In the editor, you can select a whole line by moving caret at 0 column
+        position and pressing Shift + Arrow Down/Up. After that, pressing Tab
+        indents 2 lines: fully selected one and the line next to it. The patch
+        changes this behaviour to indent only fully selected line since that is
+        what pretty-match all the other code editors do.
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/editor/indentation.html
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextEditorMainPanel.prototype._indentLines):
+            Do not insert indent at the begging of the last line if a selection
+            ends on its 0 column.
+        (WebInspector.TextEditorMainPanel.prototype._unindentLines):
+            Do not remove indent at the begging of the last line if a selection
+            ends on its 0 column.
+
 2012-03-25  Abhishek Arya  <inferno@chromium.org>
 

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

@@ -1127 +1127 @@
             this._textModel.markUndoableState();
 
-        for (var lineNumber = range.startLine; lineNumber <= range.endLine; lineNumber++)
+        var newRange = range.clone();
+
+        // Do not change a selection start position when it is at the beginning of a line
+        if (range.startColumn)
+            newRange.startColumn += indent.length;
+
+        var indentEndLine = range.endLine;
+        if (range.endColumn)
+            newRange.endColumn += indent.length;
+        else
+            indentEndLine--;
+
+        for (var lineNumber = range.startLine; lineNumber <= indentEndLine; lineNumber++)
             this._textModel.setText(new WebInspector.TextRange(lineNumber, 0, lineNumber, 0), indent);
 
-        var newRange = range.clone();
-        newRange.startColumn += indent.length;
-        newRange.endColumn += indent.length;
         this._lastEditedRange = newRange;
 
@@ -1148 +1157 @@
         var newRange = range.clone();
 
-        for (var lineNumber = range.startLine; lineNumber <= range.endLine; lineNumber++) {
+        var indentEndLine = range.endLine;
+        if (!range.endColumn)
+            indentEndLine--;
+
+        for (var lineNumber = range.startLine; lineNumber <= indentEndLine; lineNumber++) {
             var line = this._textModel.line(lineNumber);
             var firstCharacter = line.charAt(0);