@marko/language-server 1.0.0 → 1.0.1

package/dist/index.mjs

@@ -1267,6 +1267,7 @@ import {
 import { URI as URI6 } from "vscode-uri";
 import * as prettier2 from "prettier";
 import {
+  NodeType as NodeType9,
   ScriptLang as ScriptLang3,
   extractScript as extractScript2
 } from "@marko/language-tools";
@@ -1470,6 +1471,7 @@ function patch(ts2, scriptLang, cache, host) {
 var IGNORE_DIAG_REG = /^(?:Expression|Identifier|['"][^\w]['"]) expected.$/;
 var extractCache = /* @__PURE__ */ new Map();
 var snapshotCache = /* @__PURE__ */ new Map();
+var insertModuleStatementLocCache = /* @__PURE__ */ new WeakMap();
 var markoFileReg = /\.marko$/;
 var tsTriggerChars = /* @__PURE__ */ new Set([".", '"', "'", "`", "/", "@", "<", "#", " "]);
 var optionalModifierReg = /\boptional\b/;
@@ -1650,18 +1652,29 @@ var ScriptService = {
       for (const change of action.changes) {
         if (change.fileName !== fileName)
           continue;
-        for (const { span, newText } of change.textChanges) {
-          const sourceRange = /^\s*(?:import|export) /.test(newText) ? (
-            // Ensure import inserts are always in the program root.
-            // TODO: this could probably be updated to more closely reflect
-            // where typescript wants to put the import/export.
-            START_LOCATION
-          ) : sourceLocationAtTextSpan(extracted, span);
-          if (sourceRange) {
-            textEdits.push({
-              newText,
-              range: sourceRange
-            });
+        for (const { span, newText: rawText } of change.textChanges) {
+          let range;
+          let newText = rawText;
+          if (span.length === 0 && /^\s*(?:import|export) /.test(newText)) {
+            const cached = insertModuleStatementLocCache.get(extracted);
+            newText = newText.replace(/\n\s*$/, "\n");
+            if (cached) {
+              range = cached;
+            } else {
+              const { parsed } = getMarkoFile(doc);
+              const offset = getInsertModuleStatementOffset(parsed);
+              const start = parsed.positionAt(offset);
+              range = {
+                start,
+                end: start
+              };
+              insertModuleStatementLocCache.set(extracted, range);
+            }
+          } else {
+            range = sourceLocationAtTextSpan(extracted, span);
+          }
+          if (range) {
+            textEdits.push({ newText, range });
           }
         }
       }
@@ -1867,6 +1880,42 @@ function processScript(doc, tsProject) {
     });
   });
 }
+function getInsertModuleStatementOffset(parsed) {
+  const { program } = parsed;
+  let firstNode;
+  if (program.static.length) {
+    let lastImport;
+    for (const node of program.static) {
+      switch (node.type) {
+        case NodeType9.Export:
+          return node.start;
+        case NodeType9.Import:
+          lastImport = node;
+          break;
+      }
+    }
+    if (lastImport) {
+      return lastImport.end + 1;
+    }
+    firstNode = program.static[0];
+  }
+  if (program.body.length) {
+    if (!firstNode || firstNode.start > program.body[0].start) {
+      firstNode = program.body[0];
+    }
+  }
+  if (firstNode) {
+    return getOffsetAfterComments(firstNode);
+  }
+  return 0;
+}
+function getOffsetAfterComments(node) {
+  const { comments } = node;
+  if (comments) {
+    return comments.at(-1).end + 1;
+  }
+  return Math.max(0, node.start - 1);
+}
 function sourceLocationAtTextSpan(extracted, { start, length }) {
   if (start === 0 && length === 0)
     return START_LOCATION;