Address review comments.

rictic · rictic · commit 05ee1db04c89 · 2022-03-22T16:34:29.000-05:00
diff --git a/packages/lit-html/src/static.ts b/packages/lit-html/src/static.ts
@@ -7,7 +7,7 @@
 // Any new exports need to be added to the export statement in
 // `packages/lit/src/index.all.ts`.
 
-import { html as coreHtml, svg as coreSvg, TemplateResult } from './lit-html.js';
+import {html as coreHtml, svg as coreSvg, TemplateResult} from './lit-html.js';
 
 interface StaticValue {
   /** The value to interpolate as-is into the template. */
@@ -108,57 +108,57 @@ const stringsCache = new Map<string, TemplateStringsArray>();
  */
 export const withStatic =
   (coreTag: typeof coreHtml | typeof coreSvg) =>
-    (strings: TemplateStringsArray, ...values: unknown[]): TemplateResult => {
-      const l = values.length;
-      let staticValue: string | undefined;
-      let dynamicValue: unknown;
-      const staticStrings: Array<string> = [];
-      const dynamicValues: Array<unknown> = [];
-      let i = 0;
-      let hasStatics = false;
-      let s: string;
+  (strings: TemplateStringsArray, ...values: unknown[]): TemplateResult => {
+    const l = values.length;
+    let staticValue: string | undefined;
+    let dynamicValue: unknown;
+    const staticStrings: Array<string> = [];
+    const dynamicValues: Array<unknown> = [];
+    let i = 0;
+    let hasStatics = false;
+    let s: string;
 
-      while (i < l) {
-        s = strings[i];
-        // Collect any unsafeStatic values, and their following template strings
-        // so that we treat a run of template strings and unsafe static values as
-        // a single template string.
-        while (
-          i < l &&
-          ((dynamicValue = values[i]),
-            (staticValue = unwrapStaticValue(dynamicValue))) !== undefined
-        ) {
-          s += staticValue + strings[++i];
-          hasStatics = true;
-        }
-        dynamicValues.push(dynamicValue);
-        staticStrings.push(s);
-        i++;
-      }
-      // If the last value isn't static (which would have consumed the last
-      // string), then we need to add the last string.
-      if (i === l) {
-        staticStrings.push(strings[l]);
+    while (i < l) {
+      s = strings[i];
+      // Collect any unsafeStatic values, and their following template strings
+      // so that we treat a run of template strings and unsafe static values as
+      // a single template string.
+      while (
+        i < l &&
+        ((dynamicValue = values[i]),
+        (staticValue = unwrapStaticValue(dynamicValue))) !== undefined
+      ) {
+        s += staticValue + strings[++i];
+        hasStatics = true;
       }
+      dynamicValues.push(dynamicValue);
+      staticStrings.push(s);
+      i++;
+    }
+    // If the last value isn't static (which would have consumed the last
+    // string), then we need to add the last string.
+    if (i === l) {
+      staticStrings.push(strings[l]);
+    }
 
-      if (hasStatics) {
-        const key = staticStrings.join('$$lit$$');
-        strings = stringsCache.get(key)!;
-        if (strings === undefined) {
-          // Beware: in general this pattern is unsafe, and doing so may bypass
-          // lit's security checks and allow an attacker to execute arbitrary
-          // code and inject arbitrary content.
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (staticStrings as any).raw = staticStrings;
-          stringsCache.set(
-            key,
-            (strings = staticStrings as unknown as TemplateStringsArray)
-          );
-        }
-        values = dynamicValues;
+    if (hasStatics) {
+      const key = staticStrings.join('$$lit$$');
+      strings = stringsCache.get(key)!;
+      if (strings === undefined) {
+        // Beware: in general this pattern is unsafe, and doing so may bypass
+        // lit's security checks and allow an attacker to execute arbitrary
+        // code and inject arbitrary content.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (staticStrings as any).raw = staticStrings;
+        stringsCache.set(
+          key,
+          (strings = staticStrings as unknown as TemplateStringsArray)
+        );
       }
-      return coreTag(strings, ...values);
-    };
+      values = dynamicValues;
+    }
+    return coreTag(strings, ...values);
+  };
 
 /**
  * Interprets a template literal as an HTML template that can efficiently
