@stacksjs/stx-vscode 0.2.351 → 0.2.353

package/dist/index.js

@@ -5654,6 +5654,88 @@ function createFoldingRangeProvider() {
 }
 // ../vscode/src/providers/semanticTokensProvider.ts
 import * as vscode11 from "vscode";
+
+// ../vscode/src/providers/semanticTokenSpans.ts
+function semanticTokenSpans(text) {
+  const spans = [];
+  const controlFlowDirectives = ["if", "else", "elseif", "unless", "endif", "endunless", "switch", "case", "default", "endswitch"];
+  const loopDirectives = ["for", "foreach", "while", "forelse", "endfor", "endforeach", "endwhile", "endforelse", "break", "continue"];
+  const functionDirectives = ["component", "include", "includeIf", "includeWhen", "includeUnless", "includeFirst", "extends", "use"];
+  const contentDirectives = ["ts", "js", "script", "css", "markdown", "raw", "verbatim", "json"];
+  const directiveRegex = /@(\w+)/g;
+  let match;
+  match = directiveRegex.exec(text);
+  while (match !== null) {
+    const directiveName = match[1];
+    const startChar = match.index;
+    const length = match[0].length;
+    let tokenType;
+    if (controlFlowDirectives.includes(directiveName)) {
+      tokenType = "keyword";
+    } else if (loopDirectives.includes(directiveName)) {
+      tokenType = "keyword";
+    } else if (functionDirectives.includes(directiveName)) {
+      tokenType = "function";
+    } else if (contentDirectives.includes(directiveName)) {
+      tokenType = "keyword";
+    } else if (directiveName.startsWith("end")) {
+      tokenType = "keyword";
+    } else {
+      tokenType = "function";
+    }
+    spans.push({ start: startChar, end: startChar + length, type: tokenType });
+    match = directiveRegex.exec(text);
+  }
+  const commentRegex = /\{\{--.*?--\}\}/g;
+  let commentMatch;
+  commentMatch = commentRegex.exec(text);
+  while (commentMatch !== null) {
+    const startChar = commentMatch.index;
+    const length = commentMatch[0].length;
+    spans.push({ start: startChar, end: startChar + length, type: "comment" });
+    commentMatch = commentRegex.exec(text);
+  }
+  const expressionRegex = /\{\{(?!--)(.+?)\}\}/g;
+  let exprMatch;
+  exprMatch = expressionRegex.exec(text);
+  while (exprMatch !== null) {
+    const content = exprMatch[1];
+    const startChar = exprMatch.index + 2;
+    const variableRegex = /\b([a-z_$][\w$]*)\b/gi;
+    let varMatch;
+    varMatch = variableRegex.exec(content);
+    while (varMatch !== null) {
+      const varName = varMatch[1];
+      const varStartChar = startChar + varMatch.index;
+      if (["true", "false", "null", "undefined", "const", "let", "var", "function", "return"].includes(varName)) {
+        varMatch = variableRegex.exec(content);
+        continue;
+      }
+      spans.push({ start: varStartChar, end: varStartChar + varName.length, type: "variable" });
+      varMatch = variableRegex.exec(content);
+    }
+    exprMatch = expressionRegex.exec(text);
+  }
+  const directiveWithParamsRegex = /@\w+\s*\(([^)]+)\)/g;
+  let paramMatch;
+  paramMatch = directiveWithParamsRegex.exec(text);
+  while (paramMatch !== null) {
+    const params = paramMatch[1];
+    const paramsStart = paramMatch.index + paramMatch[0].indexOf("(") + 1;
+    const stringRegex = /(['"`])(?:[^\\]|\\.)*?\1/g;
+    let stringMatch;
+    stringMatch = stringRegex.exec(params);
+    while (stringMatch !== null) {
+      const stringStart = paramsStart + stringMatch.index;
+      spans.push({ start: stringStart, end: stringStart + stringMatch[0].length, type: "string" });
+      stringMatch = stringRegex.exec(params);
+    }
+    paramMatch = directiveWithParamsRegex.exec(text);
+  }
+  return spans;
+}
+
+// ../vscode/src/providers/semanticTokensProvider.ts
 var tokenTypes = [
   "keyword",
   "function",
@@ -5679,84 +5761,9 @@ function createSemanticTokensProvider() {
         return new vscode11.SemanticTokensBuilder(legend).build();
       }
       const tokensBuilder = new vscode11.SemanticTokensBuilder(legend);
-      const controlFlowDirectives = ["if", "else", "elseif", "unless", "endif", "endunless", "switch", "case", "default", "endswitch"];
-      const loopDirectives = ["for", "foreach", "while", "forelse", "endfor", "endforeach", "endwhile", "endforelse", "break", "continue"];
-      const functionDirectives = ["component", "include", "includeIf", "includeWhen", "includeUnless", "includeFirst", "extends", "use"];
-      const contentDirectives = ["ts", "js", "script", "css", "markdown", "raw", "verbatim", "json"];
       for (let lineNum = 0;lineNum < document.lineCount; lineNum++) {
-        const line = document.lineAt(lineNum);
-        const text = line.text;
-        const directiveRegex = /@(\w+)/g;
-        let match;
-        match = directiveRegex.exec(text);
-        while (match !== null) {
-          const directiveName = match[1];
-          const startChar = match.index;
-          const length = match[0].length;
-          let tokenType;
-          if (controlFlowDirectives.includes(directiveName)) {
-            tokenType = "keyword";
-          } else if (loopDirectives.includes(directiveName)) {
-            tokenType = "keyword";
-          } else if (functionDirectives.includes(directiveName)) {
-            tokenType = "function";
-          } else if (contentDirectives.includes(directiveName)) {
-            tokenType = "keyword";
-          } else if (directiveName.startsWith("end")) {
-            tokenType = "keyword";
-          } else {
-            tokenType = "function";
-          }
-          const tokenTypeIndex = tokenTypes.indexOf(tokenType);
-          if (tokenTypeIndex >= 0) {
-            tokensBuilder.push(new vscode11.Range(new vscode11.Position(lineNum, startChar), new vscode11.Position(lineNum, startChar + length)), tokenType);
-          }
-          match = directiveRegex.exec(text);
-        }
-        const commentRegex = /\{\{--.*?--\}\}/g;
-        let commentMatch;
-        commentMatch = commentRegex.exec(text);
-        while (commentMatch !== null) {
-          const startChar = commentMatch.index;
-          const length = commentMatch[0].length;
-          tokensBuilder.push(new vscode11.Range(new vscode11.Position(lineNum, startChar), new vscode11.Position(lineNum, startChar + length)), "comment");
-          commentMatch = commentRegex.exec(text);
-        }
-        const expressionRegex = /\{\{(?!--)(.+?)\}\}/;
-        let exprMatch;
-        exprMatch = expressionRegex.exec(text);
-        while (exprMatch !== null) {
-          const content = exprMatch[1];
-          const startChar = exprMatch.index + 2;
-          const variableRegex = /\b([a-z_$][\w$]*)\b/gi;
-          let varMatch;
-          varMatch = variableRegex.exec(content);
-          while (varMatch !== null) {
-            const varName = varMatch[1];
-            const varStartChar = startChar + varMatch.index;
-            if (["true", "false", "null", "undefined", "const", "let", "var", "function", "return"].includes(varName)) {
-              continue;
-            }
-            tokensBuilder.push(new vscode11.Range(new vscode11.Position(lineNum, varStartChar), new vscode11.Position(lineNum, varStartChar + varName.length)), "variable");
-            varMatch = variableRegex.exec(content);
-          }
-          exprMatch = expressionRegex.exec(text);
-        }
-        const directiveWithParamsRegex = /@\w+\s*\(([^)]+)\)/;
-        let paramMatch;
-        paramMatch = directiveWithParamsRegex.exec(text);
-        while (paramMatch !== null) {
-          const params = paramMatch[1];
-          const paramsStart = paramMatch.index + paramMatch[0].indexOf("(") + 1;
-          const stringRegex = /(['"`])(?:[^\\]|\\.)*?\1/g;
-          let stringMatch;
-          stringMatch = stringRegex.exec(params);
-          while (stringMatch !== null) {
-            const stringStart = paramsStart + stringMatch.index;
-            tokensBuilder.push(new vscode11.Range(new vscode11.Position(lineNum, stringStart), new vscode11.Position(lineNum, stringStart + stringMatch[0].length)), "string");
-            stringMatch = stringRegex.exec(params);
-          }
-          paramMatch = directiveWithParamsRegex.exec(text);
+        for (const span of semanticTokenSpans(document.lineAt(lineNum).text)) {
+          tokensBuilder.push(new vscode11.Range(new vscode11.Position(lineNum, span.start), new vscode11.Position(lineNum, span.end)), span.type);
         }
       }
       return tokensBuilder.build();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/stx-vscode",
   "type": "module",
-  "version": "0.2.351",
+  "version": "0.2.353",
   "description": "stx language support for VS Code extensions to embed: the hovers, completions, diagnostics, grammar, snippets and language configuration behind the stx extension.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@stacksjs/ts-css": "^0.3.6",
+    "@stacksjs/ts-css": "^0.3.7",
     "prettier": "^3.9.9"
   }
 }