@marko/language-server 0.12.7 → 0.12.8

package/dist/index.js

@@ -1028,10 +1028,7 @@ var import_vscode_languageserver9 = require("vscode-languageserver");
 var import_vscode_uri6 = require("vscode-uri");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
-var NO_EDIT = [
-  import_vscode_languageserver9.TextEdit.replace(import_vscode_languageserver9.Range.create(import_vscode_languageserver9.Position.create(0, 0), import_vscode_languageserver9.Position.create(0, 0)), "")
-];
-var format2 = async (doc, params, token) => {
+var format2 = async (doc, params, cancel) => {
   try {
     const { fsPath, scheme } = import_vscode_uri6.URI.parse(doc.uri);
     const text = doc.getText();
@@ -1045,15 +1042,14 @@ var format2 = async (doc, params, token) => {
         editorconfig: true
       }).catch(() => null) : null
     };
-    if (!token.isCancellationRequested) {
-      return [
-        import_vscode_languageserver9.TextEdit.replace(import_vscode_languageserver9.Range.create(doc.positionAt(0), doc.positionAt(text.length)), prettier.format(text, options))
-      ];
-    }
+    if (cancel.isCancellationRequested)
+      return;
+    return [
+      import_vscode_languageserver9.TextEdit.replace(import_vscode_languageserver9.Range.create(doc.positionAt(0), doc.positionAt(text.length)), prettier.format(text, options))
+    ];
   } catch (e) {
     displayError(e);
   }
-  return NO_EDIT;
 };
 
 // src/service/marko/index.ts
