better diagnostic errors

souporserious · Oct 9, 2023 · ed80920 · ed80920
1 parent 2a8c83a
commit ed80920
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/mdxts/components/client/diagnostics.ts b/mdxts/components/client/diagnostics.ts
@@ -1,6 +1,6 @@
 import type { Diagnostic, DiagnosticMessageChain } from 'ts-morph'
 
-export function hasDiagnosticsForToken(
+export function getDiagnosticForToken(
   token: any,
   tokenIndex: number,
   lineIndex: number,
@@ -31,7 +31,7 @@ export function hasDiagnosticsForToken(
       (diagnosticEnd >= tokenStart && diagnosticEnd <= tokenEnd) ||
       (diagnosticStart <= tokenStart && diagnosticEnd >= tokenEnd)
     ) {
-      return true
+      return diagnostic
     }
   }
 

diff --git a/mdxts/components/client/highlighter.ts b/mdxts/components/client/highlighter.ts
@@ -1,6 +1,6 @@
 import { getHighlighter as shikiGetHighlighter } from 'shiki'
 import type { Diagnostic } from 'ts-morph'
-import { hasDiagnosticsForToken } from './diagnostics'
+import { getDiagnosticForToken } from './diagnostics'
 
 export type Theme = Parameters<typeof shikiGetHighlighter>[0]['theme']
 
@@ -51,15 +51,7 @@ export function processToken(token: Token, diagnostic?: Diagnostic): Tokens {
   const diagnosticStart = diagnostic?.getStart()
   const diagnosticEnd = diagnosticStart + diagnostic?.getLength()
 
-  if (token.start >= diagnosticStart && token.end <= diagnosticEnd) {
-    // If the whole token is an error
-    return [
-      {
-        ...token,
-        hasError: true,
-      },
-    ]
-  } else if (diagnosticStart > token.start && diagnosticEnd < token.end) {
+  if (diagnosticStart > token.start && diagnosticEnd < token.end) {
     // If only a part of the token is an error, split it
     return [
       {
@@ -81,6 +73,14 @@ export function processToken(token: Token, diagnostic?: Diagnostic): Tokens {
         hasError: false,
       },
     ]
+  } else if (token.start >= diagnosticStart && token.end <= diagnosticEnd) {
+    // If the whole token is an error
+    return [
+      {
+        ...token,
+        hasError: true,
+      },
+    ]
   } else {
     // No error in this token
     return [
@@ -124,7 +124,7 @@ export async function getHighlighter(options: any): Promise<Highlighter> {
         }
 
         if (diagnostics) {
-          const hasError = hasDiagnosticsForToken(
+          const diagnostic = getDiagnosticForToken(
             token,
             tokenIndex,
             lineIndex,
@@ -133,14 +133,8 @@ export async function getHighlighter(options: any): Promise<Highlighter> {
             code
           )
 
-          if (hasError) {
-            const diagnostic = diagnostics.find((diagnostic) => {
-              const diagnosticStart = diagnostic.getStart()
-              const diagnosticEnd = diagnosticStart + diagnostic.getLength()
-              return diagnosticStart <= tokenEnd && diagnosticEnd >= tokenStart
-            })
+          if (diagnostic) {
             const subTokens = processToken(processedToken, diagnostic)
-
             return subTokens
           }
         }