Fix some edge cases

yoavbls · Sep 17, 2023 · 49449f3 · 49449f3
1 parent da3e1d4
commit 49449f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/format/formatDiagnosticMessage.ts b/src/format/formatDiagnosticMessage.ts
@@ -12,6 +12,9 @@ export const formatDiagnosticMessage = (
   format: (type: string) => string
 ) =>
   message
+    .replaceAll(/(?:\s)'"(.*?)(?<!\\)"'(?:\s|\:|.|$)/g, (_, p1: string) =>
+      formatTypeBlock("", `"${p1}"`, format)
+    )
     // format declare module snippet
     .replaceAll(
       /['“](declare module )['”](.*)['“];['”]/g,
@@ -66,7 +69,7 @@ export const formatDiagnosticMessage = (
     )
     // Format types
     .replaceAll(
-      /(type|type alias|interface|module|file|file name|method's|subtype of constraint) ['“](.*?)['“](?=[\s(.|,|:)]|$)/gi,
+      /(type|type alias|interface|module|file|file name|method's|subtype of constraint) ['“](.*?)['“](?=[\s(.|,)]|$)/gi,
       (_, p1: string, p2: string) => formatTypeBlock(p1, p2, format)
     )
     // Format reversed types
@@ -93,6 +96,6 @@ export const formatDiagnosticMessage = (
     )
     // Format regular code blocks
     .replaceAll(
-      /['“]((?:(?!:\s*}).)*?)['“] (?!\s*:)/g,
-      (_: string, p1: string) => `${unStyledCodeBlock(p1)} `
+      /(?<!.*?")(?:^|\s)['“]((?:(?!:\s*}).)*?)['“](?!\s*:)(?!.*?")/g,
+      (_: string, p1: string) => ` ${unStyledCodeBlock(p1)} `
     );
diff --git a/src/test/suite/errorMessageMocks.ts b/src/test/suite/errorMessageMocks.ts
@@ -81,3 +81,7 @@ Cannot find module 'events' or its corresponding type declarations.
 const ts1360Error = d`
 Property 'a' is missing in type '{ b: { name: string; icon: undefined; }; c: { name: string; icon: undefined; }; d: { name: string; icon: undefined; }; e: { name: string; icon: undefined; }; f: { ...; }; g: { ...; }; h:...' but required in type '{a: {name: string; icon: undefined}}'.
 `;
+
+const errorWithStringChars = d`
+Type 'null' is not assignable to type '"' 'Oh \"'no"'
+`;