chrome-devtools-frontend 1.0.947377 → 1.0.948916

package/front_end/ui/components/text_editor/javascript.ts

@@ -159,6 +159,7 @@ export async function javascriptCompletionSource(cx: CodeMirror.CompletionContex
   }
 
   let result: CompletionSet;
+  let quote: string|undefined = undefined;
   if (query.type === QueryType.Expression) {
     const [scope, global] = await Promise.all([
       completeExpressionInScope(),
@@ -174,7 +175,6 @@ export async function javascriptCompletionSource(cx: CodeMirror.CompletionContex
     }
   } else if (query.type === QueryType.PropertyName || query.type === QueryType.PropertyExpression) {
     const objectExpr = (query.relatedNode as CodeMirror.SyntaxNode).getChild('Expression');
-    let quote = undefined;
     if (query.type === QueryType.PropertyExpression) {
       quote = query.from === undefined ? '\'' : cx.state.sliceDoc(query.from, query.from + 1);
     }
@@ -189,10 +189,13 @@ export async function javascriptCompletionSource(cx: CodeMirror.CompletionContex
   return {
     from: query.from ?? cx.pos,
     options: result.completions,
-    span: /^#?[\w\P{ASCII}]*/u,
+    span: !quote ? SPAN_IDENT : quote === '\'' ? SPAN_SINGLE_QUOTE : SPAN_DOUBLE_QUOTE,
   };
 }
 
+const SPAN_IDENT = /^#?[\w\P{ASCII}]*$/u, SPAN_SINGLE_QUOTE = /^\'(\\.|[^\\'\n])*'?$/,
+      SPAN_DOUBLE_QUOTE = /^"(\\.|[^\\"\n])*"?$/;
+
 function getExecutionContext(): SDK.RuntimeModel.ExecutionContext|null {
   return UI.Context.Context.instance().flavor(SDK.RuntimeModel.ExecutionContext);
 }
@@ -330,8 +333,9 @@ async function completePropertiesInner(
     const isFunction = object.type === 'function';
     for (const prop of properties.properties || []) {
       if (!prop.symbol && !(isFunction && (prop.name === 'arguments' || prop.name === 'caller')) &&
-          (!prop.private || expression === 'this')) {
-        const label = quoted ? quoted + prop.name + quoted : prop.name;
+          (!prop.private || expression === 'this') && (quoted || SPAN_IDENT.test(prop.name))) {
+        const label =
+            quoted ? quoted + prop.name.replaceAll('\\', '\\\\').replaceAll(quoted, '\\' + quoted) + quoted : prop.name;
         const completion: CodeMirror.Completion = {
           label,
           type: prop.value?.type === 'function' ? functionType : otherType,

package/front_end/ui/components/text_prompt/TextPrompt.ts

@@ -127,8 +127,8 @@ export class TextPrompt extends HTMLElement {
     const output = LitHtml.html`
       <span class="prefix">${this.#prefixText} </span>
       <span class="text-prompt-input"><input aria-label=${this.#ariaLabelText} spellcheck="false" @input=${
-        this.onInput} @keydown=${this.onKeyDown}/><span class='suggestion' suggestion="${
-        this.#suggestionText}"></span></span>`;
+        this.onInput} @keydown=${this.onKeyDown}/><span class='suggestion' suggestion=${
+        this.#suggestionText}></span></span>`;
     LitHtml.render(output, this.#shadow, {host: this});
   }
 }

package/front_end/ui/legacy/GlassPane.ts

@@ -55,7 +55,7 @@ export class GlassPane {
     return this.widgetInternal.isShowing();
   }
 
-  registerRequiredCSS(cssFile: string|{cssContent: string}): void {
+  registerRequiredCSS(cssFile: {cssContent: string}): void {
     // eslint-disable-next-line no-restricted-syntax -- Should import styles https://crbug.com/1106746
     this.widgetInternal.registerRequiredCSS(cssFile);
   }

package/front_end/ui/legacy/SearchableView.ts

@@ -35,6 +35,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
+import * as Platform from '../../core/platform/platform.js';
 
 import * as ARIAUtils from './ARIAUtils.js';
 import {HistoryInput} from './HistoryInput.js';
@@ -629,7 +630,7 @@ export class SearchConfig {
 
     // Otherwise just do a plain text search.
     if (!regex) {
-      regex = createPlainTextSearchRegex(query, modifiers);
+      regex = Platform.StringUtilities.createPlainTextSearchRegex(query, modifiers);
     }
 
     return regex;

package/front_end/ui/legacy/Treeoutline.ts

@@ -399,7 +399,7 @@ export class TreeOutlineInShadow extends TreeOutline {
     this.renderSelection = true;
   }
 
-  registerRequiredCSS(cssFile: string|{cssContent: string}): void {
+  registerRequiredCSS(cssFile: {cssContent: string}): void {
     Utils.appendStyle(this.shadowRoot, cssFile);
   }
 

package/front_end/ui/legacy/Widget.ts

@@ -458,7 +458,7 @@ export class Widget {
     this.doResize();
   }
 
-  registerRequiredCSS(cssFile: string|{cssContent: string}): void {
+  registerRequiredCSS(cssFile: {cssContent: string}): void {
     if (this.isWebComponent) {
       Utils.appendStyle((this.shadowRoot as DocumentFragment), cssFile);
     } else {

package/front_end/ui/legacy/XWidget.ts

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import * as ComponentHelpers from '../components/helpers/helpers.js';
-import * as Utils from './utils/utils.js';
 
 import {XElement} from './XElement.js';
 
@@ -55,10 +54,6 @@ export class XWidget extends XElement {
     return this.visible;
   }
 
-  registerRequiredCSS(cssFile: string): void {
-    Utils.appendStyle(this.shadowRootInternal || this, cssFile);
-  }
-
   setOnShown(callback: (() => void)|null): void {
     this.onShownCallback = callback;
   }

package/front_end/ui/legacy/components/inline_editor/CSSVarSwatch.ts

@@ -113,7 +113,7 @@ export class CSSVarSwatch extends HTMLElement {
     // The this.variableName's space must be removed, otherwise it cannot be triggered when clicked.
     const onActivate = isDefined ? this.onLinkActivate.bind(this, this.variableName.trim()) : null;
 
-    return html`<span class="${classes}" title="${title}" @mousedown=${onActivate} @keydown=${
+    return html`<span class=${classes} title=${title} @mousedown=${onActivate} @keydown=${
         onActivate} role="link" tabindex="-1">${variableName}</span>`;
   }
 
@@ -129,7 +129,7 @@ export class CSSVarSwatch extends HTMLElement {
     // Disabled until https://crbug.com/1079231 is fixed.
     // clang-format off
     render(
-      html`<span title="${this.computedValue || ''}">${functionParts.pre}${link}${functionParts.post}</span>`,
+      html`<span title=${this.computedValue || ''}>${functionParts.pre}${link}${functionParts.post}</span>`,
       this.shadow, { host: this });
     // clang-format on
   }

package/front_end/ui/legacy/components/inline_editor/ColorSwatch.ts

@@ -118,7 +118,7 @@ export class ColorSwatch extends HTMLElement {
     // Note also that whitespace between nodes is removed on purpose to avoid pushing these elements apart. Do not
     // re-format the HTML code.
     LitHtml.render(
-      LitHtml.html`<span class="color-swatch" title="${this.tooltip}"><span class="color-swatch-inner"
+      LitHtml.html`<span class="color-swatch" title=${this.tooltip}><span class="color-swatch-inner"
         style="background-color: ${this.text};"
         @click=${this.onClick}
         @mousedown=${this.consume}

package/front_end/ui/legacy/utils/append-style.ts

@@ -2,19 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as Root from '../../../core/root/root.js';
-
-export function appendStyle(node: Node, cssReference: string|{cssContent: string}): void {
-  let content: string;
-  if (typeof cssReference === 'string') {
-    content = Root.Runtime.cachedResources.get(cssReference) || '';
-    if (!content) {
-      console.error(cssReference + ' not preloaded. Check module.json');
-    }
-  } else {
-    content = cssReference.cssContent;
-  }
+export function appendStyle(node: Node, {cssContent}: {cssContent: string}): void {
   const styleElement = document.createElement('style');
-  styleElement.textContent = content;
+  styleElement.textContent = cssContent;
   node.appendChild(styleElement);
 }

package/front_end/ui/legacy/utils/create-shadow-root-with-core-styles.ts

@@ -7,7 +7,7 @@ import {focusChanged} from './focus-changed.js';
 import {injectCoreStyles} from './inject-core-styles.js';
 
 interface Options {
-  cssFile?: string|CSSStyleSheet[]|{cssContent: string};
+  cssFile?: CSSStyleSheet[]|{cssContent: string};
   delegatesFocus?: boolean;
 }
 
@@ -22,10 +22,12 @@ export function createShadowRootWithCoreStyles(element: Element, options: Option
 
   const shadowRoot = element.attachShadow({mode: 'open', delegatesFocus});
   injectCoreStyles(shadowRoot);
-  if (typeof cssFile === 'string' || (cssFile !== undefined && 'cssContent' in cssFile)) {
-    appendStyle(shadowRoot, cssFile);
-  } else if (cssFile) {
-    shadowRoot.adoptedStyleSheets = cssFile;
+  if (cssFile) {
+    if ('cssContent' in cssFile) {
+      appendStyle(shadowRoot, cssFile);
+    } else {
+      shadowRoot.adoptedStyleSheets = cssFile;
+    }
   }
   shadowRoot.addEventListener('focus', focusChanged, true);
   return shadowRoot;

package/package.json

@@ -27,10 +27,8 @@
     "auto-unittest": "scripts/test/run_auto_unittests.py --no-text-coverage",
     "build": "autoninja -C out/Default",
     "build-release": "autoninja -C out/Release",
-    "check": "npm run check-json && npm run check-gn && npm run check-lint && npm run check-loc",
+    "check": "npm run check-lint && npm run check-loc",
     "check-external-links": "third_party/node/node.py --output scripts/check_external_links.js",
-    "check-gn": "third_party/node/node.py --output scripts/check_gn.js",
-    "check-json": "third_party/node/node.py --output scripts/json_validator/validate_module_json.js",
     "check-lint": "third_party/node/node.py --output scripts/test/run_lint_check_js.mjs && third_party/node/node.py --output scripts/test/run_lint_check_css.js",
     "check-lint-css": "third_party/node/node.py --output scripts/test/run_lint_check_css.js",
     "collect-strings": "third_party/node/node.py --output third_party/i18n/collect-strings.js front_end",
@@ -55,5 +53,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.947377"
+  "version": "1.0.948916"
 }

package/scripts/build/build_inspector_overlay.py

@@ -12,7 +12,6 @@ Builds inspector overlay:
 
 from os import path
 from os.path import join
-from modular_build import read_file, write_file
 from itertools import tee
 
 import os
@@ -29,6 +28,21 @@ finally:
     sys.path = original_sys_path
 
 
+def read_file(filename):
+    with open(path.normpath(filename), 'rt', encoding='utf-8') as input:
+        return input.read()
+
+
+def write_file(filename, content):
+    if path.exists(filename):
+        os.remove(filename)
+    directory = path.dirname(filename)
+    if not path.exists(directory):
+        os.makedirs(directory)
+    with open(filename, 'wt', encoding='utf-8') as output:
+        output.write(content)
+
+
 def check_size(filename, data, max_size):
     assert len(
         data

package/scripts/build/rjsmin.py

@@ -119,8 +119,7 @@ def _make_jsmin(python_only=False):
     charclass = r'(?:\[[^\\\]\r\n]*(?:\\[^\r\n][^\\\]\r\n]*)*\])'
     nospecial = r'[^/\\\[\r\n]'
     regex = r'(?:/(?![\r\n/*])%s*(?:(?:\\[^\r\n]|%s)%s*)*/)' % (
-        nospecial, charclass, nospecial
-    )
+        nospecial, charclass, nospecial)
     space = r'(?:%s|%s)' % (space_chars, space_comment)
     newline = r'(?:%s?[\r\n])' % line_comment
 
@@ -147,36 +146,28 @@ def _make_jsmin(python_only=False):
                     first = last = char
             if last is not None:
                 result.append((first, last))
-            return ''.join(['%s%s%s' % (
-                chr(first),
-                last > first + 1 and '-' or '',
-                last != first and chr(last) or ''
-            ) for first, last in result])  # noqa
+            return ''.join([
+                '%s%s%s' % (chr(first), last > first + 1 and '-'
+                            or '', last != first and chr(last) or '')
+                for first, last in result
+            ])  # noqa
 
         return _re.sub(
             r'([\000-\040\047])',  # \047 for better portability
-            lambda m: '\\%03o' % ord(m.group(1)), (
-                sequentize(result)
-                .replace('\\', '\\\\')
-                .replace('[', '\\[')
-                .replace(']', '\\]')
-            )
-        )
+            lambda m: '\\%03o' % ord(m.group(1)),
+            (sequentize(result).replace('\\', '\\\\').replace(
+                '[', '\\[').replace(']', '\\]')))
 
     def id_literal_(what):
         """ Make id_literal like char class """
         match = _re.compile(what).match
-        result = ''.join([
-            chr(c) for c in xrange(127) if not match(chr(c))
-        ])
+        result = ''.join([chr(c) for c in xrange(127) if not match(chr(c))])
         return '[^%s]' % fix_charclass(result)
 
     def not_id_literal_(keep):
         """ Make negated id_literal like char class """
         match = _re.compile(id_literal_(keep)).match
-        result = ''.join([
-            chr(c) for c in xrange(127) if not match(chr(c))
-        ])
+        result = ''.join([chr(c) for c in xrange(127) if not match(chr(c))])
         return r'[%s]' % fix_charclass(result)
 
     not_id_literal = not_id_literal_(r'[a-zA-Z0-9_$]')
@@ -192,28 +183,26 @@ def _make_jsmin(python_only=False):
 
     space_sub_simple = _re.compile((
         # noqa pylint: disable = bad-continuation
-
-        r'(%(dull)s+)'                                         # 0
-        r'|(%(strings)s%(dull)s*)'                             # 1
+        r'(%(dull)s+)'  # 0
+        r'|(%(strings)s%(dull)s*)'  # 1
         r'|(?<=%(preregex1)s)'
-            r'%(space)s*(?:%(newline)s%(space)s*)*'
-            r'(%(regex)s)'                                     # 2
-            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 3
-                r'(?=%(post_regex_off)s))?'
+        r'%(space)s*(?:%(newline)s%(space)s*)*'
+        r'(%(regex)s)'  # 2
+        r'(%(space)s*(?:%(newline)s%(space)s*)+'  # 3
+        r'(?=%(post_regex_off)s))?'
         r'|(?<=%(preregex2)s)'
-            r'%(space)s*(?:(%(newline)s)%(space)s*)*'          # 4
-            r'(%(regex)s)'                                     # 5
-            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 6
-                r'(?=%(post_regex_off)s))?'
+        r'%(space)s*(?:(%(newline)s)%(space)s*)*'  # 4
+        r'(%(regex)s)'  # 5
+        r'(%(space)s*(?:%(newline)s%(space)s*)+'  # 6
+        r'(?=%(post_regex_off)s))?'
         r'|(?<=%(id_literal_close)s)'
-            r'%(space)s*(?:(%(newline)s)%(space)s*)+'          # 7
-            r'(?=%(id_literal_open)s)'
+        r'%(space)s*(?:(%(newline)s)%(space)s*)+'  # 7
+        r'(?=%(id_literal_open)s)'
         r'|(?<=%(id_literal)s)(%(space)s)+(?=%(id_literal)s)'  # 8
-        r'|(?<=\+)(%(space)s)+(?=\+)'                          # 9
-        r'|(?<=-)(%(space)s)+(?=-)'                            # 10
+        r'|(?<=\+)(%(space)s)+(?=\+)'  # 9
+        r'|(?<=-)(%(space)s)+(?=-)'  # 10
         r'|%(space)s+'
-        r'|(?:%(newline)s%(space)s*)+'
-    ) % locals()).sub
+        r'|(?:%(newline)s%(space)s*)+') % locals()).sub
 
     # print space_sub_simple.__self__.pattern
 
@@ -245,35 +234,33 @@ def _make_jsmin(python_only=False):
 
     space_sub_banged = _re.compile((
         # noqa pylint: disable = bad-continuation
-
-        r'(%(dull)s+)'                                         # 0
-        r'|(%(strings)s%(dull)s*)'                             # 1
+        r'(%(dull)s+)'  # 0
+        r'|(%(strings)s%(dull)s*)'  # 1
         r'|(?<=%(preregex1)s)'
-            r'(%(space)s*(?:%(newline)s%(space)s*)*)'          # 2
-            r'(%(regex)s)'                                     # 3
-            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 4
-                r'(?=%(post_regex_off)s))?'
+        r'(%(space)s*(?:%(newline)s%(space)s*)*)'  # 2
+        r'(%(regex)s)'  # 3
+        r'(%(space)s*(?:%(newline)s%(space)s*)+'  # 4
+        r'(?=%(post_regex_off)s))?'
         r'|(?<=%(preregex2)s)'
-            r'(%(space)s*(?:(%(newline)s)%(space)s*)*)'        # 5, 6
-            r'(%(regex)s)'                                     # 7
-            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 8
-                r'(?=%(post_regex_off)s))?'
+        r'(%(space)s*(?:(%(newline)s)%(space)s*)*)'  # 5, 6
+        r'(%(regex)s)'  # 7
+        r'(%(space)s*(?:%(newline)s%(space)s*)+'  # 8
+        r'(?=%(post_regex_off)s))?'
         r'|(?<=%(id_literal_close)s)'
-            r'(%(space)s*(?:%(newline)s%(space)s*)+)'          # 9
-            r'(?=%(id_literal_open)s)'
+        r'(%(space)s*(?:%(newline)s%(space)s*)+)'  # 9
+        r'(?=%(id_literal_open)s)'
         r'|(?<=%(id_literal)s)(%(space)s+)(?=%(id_literal)s)'  # 10
-        r'|(?<=\+)(%(space)s+)(?=\+)'                          # 11
-        r'|(?<=-)(%(space)s+)(?=-)'                            # 12
-        r'|(%(space)s+)'                                       # 13
-        r'|((?:%(newline)s%(space)s*)+)'                       # 14
+        r'|(?<=\+)(%(space)s+)(?=\+)'  # 11
+        r'|(?<=-)(%(space)s+)(?=-)'  # 12
+        r'|(%(space)s+)'  # 13
+        r'|((?:%(newline)s%(space)s*)+)'  # 14
     ) % locals()).sub
 
     # print space_sub_banged.__self__.pattern
 
-    keep = _re.compile((
-        r'%(space_chars)s+|%(space_comment_nobang)s+|%(newline)s+'
-        r'|(%(bang_comment)s+)'
-    ) % locals()).sub
+    keep = _re.compile(
+        (r'%(space_chars)s+|%(space_comment_nobang)s+|%(newline)s+'
+         r'|(%(bang_comment)s+)') % locals()).sub
     keeper = lambda m: m.groups()[0] or ''
 
     # print keep.__self__.pattern
@@ -333,16 +320,15 @@ def _make_jsmin(python_only=False):
         # pylint: disable = redefined-outer-name
 
         if keep_bang_comments:
-            return space_sub_banged(
-                space_subber_banged, '\n%s\n' % script
-            ).strip()
+            return space_sub_banged(space_subber_banged,
+                                    '\n%s\n' % script).strip()
         else:
-            return space_sub_simple(
-                space_subber_simple, '\n%s\n' % script
-            ).strip()
+            return space_sub_simple(space_subber_simple,
+                                    '\n%s\n' % script).strip()
 
     return jsmin
 
+
 jsmin = _make_jsmin()
 
 
@@ -403,28 +389,19 @@ def jsmin_for_posers(script, keep_bang_comments=False):
             r'\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=-)|(?:['
             r'\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)'
             r')+|(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014\016-\040]'
-            r'|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+'
-        )
+            r'|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+')
 
         def subber(match):
             """ Substitution callback """
             groups = match.groups()
-            return (
-                groups[0] or
-                groups[1] or
-                (groups[3] and (groups[2] + '\n')) or
-                groups[2] or
-                (groups[5] and "%s%s%s" % (
-                    groups[4] and '\n' or '',
-                    groups[5],
-                    groups[6] and '\n' or '',
-                )) or
-                (groups[7] and '\n') or
-                (groups[8] and ' ') or
-                (groups[9] and ' ') or
-                (groups[10] and ' ') or
-                ''
-            )
+            return (groups[0] or groups[1]
+                    or (groups[3] and (groups[2] + '\n')) or groups[2]
+                    or (groups[5] and "%s%s%s" % (
+                        groups[4] and '\n' or '',
+                        groups[5],
+                        groups[6] and '\n' or '',
+                    )) or (groups[7] and '\n') or (groups[8] and ' ')
+                    or (groups[9] and ' ') or (groups[10] and ' ') or '')
     else:
         rex = (
             r'([^\047"/\000-\040]+)|((?:(?:\047[^\047\\\r\n]*(?:\\(?:[^\r\n]'
@@ -457,46 +434,39 @@ def jsmin_for_posers(script, keep_bang_comments=False):
             r'11\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))+)(?=-'
             r')|((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*'
             r'\*+)*/))+)|((?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014'
-            r'\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+)'
-        )
-
-        keep = _re.compile((
-            r'[\000-\011\013\014\016-\040]+|(?:/\*(?!!)[^*]*\*+(?:[^/*][^*]*'
-            r'\*+)*/)+|(?:(?://[^\r\n]*)?[\r\n])+|((?:/\*![^*]*\*+(?:[^/*][^'
-            r'*]*\*+)*/)+)'
-        ) % locals()).sub
+            r'\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+)')
+
+        keep = _re.compile(
+            (r'[\000-\011\013\014\016-\040]+|(?:/\*(?!!)[^*]*\*+(?:[^/*][^*]*'
+             r'\*+)*/)+|(?:(?://[^\r\n]*)?[\r\n])+|((?:/\*![^*]*\*+(?:[^/*][^'
+             r'*]*\*+)*/)+)') % locals()).sub
         keeper = lambda m: m.groups()[0] or ''
 
         def subber(match):
             """ Substitution callback """
             groups = match.groups()
-            return (
-                groups[0] or
-                groups[1] or
-                (groups[3] and "%s%s%s%s" % (
-                    keep(keeper, groups[2]),
-                    groups[3],
-                    keep(keeper, groups[4] or ''),
-                    groups[4] and '\n' or '',
-                )) or
-                (groups[7] and "%s%s%s%s%s" % (
-                    keep(keeper, groups[5]),
-                    groups[6] and '\n' or '',
-                    groups[7],
-                    keep(keeper, groups[8] or ''),
-                    groups[8] and '\n' or '',
-                )) or
-                (groups[9] and keep(keeper, groups[9] + '\n')) or
-                (groups[10] and keep(keeper, groups[10]) or ' ') or
-                (groups[11] and keep(keeper, groups[11]) or ' ') or
-                (groups[12] and keep(keeper, groups[12]) or ' ') or
-                keep(keeper, groups[13] or groups[14])
-            )
+            return (groups[0] or groups[1] or (groups[3] and "%s%s%s%s" % (
+                keep(keeper, groups[2]),
+                groups[3],
+                keep(keeper, groups[4] or ''),
+                groups[4] and '\n' or '',
+            )) or (groups[7] and "%s%s%s%s%s" % (
+                keep(keeper, groups[5]),
+                groups[6] and '\n' or '',
+                groups[7],
+                keep(keeper, groups[8] or ''),
+                groups[8] and '\n' or '',
+            )) or (groups[9] and keep(keeper, groups[9] + '\n'))
+                    or (groups[10] and keep(keeper, groups[10]) or ' ')
+                    or (groups[11] and keep(keeper, groups[11]) or ' ')
+                    or (groups[12] and keep(keeper, groups[12]) or ' ')
+                    or keep(keeper, groups[13] or groups[14]))
 
     return _re.sub(rex, subber, '\n%s\n' % script).strip()
 
 
 if __name__ == '__main__':
+
     def main():
         """ Main """
         import sys as _sys
@@ -508,8 +478,7 @@ if __name__ == '__main__':
         else:
             xjsmin = jsmin
 
-        _sys.stdout.write(xjsmin(
-            _sys.stdin.read(), keep_bang_comments=keep_bang_comments
-        ))
+        _sys.stdout.write(
+            xjsmin(_sys.stdin.read(), keep_bang_comments=keep_bang_comments))
 
     main()

package/scripts/eslint_rules/lib/ban_a_tags_in_lit_html.js

@@ -3,16 +3,7 @@
 // found in the LICENSE file.
 'use strict';
 
-function isLitHtmlTemplateCall(taggedTemplateExpression) {
-  if (taggedTemplateExpression.name) {
-    // Call to html`` and we assume that html = LitHtml's html function.
-    return taggedTemplateExpression.name === 'html';
-  }
-
-  // Match calls to LitHtml.html``
-  return taggedTemplateExpression.object && taggedTemplateExpression.object.name === 'LitHtml' &&
-      taggedTemplateExpression.property.name === 'html';
-}
+const {isLitHtmlTemplateCall} = require('./utils.js');
 
 module.exports = {
   meta: {
@@ -27,7 +18,7 @@ module.exports = {
   create: function(context) {
     return {
       TaggedTemplateExpression(node) {
-        const isLitHtmlCall = isLitHtmlTemplateCall(node.tag);
+        const isLitHtmlCall = isLitHtmlTemplateCall(node);
         if (!isLitHtmlCall) {
           return;
         }

package/scripts/eslint_rules/lib/ban_literal_devtools_component_tag_names.js

@@ -3,16 +3,7 @@
 // found in the LICENSE file.
 'use strict';
 
-function isLitHtmlTemplateCall(taggedTemplateExpression) {
-  if (taggedTemplateExpression.name) {
-    // Call to html`` and we assume that html = LitHtml's html function.
-    return taggedTemplateExpression.name === 'html';
-  }
-
-  // Match calls to LitHtml.html``
-  return taggedTemplateExpression.object && taggedTemplateExpression.object.name === 'LitHtml' &&
-      taggedTemplateExpression.property.name === 'html';
-}
+const {isLitHtmlTemplateCall} = require('./utils.js');
 
 module.exports = {
   meta: {
@@ -28,7 +19,7 @@ module.exports = {
   create: function(context) {
     return {
       TaggedTemplateExpression(node) {
-        const isLitHtmlCall = isLitHtmlTemplateCall(node.tag);
+        const isLitHtmlCall = isLitHtmlTemplateCall(node);
         if (!isLitHtmlCall) {
           return;
         }

package/scripts/eslint_rules/lib/ban_self_closing_custom_element_tagnames.js

@@ -3,16 +3,7 @@
 // found in the LICENSE file.
 'use strict';
 
-function isLitHtmlTemplateCall(taggedTemplateExpression) {
-  if (taggedTemplateExpression.name) {
-    // Call to html`` and we assume that html = LitHtml's html function.
-    return taggedTemplateExpression.name === 'html';
-  }
-
-  // Match calls to LitHtml.html``
-  return taggedTemplateExpression.object && taggedTemplateExpression.object.name === 'LitHtml' &&
-      taggedTemplateExpression.property.name === 'html';
-}
+const {isLitHtmlTemplateCall} = require('./utils.js');
 
 module.exports = {
   meta: {
@@ -27,7 +18,7 @@ module.exports = {
   create: function(context) {
     return {
       TaggedTemplateExpression(node) {
-        const isLitHtmlCall = isLitHtmlTemplateCall(node.tag);
+        const isLitHtmlCall = isLitHtmlTemplateCall(node);
         if (!isLitHtmlCall) {
           return;
         }