@rohal12/spindle-lsp 0.7.0 → 0.7.1

package/dist/bin.js

@@ -3172,6 +3172,50 @@ var init_prettier_bridge = __esm({
 });
 
 // src/plugins/format/placeholders.ts
+function scanSpindleTokens(text) {
+  const matches = [];
+  let i = 0;
+  while (i < text.length) {
+    if (text[i] === "[" && text[i + 1] === "[") {
+      const closeIdx = text.indexOf("]]", i + 2);
+      if (closeIdx !== -1) {
+        const end = closeIdx + 2;
+        matches.push({ start: i, end, token: text.slice(i, end) });
+        i = end;
+        continue;
+      }
+    }
+    if (text[i] === "{" && !(i > 0 && text[i - 1] === "\\")) {
+      const next = i + 1 < text.length ? text[i + 1] : "";
+      let isToken = false;
+      if (next === "/") {
+        isToken = i + 2 < text.length && /[A-Za-z]/.test(text[i + 2]);
+      } else if (next === "#" || next === ".") {
+        isToken = i + 2 < text.length && /[a-zA-Z]/.test(text[i + 2]);
+      } else if (/[A-Za-z]/.test(next)) {
+        isToken = true;
+      } else if (/[$_@%]/.test(next)) {
+        isToken = i + 2 < text.length && /[a-zA-Z]/.test(text[i + 2]);
+      }
+      if (isToken) {
+        let depth = 1;
+        let j = i + 1;
+        while (j < text.length && depth > 0) {
+          if (text[j] === "{") depth++;
+          else if (text[j] === "}") depth--;
+          j++;
+        }
+        if (depth === 0) {
+          matches.push({ start: i, end: j, token: text.slice(i, j) });
+          i = j;
+          continue;
+        }
+      }
+    }
+    i++;
+  }
+  return matches;
+}
 function isInsideAttribute(text, pos) {
   let inQuote = false;
   let quoteChar = "";
@@ -3208,13 +3252,15 @@ function replaceSpindleTokens(html) {
   const resultLines = [];
   for (const line of lines) {
     const trimmed = line.trim();
-    SPINDLE_TOKEN_REGEX.lastIndex = 0;
-    if (!SPINDLE_TOKEN_REGEX.test(trimmed)) {
+    const found = scanSpindleTokens(trimmed);
+    if (found.length === 0) {
       resultLines.push(line);
       continue;
     }
-    SPINDLE_TOKEN_REGEX.lastIndex = 0;
-    const withoutSpindle = trimmed.replace(SPINDLE_TOKEN_REGEX, "");
+    let withoutSpindle = trimmed;
+    for (let fi = found.length - 1; fi >= 0; fi--) {
+      withoutSpindle = withoutSpindle.slice(0, found[fi].start) + withoutSpindle.slice(found[fi].end);
+    }
     const hasHtml = HTML_TAG_REGEX.test(withoutSpindle);
     if (!hasHtml) {
       const idx = tokens.length;
@@ -3222,16 +3268,20 @@ function replaceSpindleTokens(html) {
       const indent = line.match(/^(\s*)/)?.[1] ?? "";
       resultLines.push(`${indent}<!--SP:${idx}-->`);
     } else {
-      SPINDLE_TOKEN_REGEX.lastIndex = 0;
-      const replaced = line.replace(SPINDLE_TOKEN_REGEX, (match, ...args2) => {
-        const matchOffset = args2[args2.length - 2];
+      const indent = line.match(/^(\s*)/)?.[1] ?? "";
+      const indentLen = indent.length;
+      const assignments = found.map((t) => {
+        const lineStart = t.start + indentLen;
         const idx = tokens.length;
-        tokens.push(match);
-        if (isInsideAttribute(line, matchOffset)) {
-          return `__SP${idx}__`;
-        }
-        return `<!--SP:${idx}-->`;
+        tokens.push(t.token);
+        const placeholder = isInsideAttribute(line, lineStart) ? `__SP${idx}__` : `<!--SP:${idx}-->`;
+        return { start: lineStart, end: t.end + indentLen, placeholder };
       });
+      let replaced = line;
+      for (let ai = assignments.length - 1; ai >= 0; ai--) {
+        const a = assignments[ai];
+        replaced = replaced.slice(0, a.start) + a.placeholder + replaced.slice(a.end);
+      }
       resultLines.push(replaced);
     }
   }
@@ -3245,11 +3295,10 @@ function restoreSpindleTokens(text, tokens) {
   }
   return result;
 }
-var SPINDLE_TOKEN_REGEX, HTML_TAG_REGEX;
+var HTML_TAG_REGEX;
 var init_placeholders = __esm({
   "src/plugins/format/placeholders.ts"() {
     "use strict";
-    SPINDLE_TOKEN_REGEX = /(?:\{\/[A-Za-z][\w-]*\s*\}|\{(?:[#.][a-zA-Z][\w-]*\s*)*[A-Za-z][\w-]*(?:\s+(?:[^{}]|\{[^{}]*\})*)?\}|\{[$_@][a-zA-Z][\w.]*\}|\[\[(?:[^\]]*)\]\])/g;
     HTML_TAG_REGEX = /<\/?[a-zA-Z][\w-]*[\s>/]/;
   }
 });