Fix error spans for classes.

CyrusNajmabadi · CyrusNajmabadi · commit 2eddf310dc37 · 2015-04-02T13:33:55.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -9757,12 +9757,11 @@ module ts {
         function checkClassDeclaration(node: ClassDeclaration) {
             // Grammar checking
             if (node.parent.kind !== SyntaxKind.ModuleBlock && node.parent.kind !== SyntaxKind.SourceFile) {
-                grammarErrorOnFirstToken(node, Diagnostics.class_declarations_are_only_supported_directly_inside_a_module_or_as_a_top_level_declaration);
+                grammarErrorOnNode(node, Diagnostics.class_declarations_are_only_supported_directly_inside_a_module_or_as_a_top_level_declaration);
             }
 
-            // node.flags & NodeFlags.Default || kind === SyntaxKind.ClassExpression
             if (!node.name && !(node.flags & NodeFlags.Default)) {
-                grammarErrorOnNode(node, Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
+                grammarErrorOnFirstToken(node, Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
 
             checkGrammarClassDeclarationHeritageClauses(node);
diff --git a/tests/baselines/reference/classDeclarationBlockScoping1.errors.txt b/tests/baselines/reference/classDeclarationBlockScoping1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/classDeclarationBlockScoping1.ts(5,5): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+tests/cases/compiler/classDeclarationBlockScoping1.ts(5,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
 
 
 ==== tests/cases/compiler/classDeclarationBlockScoping1.ts (1 errors) ====
@@ -7,7 +7,7 @@ tests/cases/compiler/classDeclarationBlockScoping1.ts(5,5): error TS9004: 'class
     
     {
         class C {
-        ~~~~~
+              ~
 !!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
         }
     }
diff --git a/tests/baselines/reference/classDeclarationBlockScoping2.errors.txt b/tests/baselines/reference/classDeclarationBlockScoping2.errors.txt
@@ -1,16 +1,16 @@
-tests/cases/compiler/classDeclarationBlockScoping2.ts(2,5): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
-tests/cases/compiler/classDeclarationBlockScoping2.ts(5,9): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+tests/cases/compiler/classDeclarationBlockScoping2.ts(2,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+tests/cases/compiler/classDeclarationBlockScoping2.ts(5,15): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
 
 
 ==== tests/cases/compiler/classDeclarationBlockScoping2.ts (2 errors) ====
     function f() {
         class C {}
-        ~~~~~
+              ~
 !!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
         var c1 = C;
         {
             class C {}
-            ~~~~~
+                  ~
 !!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
             var c2 = C;
         }
diff --git a/tests/baselines/reference/classExpressionTest1.errors.txt b/tests/baselines/reference/classExpressionTest1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/classExpressionTest1.ts(2,5): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+tests/cases/compiler/classExpressionTest1.ts(2,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
 
 
 ==== tests/cases/compiler/classExpressionTest1.ts (1 errors) ====
     function M() {
         class C<X> {
-        ~~~~~
+              ~
 !!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
             f<T>() {
                 var t: T;
diff --git a/tests/baselines/reference/classInsideBlock.errors.txt b/tests/baselines/reference/classInsideBlock.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts(2,5): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
+tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts(2,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
 
 
 ==== tests/cases/conformance/classes/classDeclarations/classInsideBlock.ts (1 errors) ====
     function foo() {
         class C { }
-        ~~~~~
+              ~
 !!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.
     }

Original file line number	Diff line number	Diff line change
`@@ -9757,12 +9757,11 @@ module ts {`
`9757`	`9757`	`function checkClassDeclaration(node: ClassDeclaration) {`
`9758`	`9758`	`// Grammar checking`
`9759`	`9759`	`if (node.parent.kind !== SyntaxKind.ModuleBlock && node.parent.kind !== SyntaxKind.SourceFile) {`
`9760`		`- grammarErrorOnFirstToken(node, Diagnostics.class_declarations_are_only_supported_directly_inside_a_module_or_as_a_top_level_declaration);`
	`9760`	`+ grammarErrorOnNode(node, Diagnostics.class_declarations_are_only_supported_directly_inside_a_module_or_as_a_top_level_declaration);`
`9761`	`9761`	`}`
`9762`	`9762`
`9763`		`- // node.flags & NodeFlags.Default \|\| kind === SyntaxKind.ClassExpression`
`9764`	`9763`	`if (!node.name && !(node.flags & NodeFlags.Default)) {`
`9765`		`- grammarErrorOnNode(node, Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);`
	`9764`	`+ grammarErrorOnFirstToken(node, Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);`
`9766`	`9765`	`}`
`9767`	`9766`
`9768`	`9767`	`checkGrammarClassDeclarationHeritageClauses(node);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-tests/cases/compiler/classDeclarationBlockScoping1.ts(5,5): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.`
	`1`	`+tests/cases/compiler/classDeclarationBlockScoping1.ts(5,11): error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.`
`2`	`2`
`3`	`3`
`4`	`4`	`==== tests/cases/compiler/classDeclarationBlockScoping1.ts (1 errors) ====`
`@@ -7,7 +7,7 @@ tests/cases/compiler/classDeclarationBlockScoping1.ts(5,5): error TS9004: 'class`
`7`	`7`
`8`	`8`	`{`
`9`	`9`	`class C {`
`10`		`- ~~~~~`
	`10`	`+ ~`
`11`	`11`	`!!! error TS9004: 'class' declarations are only supported directly inside a module or as a top level declaration.`
`12`	`12`	`}`
`13`	`13`	`}`