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

Unified Diff: third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js

Issue 2215253002: DevTools: do not use CSSMetadata instances for autocompletion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@css-meta-data
Patch Set: address comments Created 4 years, 4 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
Index: third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
diff --git a/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js b/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
index 397a3fab4e63f093132e6e0c17c4342ca865ab2a..7d7e89f9cfebea772ff2efa083a44e7c72707554 100644
--- a/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
+++ b/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
@@ -63,7 +63,7 @@ WebInspector.StylesSidebarPane.createExclamationMark = function(property)
exclamationElement.className = "exclamation-mark";
if (!WebInspector.StylesSidebarPane.ignoreErrorsForProperty(property))
exclamationElement.type = "warning-icon";
- exclamationElement.title = WebInspector.CSSMetadata.cssPropertiesMetainfo.keySet()[property.name.toLowerCase()] ? WebInspector.UIString("Invalid property value") : WebInspector.UIString("Unknown property name");
+ exclamationElement.title = WebInspector.CSSMetadata.isCSSPropertyName(property.name) ? WebInspector.UIString("Invalid property value") : WebInspector.UIString("Unknown property name");
return exclamationElement;
}
@@ -2387,7 +2387,8 @@ WebInspector.StylePropertyTreeElement.prototype = {
selectElement.parentElement.scrollIntoViewIfNeeded(false);
var applyItemCallback = !isEditingName ? this._applyFreeFlowStyleTextEdit.bind(this) : undefined;
- this._prompt = new WebInspector.StylesSidebarPane.CSSPropertyPrompt(isEditingName ? WebInspector.CSSMetadata.cssPropertiesMetainfo : WebInspector.CSSMetadata.keywordsForProperty(this.nameElement.textContent), this, isEditingName);
+ var cssCompletions = isEditingName ? WebInspector.CSSMetadata.cssPropertiesMetainfo.allProperties() : WebInspector.CSSMetadata.propertyValues(this.nameElement.textContent);
+ this._prompt = new WebInspector.StylesSidebarPane.CSSPropertyPrompt(cssCompletions, this, isEditingName);
this._prompt.setAutocompletionTimeout(0);
if (applyItemCallback) {
this._prompt.addEventListener(WebInspector.TextPrompt.Events.ItemApplied, applyItemCallback, this);
@@ -2798,7 +2799,7 @@ WebInspector.StylePropertyTreeElement.prototype = {
/**
* @constructor
* @extends {WebInspector.TextPrompt}
- * @param {!WebInspector.CSSMetadata} cssCompletions
+ * @param {!Array<string>} cssCompletions
* @param {!WebInspector.StylePropertyTreeElement} treeElement
* @param {boolean} isEditingName
*/
@@ -2944,7 +2945,7 @@ WebInspector.StylesSidebarPane.CSSPropertyPrompt.prototype = {
return;
}
- var results = this._cssCompletions.startsWith(prefix);
+ var results = this._cssCompletions.filter(completion => completion.startsWith(prefix));
if (!this._isEditingName && !results.length && prefix.length > 1 && "!important".startsWith(prefix))
results.push("!important");
var userEnteredText = wordRange.toString().replace("-", "");
@@ -2952,7 +2953,7 @@ WebInspector.StylesSidebarPane.CSSPropertyPrompt.prototype = {
for (var i = 0; i < results.length; ++i)
results[i] = results[i].toUpperCase();
}
- var selectedIndex = this._cssCompletions.mostUsedOf(results);
+ var selectedIndex = this._isEditingName ? WebInspector.CSSMetadata.mostUsedProperty(results) : 0;
completionsReadyCallback(results, selectedIndex);
},

Powered by Google App Engine
This is Rietveld 408576698