Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js

Issue 2163393002: DevTools: Give autocomplete suggestions even after brackets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nicer sequential Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/console/console-correct-suggestions-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js
diff --git a/third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js b/third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js
index 4e3676b025c963e8e50849af1648690e437e396e..0cf6dd826ca477969127d734c424c12c40946823 100644
--- a/third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js
+++ b/third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js
@@ -202,13 +202,24 @@ WebInspector.ExecutionContextSelector.completionsForTextPromptInCurrentContext =
}
// Pass less stop characters to rangeOfWord so the range will be a more complete expression.
- var expressionRange = wordRange.startContainer.rangeOfWord(wordRange.startOffset, " =:({;,!+-*/&|^<>", proxyElement, "backward");
+ var expressionRange = wordRange.startContainer.rangeOfWord(wordRange.startOffset, " =:({;,!+-*/&|^<>`", proxyElement, "backward");
var expressionString = expressionRange.toString();
- // The "[" is also a stop character, except when it's the last character of the expression.
- var pos = expressionString.lastIndexOf("[", expressionString.length - 2);
- if (pos !== -1)
- expressionString = expressionString.substr(pos + 1);
+ var bracketCount = 0;
+ var index = expressionString.length - 1;
+ while (index >= 0) {
+ var character = expressionString.charAt(index);
+ if (character === "]")
+ bracketCount++;
+ // Allow an open bracket at the end for property completion.
+ if (character === "[" && index < expressionString.length - 1) {
+ bracketCount--;
+ if (bracketCount < 0)
+ break;
+ }
+ index--;
+ }
+ expressionString = expressionString.substring(index + 1);
var prefix = wordRange.toString();
executionContext.completionsForExpression(expressionString, prefix, force, completionsReadyCallback);
« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/console/console-correct-suggestions-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698