commit acb63cc62e7197aa6a659f89ea6ce79398e5b3fd
author TypeScript Team <noreply@google.com> Thu Apr 04 07:26:47 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 04 07:27:05 2019 -0700
tree 7119730264fb0f9a7514b4e39e6d34eb00520476
parent ad940da7349e824f69c3d40e66ec4f6060f5a9ef

Add a fix to the error reporting mechanism in Tsetse.

I forgot that Rules don't generate their own Failures... Now there's a way to get a Fix in, though it's still not consumed.

PiperOrigin-RevId: 241926568

internal/tsetse/checker.ts

diff --git a/internal/tsetse/checker.ts b/internal/tsetse/checker.ts
index 72fdbaa..9fba3b7 100644
--- a/internal/tsetse/checker.ts
+++ b/internal/tsetse/checker.ts
@@ -5,8 +5,8 @@
 
 
 import * as ts from 'typescript';
+import {Failure, Fix} from './failure';
 
-import {Failure} from './failure';
 
 /**
  * A Handler contains a handler function and its corresponding error code so
@@ -28,7 +28,7 @@
    */
   private nodeHandlersMap = new Map<ts.SyntaxKind, Handler[]>();
   private failures: Failure[] = [];
-  private currentSourceFile: ts.SourceFile | undefined;
+  private currentSourceFile: ts.SourceFile|undefined;
   // currentCode will be set before invoking any handler functions so the value
   // initialized here is never used.
   private currentCode = 0;
@@ -48,8 +48,8 @@
    * handlers, the source file AST will be traversed.
    */
   on<T extends ts.Node>(
-      nodeKind: T['kind'],
-      handlerFunction: (checker: Checker, node: T) => void, code: number) {
+      nodeKind: T['kind'], handlerFunction: (checker: Checker, node: T) => void,
+      code: number) {
     const newHandler: Handler = {handlerFunction, code};
     const registeredHandlers: Handler[]|undefined =
         this.nodeHandlersMap.get(nodeKind);
@@ -64,7 +64,8 @@
    * Add a failure with a span. addFailure() is currently private because
    * `addFailureAtNode` is preferred.
    */
-  private addFailure(start: number, end: number, failureText: string) {
+  private addFailure(
+      start: number, end: number, failureText: string, fix?: Fix) {
     if (!this.currentSourceFile) {
       throw new Error('Source file not defined');
     }
@@ -76,15 +77,15 @@
     }
 
     const failure = new Failure(
-        this.currentSourceFile, start, end, failureText, this.currentCode);
+        this.currentSourceFile, start, end, failureText, this.currentCode, fix);
     this.failures.push(failure);
   }
 
-  addFailureAtNode(node: ts.Node, failureText: string) {
+  addFailureAtNode(node: ts.Node, failureText: string, fix?: Fix) {
     // node.getStart() takes a sourceFile as argument whereas node.getEnd()
     // doesn't need it.
     this.addFailure(
-        node.getStart(this.currentSourceFile), node.getEnd(), failureText);
+        node.getStart(this.currentSourceFile), node.getEnd(), failureText, fix);
   }
 
   /**