Improve pragma detection

squint-cljs · Dec 14, 2023 · 6c3007c · 6c3007c
1 parent 91d5456
commit 6c3007c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/squint/compiler_common.cljc b/src/squint/compiler_common.cljc
@@ -284,7 +284,7 @@
 
 (defn save-pragma [env next-t]
   (if (and (:top-level env)
-           (re-matches #"^(/\*|//|\"|\').*" (str next-t)))
+           (re-find #"^(/\*|//|\"|\')" (str next-t)))
     (let [js (str next-t "\n")]
       (if-let [p (:pragmas env)]
         (do (swap! p str js)

diff --git a/test/squint/compiler_test.cljs b/test/squint/compiler_test.cljs
@@ -2133,14 +2133,21 @@ new Foo();")
 (deftest pragmas-test
   (let [code "\"use client\"
 (js* \"// ts-check\")
+(js* \"/*
+yolo
+*/\")
+(js* \"'use server'\")
 (defn foo [] (merge nil nil))"]
     (doseq [code [code (str/replace "(do %s)" "%s" code)]]
       (let [{:keys [pragmas javascript]} (compiler/compile-string* code)]
         (is (str/includes? pragmas "use client"))
         (is (str/includes? pragmas "// ts-check"))
         (is (not (str/includes? pragmas ";")))
-        (is (< (str/index-of javascript "use client") (str/index-of javascript "ts-check")))
-        (is (< (str/index-of javascript "ts-check") (str/index-of javascript "import")))))))
+        (is (< (str/index-of javascript "use client")
+               (str/index-of javascript "ts-check")
+               (str/index-of javascript "yolo")
+               (str/index-of javascript "'use server'")
+               (str/index-of javascript "import")))))))
 
 (defn init []
   (t/run-tests 'squint.compiler-test 'squint.jsx-test 'squint.string-test))