Changeset 142621 in webkit

Timestamp:

Feb 12, 2013 7:18:20 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: refactor some reusable functionality from BraceHighlighter
​https://bugs.webkit.org/show_bug.cgi?id=109574

Patch by Andrey Lushnikov <​lushnikov@chromium.org> on 2013-02-12
Reviewed by Pavel Feldman.

Source/WebCore:

New test: inspector/editor/text-editor-brace-highlighter.html

Extract functionality which, for given line and cursor position, will
return position for a brace that should be highlighted. Add a layout
test to verify brace highlighter funcionality.

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.TextEditorMainPanel.BraceHighlightController.prototype.activeBraceColumnForCursorPosition):
(WebInspector.TextEditorMainPanel.BraceHighlightController.prototype.handleSelectionChange):

• inspector/front-end/TextUtils.js:

(WebInspector.TextUtils.isOpeningBraceChar):
(WebInspector.TextUtils.isClosingBraceChar):
(WebInspector.TextUtils.isBraceChar):

LayoutTests:

Add layout test to verify brace highlighter functionality.

• inspector/editor/text-editor-brace-highlighter-expected.txt: Added.
• inspector/editor/text-editor-brace-highlighter.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-brace-highlighter-expected.txt (added)
• LayoutTests/inspector/editor/text-editor-brace-highlighter.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/TextUtils.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-12  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: refactor some reusable functionality from BraceHighlighter
+        https://bugs.webkit.org/show_bug.cgi?id=109574
+
+        Reviewed by Pavel Feldman.
+
+        Add layout test to verify brace highlighter functionality.
+
+        * inspector/editor/text-editor-brace-highlighter-expected.txt: Added.
+        * inspector/editor/text-editor-brace-highlighter.html: Added.
+
 2013-02-12  Andrew Wilson  <atwilson@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: refactor some reusable functionality from BraceHighlighter
+        https://bugs.webkit.org/show_bug.cgi?id=109574
+
+        Reviewed by Pavel Feldman.
+
+        New test: inspector/editor/text-editor-brace-highlighter.html
+
+        Extract functionality which, for given line and cursor position, will
+        return position for a brace that should be highlighted. Add a layout
+        test to verify brace highlighter funcionality.
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.TextEditorMainPanel.BraceHighlightController.prototype.activeBraceColumnForCursorPosition):
+        (WebInspector.TextEditorMainPanel.BraceHighlightController.prototype.handleSelectionChange):
+        * inspector/front-end/TextUtils.js:
+        (WebInspector.TextUtils.isOpeningBraceChar):
+        (WebInspector.TextUtils.isClosingBraceChar):
+        (WebInspector.TextUtils.isBraceChar):
+
 2013-02-12  Ilya Tikhonovsky  <loislo@chromium.org>
 

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

@@ -3405 +3405 @@
 WebInspector.TextEditorMainPanel.BraceHighlightController.prototype = {
     /**
+     * @param {string} line
+     * @param {number} column
+     * @return {number}
+     */
+    activeBraceColumnForCursorPosition: function(line, column)
+    {
+        var char = line.charAt(column);
+        if (WebInspector.TextUtils.isOpeningBraceChar(char))
+            return column;
+
+        var previousChar = line.charAt(column - 1);
+        if (WebInspector.TextUtils.isBraceChar(previousChar))
+            return column - 1;
+
+        if (WebInspector.TextUtils.isBraceChar(char))
+            return column;
+        else
+            return -1;
+    },
+
+    /**
      * @param {WebInspector.TextRange} selectionRange
      */
@@ -3421 +3442 @@
         var column = selectionRange.startColumn;
         var line = this._textModel.line(lineNumber);
-        if (column > 0 && WebInspector.TextUtils.isBraceChar(line.charAt(column - 1)))
-            --column;
+        column = this.activeBraceColumnForCursorPosition(line, column);
+        if (column < 0)
+            return;
 
         var enclosingBraces = this._braceMatcher.enclosingBraces(lineNumber, column);

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

@@ -78 +78 @@
      * @return {boolean}
      */
+    isOpeningBraceChar: function(char)
+    {
+        return char === "(" || char === "{";
+    },
+
+    /**
+     * @param {string} char
+     * @return {boolean}
+     */
+    isClosingBraceChar: function(char)
+    {
+        return char === ")" || char === "}";
+    },
+
+    /**
+     * @param {string} char
+     * @return {boolean}
+     */
     isBraceChar: function(char)
     {
-        return char === "(" || char === ")" ||
-            char === "{" || char === "}";
+        return WebInspector.TextUtils.isOpeningBraceChar(char) || WebInspector.TextUtils.isClosingBraceChar(char);
     }
 }