Allow decorators in JavaScript files

billti · billti · commit f601e6dd760b · 2016-02-12T18:52:51.000-08:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2729,11 +2729,6 @@
         "category": "Error",
         "code": 8016
     },
-    "'decorators' can only be used in a .ts file.": {
-        "category": "Error",
-        "code": 8017
-    },
-
     "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": {
         "category": "Error",
         "code": 9002
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1168,9 +1168,6 @@ namespace ts {
                             let typeAssertionExpression = <TypeAssertion>node;
                             diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return true;
-                        case SyntaxKind.Decorator:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.decorators_can_only_be_used_in_a_ts_file));
-                            return true;
                     }
 
                     return forEachChild(node, walk);
diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt
diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.symbols b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/a.js ===
+@internal class C { }
+>C : Symbol(C, Decl(a.js, 0, 0))
+
diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.types b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/a.js ===
+@internal class C { }
+>internal : any
+>C : C
+
diff --git a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts
@@ -1,3 +1,4 @@
 // @allowJs: true
+// @noEmit: true
 // @filename: a.js
 @internal class C { }
diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics21.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics21.ts
@@ -4,12 +4,4 @@
 // @Filename: a.js
 //// @internal class C {}
 
-verify.getSemanticDiagnostics(`[
-  {
-    "message": "'decorators' can only be used in a .ts file.",
-    "start": 0,
-    "length": 9,
-    "category": "error",
-    "code": 8017
-  }
-]`);
+verify.getSemanticDiagnostics(`[]`);

Original file line number	Diff line number	Diff line change
`@@ -1168,9 +1168,6 @@ namespace ts {`
`1168`	`1168`	`let typeAssertionExpression = <TypeAssertion>node;`
`1169`	`1169`	`diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));`
`1170`	`1170`	`return true;`
`1171`		`- case SyntaxKind.Decorator:`
`1172`		`- diagnostics.push(createDiagnosticForNode(node, Diagnostics.decorators_can_only_be_used_in_a_ts_file));`
`1173`		`- return true;`
`1174`	`1171`	`}`
`1175`	`1172`
`1176`	`1173`	`return forEachChild(node, walk);`