DevTools: Don't give up autocomplete after a fancy character in a string

third_party/WebKit/Source/devtools/front_end/console/ConsolePrompt.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /**
  * @unrestricted
  */
 Console.ConsolePrompt = class extends UI.Widget {
   constructor() {
     super();
     this._addCompletionsFromHistory = true;
@@ skipping 223 matching lines @@
     else
       this.element.focus();
   }
 
   /**
    * @param {number} lineNumber
    * @param {number} columnNumber
    * @return {?Common.TextRange}
    */
   _substituteRange(lineNumber, columnNumber) {
+    var token = this._editor.tokenAtTextPosition(lineNumber, columnNumber);
+    if (token && token.type === 'js-string')
+      return new Common.TextRange(lineNumber, token.startColumn, lineNumber, columnNumber);

[dgozman, 2017/03/17 20:58:50]

Should we just return null and use default?

[einbinder, 2017/03/20 17:50:47]

Returning null here would disable autocomplete. The default substituteRange uses
isWordChar.

+
     var lineText = this._editor.line(lineNumber);
     var index;
     for (index = columnNumber - 1; index >= 0; index--) {
       if (' =:[({;,!+-*/&|^<>.\t\r\n'.indexOf(lineText.charAt(index)) !== -1)
         break;
     }
     return new Common.TextRange(lineNumber, index + 1, lineNumber, columnNumber);
   }
 
   /**
    * @param {!Common.TextRange} queryRange
    * @param {!Common.TextRange} substituteRange
    * @param {boolean=} force
-   * @param {string=} currentTokenType
    * @return {!Promise<!UI.SuggestBox.Suggestions>}
    */
-  _wordsWithQuery(queryRange, substituteRange, force, currentTokenType) {
+  _wordsWithQuery(queryRange, substituteRange, force) {
     var query = this._editor.text(queryRange);
     var before = this._editor.text(new Common.TextRange(0, 0, queryRange.startLine, queryRange.startColumn));
     var historyWords = this._historyCompletions(query, force);
-
-    var excludedTokens = new Set(['js-comment', 'js-string-2', 'js-def']);
-    var trimmedBefore = before.trim();
-    if (!trimmedBefore.endsWith('[') && !trimmedBefore.match(/\.\s*(get|set|delete)\s*\(\s*$/))
-      excludedTokens.add('js-string');
-    if (!trimmedBefore.endsWith('.'))
-      excludedTokens.add('js-property');
-    if (excludedTokens.has(currentTokenType))
-      return Promise.resolve(historyWords);
-
+    var token = this._editor.tokenAtTextPosition(substituteRange.startLine, substituteRange.startColumn);
+    if (token) {
+      var excludedTokens = new Set(['js-comment', 'js-string-2', 'js-def']);
+      var trimmedBefore = before.trim();
+      if (!trimmedBefore.endsWith('[') && !trimmedBefore.match(/\.\s*(get|set|delete)\s*\(\s*$/))
+        excludedTokens.add('js-string');
+      if (!trimmedBefore.endsWith('.'))
+        excludedTokens.add('js-property');
+      if (excludedTokens.has(token.type))
+        return Promise.resolve(historyWords);
+    }
     return ObjectUI.JavaScriptAutocomplete.completionsForTextInCurrentContext(before, query, force)
         .then(words => words.concat(historyWords));
   }
 
   _editorSetForTest() {
   }
 };
 
 /**
  * @unrestricted
@@ skipping 77 matching lines @@
     return this._currentHistoryItem();
   }
 
   /**
    * @return {string|undefined}
    */
   _currentHistoryItem() {
     return this._data[this._data.length - this._historyOffset];
   }
 };