Update tsserver-plugin and cli for new rewriteDiagnostic signature

Author: dfreeman

packages/cli/src/transform-manager.ts

@@ -19,13 +19,14 @@ export default class TransformManager {
   }
 
   public formatDiagnostic(diagnostic: ts.Diagnostic): string {
-    let file = diagnostic.file;
-    let transformedModule = file && this.transformedModules.get(file.fileName);
-    if (diagnostic.code && file && transformedModule) {
-      diagnostic = rewriteDiagnostic(this.ts, diagnostic, transformedModule);
-    }
+    let transformedDiagnostic = rewriteDiagnostic(this.ts, diagnostic, (fileName) =>
+      this.transformedModules.get(fileName)
+    );
 
-    return this.ts.formatDiagnosticsWithColorAndContext([diagnostic], this.formatDiagnosticHost);
+    return this.ts.formatDiagnosticsWithColorAndContext(
+      [transformedDiagnostic],
+      this.formatDiagnosticHost
+    );
   }
 
   public readFile(filename: string, encoding?: string): string | undefined {

packages/tsserver-plugin/src/language-service.ts

@@ -45,6 +45,15 @@ export default class GlintLanguageService implements Partial<ts.LanguageService>
     }
   }
 
+  private getTransformInfoForPath(path: string): TransformInfo | undefined {
+    let originalPath = isTransformablePath(path) ? path : getOriginalPath(path as TransformedPath);
+    let transformedPath = isTransformedPath(path)
+      ? path
+      : getTransformedPath(path as TransformablePath);
+
+    return this.getTransformInfo(originalPath, transformedPath);
+  }
+
   private getTransformInfo(
     originalPath: TransformablePath,
     transformedPath: TransformedPath
@@ -80,7 +89,7 @@ export default class GlintLanguageService implements Partial<ts.LanguageService>
     if (info) {
       return this.ls
         .getSemanticDiagnostics(info.transformedPath)
-        .map((diagnostic) => rewriteDiagnostic(this.ts, diagnostic, info.transformedModule));
+        .map((diagnostic) => this.rewriteDiagnostic(diagnostic));
     }
 
     return this.ls.getSemanticDiagnostics(fileName);
@@ -91,12 +100,20 @@ export default class GlintLanguageService implements Partial<ts.LanguageService>
     if (info) {
       return this.ls
         .getSuggestionDiagnostics(info.transformedPath)
-        .map((diagnostic) => rewriteDiagnostic(this.ts, diagnostic, info.transformedModule));
+        .map((diagnostic) => this.rewriteDiagnostic(diagnostic));
     }
 
     return this.ls.getSuggestionDiagnostics(fileName);
   }
 
+  private rewriteDiagnostic<T extends ts.Diagnostic>(diagnostic: T): T {
+    return rewriteDiagnostic(
+      this.ts,
+      diagnostic,
+      (fileName) => this.getTransformInfoForPath(fileName)?.transformedModule
+    );
+  }
+
   public getEncodedSyntacticClassifications(
     fileName: string,
     span: ts.TextSpan