@@ -1129,7 +1125,7 @@ function createExtractor(code) {
           const generatedStart = generatedMap[key];
           const sourceStart = generatedMap[key + 1];
           const sourceEnd = generatedMap[key + 2];
-          return sourceEnd - sourceStart <= generatedOffset - generatedStart ? void 0 : sourceStart + (generatedOffset - generatedStart);
+          return sourceEnd - sourceStart < generatedOffset - generatedStart ? void 0 : sourceStart + (generatedOffset - generatedStart);
         },
         generatedOffsetAt(sourceOffset) {
           let max = sourceMap.length / 3;
@@ -1169,10 +1165,20 @@ function extractStyleSheets(code, program, lookup) {
     }).replace(/^.*\./, "") : "css";
   };
   const visit = (node) => {
-    var _a, _b, _c;
+    var _a, _b;
     switch (node.type) {
       case 1 /* Tag */:
-        if ((_a = node.body) == null ? void 0 : _a.length) {
+        if (node.nameText === "style" && node.concise && node.attrs) {
+          const block = node.attrs.at(-1);
+          if (block.type === 8 /* AttrNamed */ && code[block.start] === "{") {
+            getExtractor(getFileExtFromTag(node)).write`${{
+              start: block.start + 1,
+              end: block.end - 1
+            }}`;
+            break;
+          }
+        }
+        if (node.body) {
           if (node.nameText === "style") {
             const ext = getFileExtFromTag(node);
             for (const child of node.body) {
@@ -1186,30 +1192,22 @@ function extractStyleSheets(code, program, lookup) {
               }
             }
           } else {
-            if (node.attrs) {
-              for (const attr of node.attrs) {
-                if (attr.type === 8 /* AttrNamed */ && ((_b = attr.value) == null ? void 0 : _b.type) === 11 /* AttrValue */ && /^['"]$/.test(code[attr.value.value.start])) {
-                  const name = read(attr.name);
-                  if (name === "#style" || name === "style" && lookup && node.nameText && name === "style" && ((_c = lookup.getTag(node.nameText)) == null ? void 0 : _c.html)) {
-                    getExtractor("css").write`:root{${{
-                      start: attr.value.value.start + 1,
-                      end: attr.value.value.end - 1
-                    }}}`;
-                  }
-                }
-              }
-            }
             for (const child of node.body) {
               visit(child);
             }
           }
-        } else if (node.nameText === "style" && node.concise && node.attrs) {
-          const block = node.attrs.at(-1);
-          if (block.type === 8 /* AttrNamed */ && code[block.start] === "{") {
-            getExtractor(getFileExtFromTag(node)).write`${{
-              start: block.start + 1,
-              end: block.end - 1
-            }}`;
+        }
+        if (node.attrs) {
+          for (const attr of node.attrs) {
+            if (attr.type === 8 /* AttrNamed */ && ((_a = attr.value) == null ? void 0 : _a.type) === 11 /* AttrValue */ && /^['"]$/.test(code[attr.value.value.start])) {
+              const name = read(attr.name);
+              if (name === "#style" || name === "style" && lookup && node.nameText && name === "style" && ((_b = lookup.getTag(node.nameText)) == null ? void 0 : _b.html)) {
+                getExtractor("css").write`:root{${{
+                  start: attr.value.value.start + 1,
+                  end: attr.value.value.end - 1
+                }}}`;
+              }
+            }
           }
         }
         break;
@@ -1231,7 +1229,7 @@ var services = {
   less: import_vscode_css_languageservice.getLESSLanguageService,
   scss: import_vscode_css_languageservice.getSCSSLanguageService
 };
-var stylesheet_default = {
+var StyleSheetService = {
   async doComplete(doc, params) {
     const infoByExt = getStyleSheetInfo(doc);
     const sourceOffset = doc.offsetAt(params.position);
@@ -1244,26 +1242,17 @@ var stylesheet_default = {
       const result = service2.doComplete(virtualDoc, virtualDoc.positionAt(generatedOffset), info.parsed);
       for (const item of result.items) {
         if (item.additionalTextEdits) {
-          for (const edit of item.additionalTextEdits) {
-            if (!updateRange(doc, info, edit.range)) {
-              edit.newText = "";
-              edit.range = START_OF_FILE;
-            }
+          for (const textEdit2 of item.additionalTextEdits) {
+            updateTextEdit(doc, info, textEdit2);
           }
         }
         const { textEdit } = item;
         if (textEdit) {
           if (textEdit.range) {
-            if (!updateRange(doc, info, textEdit.range)) {
-              textEdit.newText = "";
-              textEdit.range = START_OF_FILE;
-            }
+            updateTextEdit(doc, info, textEdit);
           }
           if (textEdit.insert) {
-            if (!updateRange(doc, info, textEdit.insert)) {
-              textEdit.newText = "";
-              textEdit.insert = START_OF_FILE;
-            }
+            updateInsertReplaceEdit(doc, info, textEdit);
           }
         }
       }
@@ -1287,6 +1276,48 @@ var stylesheet_default = {
       break;
     }
   },
+  async findDocumentColors(doc) {
+    const infoByExt = getStyleSheetInfo(doc);
+    const result = [];
+    for (const ext in infoByExt) {
+      const info = infoByExt[ext];
+      const { service: service2, virtualDoc } = info;
+      for (const colorInfo of service2.findDocumentColors(virtualDoc, info.parsed)) {
+        if (updateRange(doc, info, colorInfo.range)) {
+          result.push(colorInfo);
+        }
+      }
+    }
+    if (result.length) {
+      return result;
+    }
+  },
+  async getColorPresentations(doc, params) {
+    const infoByExt = getStyleSheetInfo(doc);
+    const sourceOffset = doc.offsetAt(params.range.start);
+    for (const ext in infoByExt) {
+      const info = infoByExt[ext];
+      const generatedOffsetStart = info.generatedOffsetAt(sourceOffset);
+      if (generatedOffsetStart === void 0)
+        continue;
+      const generatedOffsetEnd = info.generatedOffsetAt(doc.offsetAt(params.range.end));
+      if (generatedOffsetEnd === void 0)
+        continue;
+      const { service: service2, virtualDoc } = info;
+      const result = service2.getColorPresentations(virtualDoc, info.parsed, params.color, import_vscode_languageserver10.Range.create(virtualDoc.positionAt(generatedOffsetStart), virtualDoc.positionAt(generatedOffsetEnd)));
+      for (const colorPresentation of result) {
+        if (colorPresentation.textEdit) {
+          updateTextEdit(doc, info, colorPresentation.textEdit);
+        }
+        if (colorPresentation.additionalTextEdits) {
+          for (const textEdit of colorPresentation.additionalTextEdits) {
+            updateTextEdit(doc, info, textEdit);
+          }
+        }
+      }
+      return result;
+    }
+  },
   async doHover(doc, params) {
     const infoByExt = getStyleSheetInfo(doc);
     const sourceOffset = doc.offsetAt(params.position);
@@ -1296,12 +1327,72 @@ var stylesheet_default = {
       if (generatedOffset === void 0)
         continue;
       const { service: service2, virtualDoc } = info;
-      const result = service2.doHover(virtualDoc, virtualDoc.positionAt(generatedOffset), service2.parseStylesheet(virtualDoc));
+      const result = service2.doHover(virtualDoc, virtualDoc.positionAt(generatedOffset), info.parsed);
       if (result && (!result.range || updateRange(doc, info, result.range))) {
         return result;
       }
     }
   },
+  async doRename(doc, params) {
+    const infoByExt = getStyleSheetInfo(doc);
+    const sourceOffset = doc.offsetAt(params.position);
+    for (const ext in infoByExt) {
+      const info = infoByExt[ext];
+      const generatedOffset = info.generatedOffsetAt(sourceOffset);
+      if (generatedOffset === void 0)
+        continue;
+      const { service: service2, virtualDoc } = info;
+      const result = service2.doRename(virtualDoc, virtualDoc.positionAt(generatedOffset), params.newName, info.parsed);
+      if (result.changes) {
+        for (const uri in result.changes) {
+          if (uri === doc.uri) {
+            for (const textEdit of result.changes[uri]) {
+              updateTextEdit(doc, info, textEdit);
+            }
+          }
+        }
+      }
+      if (result.documentChanges) {
+        for (const change of result.documentChanges) {
+          if (import_vscode_languageserver10.TextDocumentEdit.is(change)) {
+            if (change.textDocument.uri === doc.uri) {
+              for (const textEdit of change.edits) {
+                updateTextEdit(doc, info, textEdit);
+              }
+            }
+          }
+        }
+      }
+      return result;
+    }
+  },
+  async doCodeActions(doc, params) {
+    var _a;
+    const infoByExt = getStyleSheetInfo(doc);
+    const sourceOffset = doc.offsetAt(params.range.start);
+    for (const ext in infoByExt) {
+      const info = infoByExt[ext];
+      const generatedOffsetStart = info.generatedOffsetAt(sourceOffset);
+      if (generatedOffsetStart === void 0)
+        continue;
+      const generatedOffsetEnd = info.generatedOffsetAt(doc.offsetAt(params.range.end));
+      if (generatedOffsetEnd === void 0)
+        continue;
+      const { service: service2, virtualDoc } = info;
+      const result = service2.doCodeActions(virtualDoc, import_vscode_languageserver10.Range.create(virtualDoc.positionAt(generatedOffsetStart), virtualDoc.positionAt(generatedOffsetEnd)), params.context, info.parsed);
+      if (result) {
+        for (const command of result) {
+          const edits = (_a = command.arguments) == null ? void 0 : _a[2];
+          if (edits) {
+            for (const textEdit of edits) {
+              updateTextEdit(doc, info, textEdit);
+            }
+          }
+        }
+        return result;
+      }
+    }
+  },
   async doValidate(doc) {
     const infoByExt = getStyleSheetInfo(doc);
     const result = [];
@@ -1316,6 +1407,18 @@ var stylesheet_default = {
     return result;
   }
 };
+function updateTextEdit(doc, info, textEdit) {
+  if (!updateRange(doc, info, textEdit.range)) {
+    textEdit.newText = "";
+    textEdit.range = START_OF_FILE;
+  }
+}
+function updateInsertReplaceEdit(doc, info, insertReplaceEdit) {
+  if (!updateRange(doc, info, insertReplaceEdit.insert)) {
+    insertReplaceEdit.newText = "";
+    insertReplaceEdit.insert = START_OF_FILE;
+  }
+}
 function updateRange(doc, info, range) {
   const start = info.sourceOffsetAt(info.virtualDoc.offsetAt(range.start));
   const end = info.sourceOffsetAt(info.virtualDoc.offsetAt(range.end));
@@ -1353,7 +1456,7 @@ function getStyleSheetInfo(doc) {
 }
 
 // src/service/index.ts
-var plugins = [marko_default, stylesheet_default];
+var plugins = [marko_default, StyleSheetService];
 var service = {
   async doComplete(doc, params, cancel) {
     const result = import_vscode_languageserver11.CompletionList.create([], false);
@@ -1365,7 +1468,7 @@ var service = {
       for (const pending of requests) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
-          break;
+          return;
         if (cur) {
           let items;
           if (Array.isArray(cur)) {
@@ -1393,7 +1496,7 @@ var service = {
       for (const pending of requests) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
-          break;
+          return;
         if (cur) {
           if (Array.isArray(cur)) {
             result.push(...cur);
@@ -1407,6 +1510,54 @@ var service = {
     }
     return result;
   },
+  async findDocumentColors(doc, params, cancel) {
+    let result;
+    try {
+      const requests = plugins.map((plugin) => {
+        var _a;
+        return (_a = plugin.findDocumentColors) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+      });
+      for (const pending of requests) {
+        const cur = await pending;
+        if (cancel.isCancellationRequested)
+          return;
+        if (cur) {
+          if (result) {
+            result.push(...cur);
+          } else {
+            result = cur;
+          }
+        }
+      }
+    } catch (err) {
+      displayError(err);
+    }
+    return result;
+  },
+  async getColorPresentations(doc, params, cancel) {
+    let result;
+    try {
+      const requests = plugins.map((plugin) => {
+        var _a;
+        return (_a = plugin.getColorPresentations) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+      });
+      for (const pending of requests) {
+        const cur = await pending;
+        if (cancel.isCancellationRequested)
+          return;
+        if (cur) {
+          if (result) {
+            result.push(...cur);
+          } else {
+            result = cur;
+          }
+        }
+      }
+    } catch (err) {
+      displayError(err);
+    }
+    return result;
+  },
   async doHover(doc, params, cancel) {
     var _a;
     try {
@@ -1421,6 +1572,80 @@ var service = {
       displayError(err);
     }
   },
+  async doRename(doc, params, cancel) {
+    let changes;
+    let changeAnnotations;
+    let documentChanges;
+    try {
+      const requests = plugins.map((plugin) => {
+        var _a;
+        return (_a = plugin.doRename) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+      });
+      for (const pending of requests) {
+        const cur = await pending;
+        if (cancel.isCancellationRequested)
+          return;
+        if (cur) {
+          if (cur.changes) {
+            if (changes) {
+              for (const uri in cur.changes) {
+                if (changes[uri]) {
+                  changes[uri].push(...cur.changes[uri]);
+                } else {
+                  changes[uri] = cur.changes[uri];
+                }
+              }
+            } else {
+              changes = cur.changes;
+            }
+          }
+          if (cur.changeAnnotations) {
+            if (changeAnnotations) {
+              Object.assign(changeAnnotations, cur.changeAnnotations);
+            } else {
+              changeAnnotations = cur.changeAnnotations;
+            }
+          }
+          if (cur.documentChanges) {
+            if (documentChanges) {
+              documentChanges.push(...cur.documentChanges);
+            } else {
+              documentChanges = cur.documentChanges;
+            }
+          }
+        }
+      }
+    } catch (err) {
+      displayError(err);
+    }
+    if (changes || changeAnnotations || documentChanges) {
+      return {
+        changes,
+        changeAnnotations,
+        documentChanges
+      };
+    }
+  },
+  async doCodeActions(doc, params, cancel) {
+    const result = [];
+    try {
+      const requests = plugins.map((plugin) => {
+        var _a;
+        return (_a = plugin.doCodeActions) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+      });
+      for (const pending of requests) {
+        const cur = await pending;
+        if (cancel.isCancellationRequested)
+          return;
+        if (cur) {
+          result.push(...cur);
+        }
+      }
+    } catch (err) {
+      displayError(err);
+    }
+    return result;
+  },
   async doValidate(doc) {
     const result = [];
     try {
@@ -1466,6 +1691,9 @@ connection2.onInitialize(() => {
       documentFormattingProvider: true,
       definitionProvider: true,
       hoverProvider: true,
+      renameProvider: true,
+      codeActionProvider: true,
+      colorProvider: true,
       completionProvider: {
         triggerCharacters: [
           ".",
@@ -1505,9 +1733,21 @@ connection2.onCompletion(async (params, cancel) => {
 connection2.onDefinition(async (params, cancel) => {
   return await service.findDefinition(documents.get(params.textDocument.uri), params, cancel) || null;
 });
+connection2.onDocumentColor(async (params, cancel) => {
+  return await service.findDocumentColors(documents.get(params.textDocument.uri), params, cancel) || null;
+});
+connection2.onColorPresentation(async (params, cancel) => {
+  return await service.getColorPresentations(documents.get(params.textDocument.uri), params, cancel) || null;
+});
 connection2.onHover(async (params, cancel) => {
   return await service.doHover(documents.get(params.textDocument.uri), params, cancel) || null;
 });
+connection2.onRenameRequest(async (params, cancel) => {
+  return await service.doRename(documents.get(params.textDocument.uri), params, cancel) || null;
+});
+connection2.onCodeAction(async (params, cancel) => {
+  return await service.doCodeActions(documents.get(params.textDocument.uri), params, cancel) || null;
+});
 connection2.onDocumentFormatting(async (params, cancel) => {
   return await service.format(documents.get(params.textDocument.uri), params, cancel) || null;
 });