Always add braces to single-line if-statements
The Chromium/Google style guides does not enforce curly braces for
single-line if-statements, but does strongly recommend doing so. Adding
braces will improve code readability, by visually separating code
blocks. This will also prevent issues where accidental additions are
pushed to the "else"-clause instead of in the if-block.
This CL also updates the presubmit `eslint` to run the fix with the
correct configuration. It will now fix all issues it can fix.
Change-Id: I4b616f21a99393f168dec743c0bcbdc7f5db04a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1821526
Commit-Queue: Tim Van der Lippe <[email protected]>
Reviewed-by: Yang Guo <[email protected]>
Reviewed-by: Jeff Fisher <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#701070}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7e0bdbe2d7f9fc2386bfaefda3cc29c66ccc18f9
diff --git a/front_end/elements/ClassesPaneWidget.js b/front_end/elements/ClassesPaneWidget.js
index ff33a6d..6d3fd26 100644
--- a/front_end/elements/ClassesPaneWidget.js
+++ b/front_end/elements/ClassesPaneWidget.js
@@ -48,19 +48,22 @@
* @param {!Event} event
*/
_onKeyDown(event) {
- if (!isEnterKey(event) && !isEscKey(event))
+ if (!isEnterKey(event) && !isEscKey(event)) {
return;
+ }
if (isEnterKey(event)) {
event.consume();
- if (this._prompt.acceptAutoComplete())
+ if (this._prompt.acceptAutoComplete()) {
return;
+ }
}
let text = event.target.textContent;
if (isEscKey(event)) {
- if (!text.isWhitespace())
+ if (!text.isWhitespace()) {
event.consume(true);
+ }
text = '';
}
@@ -68,20 +71,23 @@
event.target.textContent = '';
const node = UI.context.flavor(SDK.DOMNode);
- if (!node)
+ if (!node) {
return;
+ }
const classNames = this._splitTextIntoClasses(text);
- for (const className of classNames)
+ for (const className of classNames) {
this._toggleClass(node, className, true);
+ }
this._installNodeClasses(node);
this._update();
}
_onTextChanged() {
const node = UI.context.flavor(SDK.DOMNode);
- if (!node)
+ if (!node) {
return;
+ }
this._installNodeClasses(node);
}
@@ -90,8 +96,9 @@
*/
_onDOMMutated(event) {
const node = /** @type {!SDK.DOMNode} */ (event.data);
- if (this._mutatingNodes.has(node))
+ if (this._mutatingNodes.has(node)) {
return;
+ }
delete node[Elements.ClassesPaneWidget._classesSymbol];
this._update();
}
@@ -116,18 +123,21 @@
}
_update() {
- if (!this.isShowing())
+ if (!this.isShowing()) {
return;
+ }
let node = UI.context.flavor(SDK.DOMNode);
- if (node)
+ if (node) {
node = node.enclosingElementOrSelf();
+ }
this._classesContainer.removeChildren();
this._input.disabled = !node;
- if (!node)
+ if (!node) {
return;
+ }
const classes = this._nodeClasses(node);
const keys = classes.keysArray();
@@ -147,8 +157,9 @@
*/
_onClick(className, event) {
const node = UI.context.flavor(SDK.DOMNode);
- if (!node)
+ if (!node) {
return;
+ }
const enabled = event.target.checked;
this._toggleClass(node, className, enabled);
this._installNodeClasses(node);
@@ -166,8 +177,9 @@
result = new Map();
for (let i = 0; i < classes.length; ++i) {
const className = classes[i].trim();
- if (!className.length)
+ if (!className.length) {
continue;
+ }
result.set(className, true);
}
node[Elements.ClassesPaneWidget._classesSymbol] = result;
@@ -192,13 +204,15 @@
const classes = this._nodeClasses(node);
const activeClasses = new Set();
for (const className of classes.keys()) {
- if (classes.get(className))
+ if (classes.get(className)) {
activeClasses.add(className);
+ }
}
const additionalClasses = this._splitTextIntoClasses(this._prompt.textWithCurrentSuggestion());
- for (const className of additionalClasses)
+ for (const className of additionalClasses) {
activeClasses.add(className);
+ }
const newClasses = activeClasses.valuesArray();
newClasses.sort();
@@ -287,8 +301,9 @@
const cssModel = selectedNode.domModel().cssModel();
const allStyleSheets = cssModel.allStyleSheets();
for (const stylesheet of allStyleSheets) {
- if (stylesheet.frameId !== this._selectedFrameId)
+ if (stylesheet.frameId !== this._selectedFrameId) {
continue;
+ }
const cssPromise = cssModel.classNamesPromise(stylesheet.id).then(classes => completions.addAll(classes));
promises.push(cssPromise);
}
@@ -307,22 +322,26 @@
* @return {!Promise<!UI.SuggestBox.Suggestions>}
*/
_buildClassNameCompletions(expression, prefix, force) {
- if (!prefix || force)
+ if (!prefix || force) {
this._classNamesPromise = null;
+ }
const selectedNode = UI.context.flavor(SDK.DOMNode);
- if (!selectedNode || (!prefix && !force && !expression.trim()))
+ if (!selectedNode || (!prefix && !force && !expression.trim())) {
return Promise.resolve([]);
+ }
- if (!this._classNamesPromise || this._selectedFrameId !== selectedNode.frameId())
+ if (!this._classNamesPromise || this._selectedFrameId !== selectedNode.frameId()) {
this._classNamesPromise = this._getClassNames(selectedNode);
+ }
return this._classNamesPromise.then(completions => {
const classesMap = this._nodeClasses(/** @type {!SDK.DOMNode} */ (selectedNode));
completions = completions.filter(value => !classesMap.get(value));
- if (prefix[0] === '.')
+ if (prefix[0] === '.') {
completions = completions.map(value => '.' + value);
+ }
return completions.filter(value => value.startsWith(prefix)).sort().map(completion => ({text: completion}));
});
}
