Changeset 187902 in webkit

Timestamp:

Aug 4, 2015, 3:48:42 PM (10 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Existing text after completions do not have their completion style removed once hint is applied
​https://bugs.webkit.org/show_bug.cgi?id=147536

Reviewed by Timothy Hatcher.

No longer applies a class to the text after the completion hint.

• UserInterface/Controllers/CodeMirrorCompletionController.css:

(.CodeMirror .CodeMirror-lines .completion-hint):

• UserInterface/Controllers/CodeMirrorCompletionController.js:

(WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.clearMarker):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.update):
(WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/CodeMirrorCompletionController.css (modified) (1 diff)
• UserInterface/Controllers/CodeMirrorCompletionController.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-08-04  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Existing text after completions do not have their completion style removed once hint is applied
+        https://bugs.webkit.org/show_bug.cgi?id=147536
+
+        Reviewed by Timothy Hatcher.
+
+        No longer applies a class to the text after the completion hint.
+
+        * UserInterface/Controllers/CodeMirrorCompletionController.css:
+        (.CodeMirror .CodeMirror-lines .completion-hint):
+        * UserInterface/Controllers/CodeMirrorCompletionController.js:
+        (WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint.update):
+        (WebInspector.CodeMirrorCompletionController.prototype._applyCompletionHint):
+        (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.clearMarker):
+        (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint.update):
+        (WebInspector.CodeMirrorCompletionController.prototype._removeCompletionHint):
+
 2015-08-04  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.css

@@ -25 +25 @@
 
 .CodeMirror .CodeMirror-lines .completion-hint {
+    text-decoration: none !important;
     opacity: 0.4;
 }

trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js

@@ -271 +271 @@
             var from = {line: this._lineNumber, ch: this._startOffset};
             var cursor = {line: this._lineNumber, ch: this._endOffset};
-            var to = {line: this._lineNumber, ch: this._startOffset + replacementText.length};
             var currentText = this._codeMirror.getRange(from, cursor);
 
             this._createCompletionHintMarker(cursor, replacementText.replace(currentText, ""));
-            if (cursor.ch !== to.ch)
-                this._codeMirror.markText(cursor, to, {className: WebInspector.CodeMirrorCompletionController.CompletionHintStyleClassName});
         }
 
@@ -343 +340 @@
         this._notifyCompletionsHiddenSoon();
 
+        function clearMarker(marker)
+        {
+            if (!marker)
+                return;
+
+            var range = marker.find();
+            if (range)
+                marker.clear();
+
+            return null;
+        }
+
         function update()
         {
-            var range = this._completionHintMarker.find();
-            if (range)
-                this._completionHintMarker.clear();
-
-            this._completionHintMarker = null;
+            this._completionHintMarker = clearMarker(this._completionHintMarker);
 
             if (dontRestorePrefix)