@marko/language-server 1.0.14 → 1.0.15

package/dist/index.js

@@ -771,26 +771,56 @@ var doValidate = (doc) => {
         }
       }
     );
-  } catch (e) {
-    let match;
-    while (match = markoErrorRegExp.exec(e.message)) {
-      const [, , rawLine, rawCol, message] = match;
-      const pos = {
-        line: (parseInt(rawLine, 10) || 1) - 1,
-        character: (parseInt(rawCol, 10) || 1) - 1
-      };
+  } catch (err) {
+    if (isErrorWithLoc(err)) {
+      const message = err.label || err.message || err.stack;
+      if (!message)
+        return;
+      const { loc } = err;
       diagnostics.push({
-        range: { start: pos, end: pos },
+        range: {
+          start: {
+            line: loc.start.line - 1,
+            character: loc.start.column
+          },
+          end: {
+            line: loc.end.line - 1,
+            character: loc.end.column
+          }
+        },
         source: "marko",
         code: void 0,
         tags: void 0,
         severity: import_vscode_languageserver7.DiagnosticSeverity.Error,
         message
       });
+    } else {
+      let match;
+      while (match = markoErrorRegExp.exec(err.message)) {
+        const [, , rawLine, rawCol, message] = match;
+        const pos = {
+          line: (parseInt(rawLine, 10) || 1) - 1,
+          character: (parseInt(rawCol, 10) || 1) - 1
+        };
+        diagnostics.push({
+          range: { start: pos, end: pos },
+          source: "marko",
+          code: void 0,
+          tags: void 0,
+          severity: import_vscode_languageserver7.DiagnosticSeverity.Error,
+          message
+        });
+      }
     }
   }
   return diagnostics;
 };
+function isErrorWithLoc(err) {
+  const loc = err == null ? void 0 : err.loc;
+  if (typeof loc !== "object")
+    return false;
+  return loc !== null && typeof loc === "object" && typeof loc.start === "object" && typeof loc.end === "object" && typeof loc.start.line === "number" && typeof loc.start.column === "number" && typeof loc.end.line === "number" && typeof loc.end.column === "number";
+}
 
 // src/service/marko/hover/index.ts
 var import_language_tools7 = require("@marko/language-tools");