@rohal12/spindle-lsp 0.5.0 → 0.5.2

package/dist/bin.js

@@ -2880,7 +2880,7 @@ function segmentRegions(body) {
       i++;
       while (i < lines.length && depth > 0) {
         htmlLines.push(lines[i]);
-        const opens = (lines[i].match(new RegExp(`<${tagName}[\\s>]`, "gi")) ?? []).length;
+        const opens = (lines[i].match(new RegExp(`<${tagName}(?:[\\s>]|$)`, "gi")) ?? []).length;
         const closes = (lines[i].match(new RegExp(`</${tagName}\\s*>`, "gi")) ?? []).length;
         depth += opens - closes;
         i++;
@@ -3006,16 +3006,38 @@ function isInsideAttribute(text, pos) {
 }
 function replaceSpindleTokens(html) {
   const tokens = [];
-  const text = html.replace(SPINDLE_TOKEN_REGEX, (match, ...args2) => {
-    const offset = args2[args2.length - 2];
-    const idx = tokens.length;
-    tokens.push(match);
-    if (isInsideAttribute(html, offset)) {
-      return `__SP${idx}__`;
-    }
-    return `<!--SP:${idx}-->`;
-  });
-  return { text, tokens };
+  const lines = html.split("\n");
+  const resultLines = [];
+  for (const line of lines) {
+    const trimmed = line.trim();
+    SPINDLE_TOKEN_REGEX.lastIndex = 0;
+    if (!SPINDLE_TOKEN_REGEX.test(trimmed)) {
+      resultLines.push(line);
+      continue;
+    }
+    SPINDLE_TOKEN_REGEX.lastIndex = 0;
+    const withoutSpindle = trimmed.replace(SPINDLE_TOKEN_REGEX, "");
+    const hasHtml = HTML_TAG_REGEX.test(withoutSpindle);
+    if (!hasHtml) {
+      const idx = tokens.length;
+      tokens.push(trimmed);
+      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 idx = tokens.length;
+        tokens.push(match);
+        if (isInsideAttribute(line, matchOffset)) {
+          return `__SP${idx}__`;
+        }
+        return `<!--SP:${idx}-->`;
+      });
+      resultLines.push(replaced);
+    }
+  }
+  return { text: resultLines.join("\n"), tokens };
 }
 function restoreSpindleTokens(text, tokens) {
   let result = text;
@@ -3025,11 +3047,12 @@ function restoreSpindleTokens(text, tokens) {
   }
   return result;
 }
-var SPINDLE_TOKEN_REGEX;
+var SPINDLE_TOKEN_REGEX, 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;
+    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>/]/;
   }
 });