Merge pull request microsoft#15229 from Microsoft/Fix15220

mhegazy · web-flow · commit e6ecfa46f0aa · 2017-04-18T14:39:54.000-07:00
Fix microsoft#15220: Check for file on diagnostics before getting line map
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -20487,7 +20487,7 @@ namespace ts {
                             errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
                         }
 
-                        error(derived.valueDeclaration.name, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
+                        error(derived.valueDeclaration.name || derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
                     }
                 }
             }
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -930,20 +930,22 @@ namespace ts {
          */
         function shouldReportDiagnostic(diagnostic: Diagnostic) {
             const { file, start } = diagnostic;
-            const lineStarts = getLineStarts(file);
-            let { line } = computeLineAndCharacterOfPosition(lineStarts, start);
-            while (line > 0) {
-                const previousLineText = file.text.slice(lineStarts[line - 1], lineStarts[line]);
-                const result = ignoreDiagnosticCommentRegEx.exec(previousLineText);
-                if (!result) {
-                    // non-empty line
-                    return true;
-                }
-                if (result[3]) {
-                    // @ts-ignore
-                    return false;
+            if (file) {
+                const lineStarts = getLineStarts(file);
+                let { line } = computeLineAndCharacterOfPosition(lineStarts, start);
+                while (line > 0) {
+                    const previousLineText = file.text.slice(lineStarts[line - 1], lineStarts[line]);
+                    const result = ignoreDiagnosticCommentRegEx.exec(previousLineText);
+                    if (!result) {
+                        // non-empty line
+                        return true;
+                    }
+                    if (result[3]) {
+                        // @ts-ignore
+                        return false;
+                    }
+                    line--;
                 }
-                line--;
             }
             return true;
         }
diff --git a/tests/baselines/reference/checkJsFiles_noErrorLocation.errors.txt b/tests/baselines/reference/checkJsFiles_noErrorLocation.errors.txt
@@ -0,0 +1,25 @@
+tests/cases/compiler/a.js(14,5): error TS2424: Class 'A' defines instance member function 'foo', but extended class 'B' defines it as instance member property.
+
+
+==== tests/cases/compiler/a.js (1 errors) ====
+    // @ts-check
+    class A {
+      constructor() {
+    
+      }
+      foo() {
+        return 4;
+      }
+    }
+    
+    class B extends A {
+      constructor() {
+        super();
+        this.foo = () => 3;
+        ~~~~~~~~~~~~~~~~~~
+!!! error TS2424: Class 'A' defines instance member function 'foo', but extended class 'B' defines it as instance member property.
+      }
+    }
+    
+    const i = new B();
+    i.foo();
diff --git a/tests/cases/compiler/checkJsFiles_noErrorLocation.ts b/tests/cases/compiler/checkJsFiles_noErrorLocation.ts
@@ -0,0 +1,24 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+
+// @fileName: a.js
+// @ts-check
+class A {
+  constructor() {
+
+  }
+  foo() {
+    return 4;
+  }
+}
+
+class B extends A {
+  constructor() {
+    super();
+    this.foo = () => 3;
+  }
+}
+
+const i = new B();
+i.foo();

Original file line number	Diff line number	Diff line change
`@@ -20487,7 +20487,7 @@ namespace ts {`
`20487`	`20487`	`errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;`
`20488`	`20488`	`}`
`20489`	`20489`
`20490`		`- error(derived.valueDeclaration.name, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));`
	`20490`	`+ error(derived.valueDeclaration.name \|\| derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));`
`20491`	`20491`	`}`
`20492`	`20492`	`}`
`20493`	`20493`	`}`