Changeset 140828 in webkit

Timestamp:

Jan 25, 2013 8:22:00 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: highlight occurences of word in DefaultTextEditor
​https://bugs.webkit.org/show_bug.cgi?id=105523

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

Source/WebCore:

Highlight occurrences of selected word in DefaultTextEditor by the means of new highlight regex API.

Test: inspector/editor/text-editor-highlight-token.html

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.TextEditorMainPanel):
(WebInspector.TextEditorMainPanel.prototype._handleSelectionChange):
(WebInspector.TextEditorMainPanel.TokenHighlighter): Added.
(WebInspector.TextEditorMainPanel.TokenHighlighter.prototype.handleSelectionChange):
(WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._regexString):
(WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._highlight):
(WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._removeHighlight):
(WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._isWord):

• inspector/front-end/textEditor.css:

(.text-editor-token-highlight):

LayoutTests:

Add new test to verify token highlightning functionality.

• inspector/editor/editor-test.js:

(initialize_EditorTests.InspectorTest.createTestEditor): Added optional TextEditorDelegate argument.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/editor-test.js (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-highlight-token-expected.txt (added)
• LayoutTests/inspector/editor/text-editor-highlight-token.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/textEditor.css (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-25  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: highlight occurences of word in DefaultTextEditor
+        https://bugs.webkit.org/show_bug.cgi?id=105523
+
+        Reviewed by Pavel Feldman.
+
+        Add new test to verify token highlightning functionality.
+
+        * inspector/editor/editor-test.js:
+        (initialize_EditorTests.InspectorTest.createTestEditor): Added optional TextEditorDelegate argument.
+        * inspector/editor/text-editor-highlight-token-expected.txt: Added.
+        * inspector/editor/text-editor-highlight-token.html: Added.
+
 2013-01-25  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/LayoutTests/inspector/editor/editor-test.js

@@ -2 +2 @@
 {
 
-InspectorTest.createTestEditor = function(clientHeight, chunkSize)
+InspectorTest.createTestEditor = function(clientHeight, chunkSize, textEditorDelegate)
 {
     WebInspector.debugDefaultTextEditor = true;
-    var textEditor = new WebInspector.DefaultTextEditor("", new WebInspector.TextEditorDelegate());
+    var textEditor = new WebInspector.DefaultTextEditor("", textEditorDelegate || new WebInspector.TextEditorDelegate());
     textEditor.overrideViewportForTest(0, clientHeight || 100, chunkSize || 10);
     textEditor.show(WebInspector.inspectorView.element);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-25  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: highlight occurences of word in DefaultTextEditor
+        https://bugs.webkit.org/show_bug.cgi?id=105523
+
+        Reviewed by Pavel Feldman.
+
+        Highlight occurrences of selected word in DefaultTextEditor by the means of new highlight regex API.
+
+        Test: inspector/editor/text-editor-highlight-token.html
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.TextEditorMainPanel):
+        (WebInspector.TextEditorMainPanel.prototype._handleSelectionChange):
+        (WebInspector.TextEditorMainPanel.TokenHighlighter): Added.
+        (WebInspector.TextEditorMainPanel.TokenHighlighter.prototype.handleSelectionChange):
+        (WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._regexString):
+        (WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._highlight):
+        (WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._removeHighlight):
+        (WebInspector.TextEditorMainPanel.TokenHighlighter.prototype._isWord):
+        * inspector/front-end/textEditor.css:
+        (.text-editor-token-highlight):
+
 2013-01-25  Alexander Paschenko  <alexander.pashenko@lge.com>
 

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

@@ -1363 +1363 @@
     this._highlightRegexs = {};
 
+    this._tokenHighlighter = new WebInspector.TextEditorMainPanel.TokenHighlighter(this, textModel);
+
     this._freeCachedElements();
     this.buildChunks();
@@ -2623 +2625 @@
         if (textRange)
             this._lastSelection = textRange;
+
+        this._tokenHighlighter.handleSelectionChange(textRange);
         this._delegate.selectionChanged(textRange);
     },
@@ -2945 +2949 @@
 }
 
+/**
+ * @constructor
+ * @param {WebInspector.TextEditorMainPanel} mainPanel
+ * @param {WebInspector.TextEditorModel} textModel
+ */
+WebInspector.TextEditorMainPanel.TokenHighlighter = function(mainPanel, textModel)
+{
+    this._mainPanel = mainPanel;
+    this._textModel = textModel;
+}
+
+WebInspector.TextEditorMainPanel.TokenHighlighter._NonWordCharRegex = /[^a-zA-Z0-9_]/;
+WebInspector.TextEditorMainPanel.TokenHighlighter._WordRegex = /^[a-zA-Z0-9_]+$/;
+
+WebInspector.TextEditorMainPanel.TokenHighlighter.prototype = {
+    /**
+     * @param {WebInspector.TextRange} range
+     */
+    handleSelectionChange: function(range)
+    {
+        if (!range) {
+            this._removeHighlight();
+            return;
+        }
+
+        if (range.startLine !== range.endLine) {
+            this._removeHighlight();
+            return;
+        }
+
+        range = range.normalize();
+        var selectedText = this._textModel.copyRange(range);
+        if (selectedText === this._selectedWord)
+            return;
+
+        if (selectedText === "") {
+            this._removeHighlight();
+            return;
+        }
+
+        if (this._isWord(range, selectedText))
+            this._highlight(selectedText);
+        else
+            this._removeHighlight();
+    },
+
+    /**
+     * @param {string} word
+     */
+    _regexString: function(word)
+    {
+        return "\\b" + word + "\\b";
+    },
+
+    /**
+     * @param {string} selectedWord
+     */
+    _highlight: function(selectedWord)
+    {
+        this._removeHighlight();
+        this._selectedWord = selectedWord;
+        this._mainPanel.highlightRegex(this._regexString(selectedWord), "text-editor-token-highlight")
+    },
+
+    _removeHighlight: function()
+    {
+        if (this._selectedWord) {
+            this._mainPanel.removeRegexHighlight(this._regexString(this._selectedWord));
+            delete this._selectedWord;
+        }
+    },
+
+    /**
+     * @param {WebInspector.TextRange} range
+     * @param {string} selectedText
+     * @return {boolean}
+     */
+    _isWord: function(range, selectedText)
+    {
+        const NonWordChar = WebInspector.TextEditorMainPanel.TokenHighlighter._NonWordCharRegex;
+        const WordRegex = WebInspector.TextEditorMainPanel.TokenHighlighter._WordRegex;
+        var line = this._textModel.line(range.startLine);
+        var leftBound = range.startColumn === 0 || NonWordChar.test(line.charAt(range.startColumn - 1));
+        var rightBound = range.endColumn === line.length - 1 || NonWordChar.test(line.charAt(range.endColumn));
+        return leftBound && rightBound && WordRegex.test(selectedText);
+    }
+}
+
 WebInspector.debugDefaultTextEditor = false;

trunk/Source/WebCore/inspector/front-end/textEditor.css

@@ -36 +36 @@
     -webkit-user-select: none;
     z-index: -1;
+}
+
+.text-editor-token-highlight {
+    -webkit-border-radius: 3px;
+    border: 1px solid gray;
 }