Handle double braces (fixes GoogleChromeLabs#20)

surma · surma · commit 8f60a1a8daaf · 2022-01-15T16:45:56.000Z
diff --git a/src/engine.ts b/src/engine.ts
@@ -388,6 +388,9 @@ interface Block {
 function parseSelector(p: AdhocParser): string | undefined {
   let startIndex = p.index;
   eatUntil("{", p);
+  if (startIndex === p.index) {
+    throw Error("Empty selector");
+  }
   return p.sheetSrc.slice(startIndex, p.index);
 }
 
@@ -448,14 +451,6 @@ function parseIdentifier(p: AdhocParser): string {
   return match[0];
 }
 
-// This function does stuff like `min-width` => `MinWidth`
-function undashify(s: string): string {
-  const v = s
-    .replace(/-(\w)/, (_, l) => l.toUpperCase())
-    .replace(/^\w/, (v) => v.toUpperCase());
-  return v;
-}
-
 function parseMeasurementName(p: AdhocParser): string {
   return parseIdentifier(p).toLowerCase();
 }
diff --git a/tests/empty_href.html b/tests/empty_href.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<style></style>
+<link rel="stylesheet" href="" />
+<script type="text/x-handlebars">
+  {{#foo}}
+  {{/foo}} <!-- Infinite loop when looking at first { on this line -->
+  {{#foo}}
+  {{/foo}}
+</script>
+<div></div>
+<script type="module">
+  import { doubleRaf, testSuite, assert } from "./test-utils.js";
+  import "/cqfill.js";
+
+  testSuite("Manual transpiling", async () => {});
+</script>
diff --git a/tests/index.html b/tests/index.html
@@ -33,23 +33,36 @@
     "dynamic_container",
     "simple_new_syntax",
     "simple_new_long_syntax",
+    "empty_href",
   ];
 
   const { results, iframe } = document.all;
-  const messageStream = new ReadableStream({
-    start(controller) {
-      window.addEventListener("message", (ev) => controller.enqueue(ev.data));
-    },
-  });
+  function nextEvent(el, name) {
+    return new Promise((resolve) => {
+      el.addEventListener(name, (ev) => resolve(ev));
+    });
+  }
+
+  function sleep(ms) {
+    return new Promise((resolve) => {
+      setTimeout(resolve, ms);
+    });
+  }
+
+  function nextEventTimeout(el, name, timeout) {
+    return Promise.race([
+      nextEvent(el, name),
+      sleep(timeout).then(() => ({ data: "Timeout" })),
+    ]);
+  }
+
   async function run() {
     const testResults = {};
     for (const test of TESTS) {
       iframe.src = `./${test}.html`;
-      const reader = messageStream.getReader();
-      const { value: message } = await reader.read();
-      testResults[test] = message;
-      reader.releaseLock();
-      results.innerHTML += `<span><a href="./${test}.html">${test}</a></span><span>${message}</span>`;
+      const result = await nextEventTimeout(window, "message", 2000);
+      testResults[test] = result.data;
+      results.innerHTML += `<span><a href="./${test}.html">${test}</a></span><span>${result.data}</span>`;
     }
     return testResults;
   }
