Changeset 147030 in webkit

Timestamp:

Mar 27, 2013 5:14:34 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: [DTE] implement "tokenAtTextPosition" method
​https://bugs.webkit.org/show_bug.cgi?id=113390

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

Source/WebCore:

Test: inspector/editor/text-editor-token-at-position.html

• Add TextEditor.tokenAtTextPosition method
• Implement tokenAtTextPosition method in DefaultTextEditor

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.DefaultTextEditor.prototype.tokenAtTextPosition):
(WebInspector.TextEditorMainPanel.prototype.compare):
(WebInspector.TextEditorMainPanel.prototype.tokenAtTextPosition):
(WebInspector.TextEditorMainPanel.prototype._tokenAtUnhighlightedLine):
(WebInspector.TextEditorMainPanel.prototype.set mimeType):
(WebInspector.TextEditorMainPanel.prototype.get mimeType):

• inspector/front-end/TextEditor.js:

(WebInspector.TextEditor.prototype.tokenAtTextPosition):

• inspector/front-end/TextEditorHighlighter.js:

(WebInspector.TextEditorHighlighter):
(WebInspector.TextEditorHighlighter.prototype.get mimeType):
(WebInspector.TextEditorHighlighter.prototype.set mimeType):

LayoutTests:

Add a test to verify TextEditor.tokenAtTextPosition method.

• inspector/editor/text-editor-token-at-position-expected.txt: Added.
• inspector/editor/text-editor-token-at-position.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-token-at-position-expected.txt (added)
• LayoutTests/inspector/editor/text-editor-token-at-position.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/TextEditor.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/TextEditorHighlighter.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-27  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: [DTE] implement "tokenAtTextPosition" method
+        https://bugs.webkit.org/show_bug.cgi?id=113390
+
+        Reviewed by Pavel Feldman.
+
+        Add a test to verify TextEditor.tokenAtTextPosition method.
+
+        * inspector/editor/text-editor-token-at-position-expected.txt: Added.
+        * inspector/editor/text-editor-token-at-position.html: Added.
+
 2013-03-27  Sergey Ryazanov  <serya@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-27  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: [DTE] implement "tokenAtTextPosition" method
+        https://bugs.webkit.org/show_bug.cgi?id=113390
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/editor/text-editor-token-at-position.html
+
+        - Add TextEditor.tokenAtTextPosition method
+        - Implement tokenAtTextPosition method in DefaultTextEditor
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.DefaultTextEditor.prototype.tokenAtTextPosition):
+        (WebInspector.TextEditorMainPanel.prototype.compare):
+        (WebInspector.TextEditorMainPanel.prototype.tokenAtTextPosition):
+        (WebInspector.TextEditorMainPanel.prototype._tokenAtUnhighlightedLine):
+        (WebInspector.TextEditorMainPanel.prototype.set mimeType):
+        (WebInspector.TextEditorMainPanel.prototype.get mimeType):
+        * inspector/front-end/TextEditor.js:
+        (WebInspector.TextEditor.prototype.tokenAtTextPosition):
+        * inspector/front-end/TextEditorHighlighter.js:
+        (WebInspector.TextEditorHighlighter):
+        (WebInspector.TextEditorHighlighter.prototype.get mimeType):
+        (WebInspector.TextEditorHighlighter.prototype.set mimeType):
+
 2013-03-27  Charles Wei  <charles.wei@torchmobile.com.cn>
 

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

@@ -124 +124 @@
     },
     /**
+     * @param {number} lineNumber
+     * @param {number} column
+     * @return {?{startColumn: number, endColumn: number, type: string}}
+     */
+    tokenAtTextPosition: function(lineNumber, column)
+    {
+        return this._mainPanel.tokenAtTextPosition(lineNumber, column);
+    },
+
+    /**
      * @param {WebInspector.TextRange} range
      * @return {string}
@@ -1407 +1417 @@
 
 WebInspector.TextEditorMainPanel.prototype = {
+    /**
+     * @param {number} lineNumber
+     * @param {number} column
+     * @return {?{startColumn: number, endColumn: number, type: string}}
+     */
+    tokenAtTextPosition: function(lineNumber, column)
+    {
+        if (lineNumber >= this._textModel.linesCount || lineNumber < 0)
+            return null;
+        var line = this._textModel.line(lineNumber);
+        if (column >= line.length || column < 0)
+            return null;
+        var highlight = this._textModel.getAttribute(lineNumber, "highlight");
+        if (!highlight)
+            return this._tokenAtUnhighlightedLine(line, column);
+        function compare(value, object)
+        {
+            if (value >= object.startColumn && value <= object.endColumn)
+                return 0;
+            return value - object.startColumn;
+        }
+        var index = binarySearch(column, highlight.ranges, compare);
+        if (index >= 0) {
+            var range = highlight.ranges[index];
+            return {
+                startColumn: range.startColumn,
+                endColumn: range.endColumn,
+                type: range.token
+            };
+        }
+        return null;
+    },
+
+    /**
+     * @param {string} line
+     * @param {number} column
+     * @return {?{startColumn: number, endColumn: number, type: string}}
+     */
+    _tokenAtUnhighlightedLine: function(line, column)
+    {
+        var tokenizer = WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer(this.mimeType);
+        tokenizer.condition = tokenizer.createInitialCondition();
+        tokenizer.line = line;
+        var lastTokenizedColumn = 0;
+        while (lastTokenizedColumn < line.length) {
+            var newColumn = tokenizer.nextToken(lastTokenizedColumn);
+            if (column < newColumn) {
+                if (!tokenizer.tokenType)
+                    return null;
+                return {
+                    startColumn: lastTokenizedColumn,
+                    endColumn: newColumn - 1,
+                    type: tokenizer.tokenType
+                };
+            } else
+                lastTokenizedColumn = newColumn;
+        }
+        return null;
+    },
+
     _registerShortcuts: function()
     {
@@ -1622 +1692 @@
     {
         this._highlighter.mimeType = mimeType;
+    },
+
+    get mimeType()
+    {
+        return this._highlighter.mimeType;
     },
 

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

@@ -47 +47 @@
     markClean: function() { },
     /**
+     * @param {number} lineNumber
+     * @param {number} column
+     * @return {?{startColumn: number, endColumn: number, type: string}}
+     */
+    tokenAtTextPosition: function(lineNumber, column) { },
+
+    /**
      * @param {string} mimeType
      */

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

@@ -36 +36 @@
 {
     this._textModel = textModel;
-    this._tokenizer = WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer("text/html");
+    this._mimeType = "text/html";
+    this._tokenizer = WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer(this._mimeType);
     this._damageCallback = damageCallback;
     this._highlightChunkLimit = 1000;
@@ -45 +46 @@
 
 WebInspector.TextEditorHighlighter.prototype = {
+
+    get mimeType()
+    {
+        return this._mimeType;
+    },
+
+    /**
+     * @param {string} mimeType
+     */
     set mimeType(mimeType)
     {
         var tokenizer = WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer(mimeType);
-        if (tokenizer)
+        if (tokenizer) {
             this._tokenizer = tokenizer;
+            this._mimeType = mimeType;
+        }
     },