Fix for #2561

microsoft · Apr 2, 2015 · f15ff32 · f15ff32
1 parent d9078e9
commit f15ff32
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 30 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11857,15 +11857,15 @@ module ts {
                 return false;
             }
             if (!nodeCanBeDecorated(node)) {
-                return grammarErrorOnNode(node, Diagnostics.Decorators_are_not_valid_here);
+                return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_not_valid_here);
             }
             else if (languageVersion < ScriptTarget.ES5) {
-                return grammarErrorOnNode(node, Diagnostics.Decorators_are_only_available_when_targeting_ECMAScript_5_and_higher);
+                return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_only_available_when_targeting_ECMAScript_5_and_higher);
             }
             else if (node.kind === SyntaxKind.GetAccessor || node.kind === SyntaxKind.SetAccessor) {
                 let accessors = getAllAccessorDeclarations((<ClassDeclaration>node.parent).members, <AccessorDeclaration>node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
-                    return grammarErrorOnNode(node, Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
+                    return grammarErrorOnFirstToken(node, Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
                 }
             }
             return false;

diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt b/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt
@@ -6,6 +6,6 @@ tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor
 
     class C {
         @dec constructor() {}
-        ~~~~~~~~~~~~~~~~~~~~~
+        ~
 !!! error TS1206: Decorators are not valid here.
     }
diff --git a/tests/baselines/reference/decoratorOnEnum.errors.txt b/tests/baselines/reference/decoratorOnEnum.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts(4,6): error TS1206: Decorators are not valid here.
+tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts(3,1): error TS1206: Decorators are not valid here.
 
 
 ==== tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts (1 errors) ====
     declare function dec<T>(target: T): T;
 
     @dec
-    enum E {
-         ~
+    ~
 !!! error TS1206: Decorators are not valid here.
+    enum E {
     }
diff --git a/tests/baselines/reference/decoratorOnFunctionDeclaration.errors.txt b/tests/baselines/reference/decoratorOnFunctionDeclaration.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts(4,10): error TS1206: Decorators are not valid here.
+tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts(3,1): error TS1206: Decorators are not valid here.
 
 
 ==== tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts (1 errors) ====
     declare function dec<T>(target: T): T;
 
     @dec
-    function F() {
-             ~
+    ~
 !!! error TS1206: Decorators are not valid here.
+    function F() {
     }
diff --git a/tests/baselines/reference/decoratorOnImportEquals1.errors.txt b/tests/baselines/reference/decoratorOnImportEquals1.errors.txt
@@ -10,8 +10,7 @@ tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts(8,5): err
 
     module M2 {
         @dec
-        ~~~~
-        import X = M1.X;
-    ~~~~~~~~~~~~~~~~~~~~
+        ~
 !!! error TS1206: Decorators are not valid here.
+        import X = M1.X;
     }
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.errors.txt b/tests/baselines/reference/decoratorOnImportEquals2.errors.txt
@@ -3,10 +3,9 @@ tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_1.ts(1,1): e
 
 ==== tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_1.ts (1 errors) ====
     @dec
-    ~~~~
-    import lib = require('./decoratorOnImportEquals2_0');
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 !!! error TS1206: Decorators are not valid here.
+    import lib = require('./decoratorOnImportEquals2_0');
 
     declare function dec<T>(target: T): T;
 ==== tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_0.ts (0 errors) ====

diff --git a/tests/baselines/reference/decoratorOnInterface.errors.txt b/tests/baselines/reference/decoratorOnInterface.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts(4,11): error TS1206: Decorators are not valid here.
+tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts(3,1): error TS1206: Decorators are not valid here.
 
 
 ==== tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts (1 errors) ====
     declare function dec<T>(target: T): T;
 
     @dec
-    interface I {
-              ~
+    ~
 !!! error TS1206: Decorators are not valid here.
+    interface I {
     }
diff --git a/tests/baselines/reference/decoratorOnInternalModule.errors.txt b/tests/baselines/reference/decoratorOnInternalModule.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts(4,8): error TS1206: Decorators are not valid here.
+tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts(3,1): error TS1206: Decorators are not valid here.
 
 
 ==== tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts (1 errors) ====
     declare function dec<T>(target: T): T;
 
     @dec
-    module M {
-           ~
+    ~
 !!! error TS1206: Decorators are not valid here.
+    module M {
 
     }
diff --git a/tests/baselines/reference/decoratorOnTypeAlias.errors.txt b/tests/baselines/reference/decoratorOnTypeAlias.errors.txt
@@ -5,7 +5,6 @@ tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts(3,1): error T
     declare function dec<T>(target: T): T;
 
     @dec
-    ~~~~
-    type T = number;
-    ~~~~~~~~~~~~~~~~
-!!! error TS1206: Decorators are not valid here.
+    ~
+!!! error TS1206: Decorators are not valid here.
+    type T = number;
diff --git a/tests/baselines/reference/decoratorOnVar.errors.txt b/tests/baselines/reference/decoratorOnVar.errors.txt
@@ -5,7 +5,6 @@ tests/cases/conformance/decorators/invalid/decoratorOnVar.ts(3,1): error TS1206:
     declare function dec<T>(target: T): T;
 
     @dec
-    ~~~~
-    var x: number;
-    ~~~~~~~~~~~~~~
-!!! error TS1206: Decorators are not valid here.
+    ~
+!!! error TS1206: Decorators are not valid here.
+    var x: number;