Merge pull request microsoft#3207 from Microsoft/declareModifierForInterface

yuit · yuit · commit dea8e3edadc7 · 2015-05-19T13:23:32.000-04:00
Declare modifier for interface
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -12361,9 +12361,6 @@ module ts {
             else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && flags & NodeFlags.Ambient) {
                 return grammarErrorOnNode(lastDeclare, Diagnostics.A_declare_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === SyntaxKind.InterfaceDeclaration && flags & NodeFlags.Ambient) {
-                return grammarErrorOnNode(lastDeclare, Diagnostics.A_declare_modifier_cannot_be_used_with_an_interface_declaration, "declare");
-            }
             else if (node.kind === SyntaxKind.Parameter && (flags & NodeFlags.AccessibilityModifier) && isBindingPattern((<ParameterDeclaration>node).name)) {
                 return grammarErrorOnNode(node, Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
diff --git a/tests/baselines/reference/declareModifierOnTypeAlias.js b/tests/baselines/reference/declareModifierOnTypeAlias.js
@@ -0,0 +1,6 @@
+//// [declareModifierOnTypeAlias.ts]
+declare type Foo = string;
+type Bar = number;
+declare type Baz = Bar;
+
+//// [declareModifierOnTypeAlias.js]
diff --git a/tests/baselines/reference/declareModifierOnTypeAlias.symbols b/tests/baselines/reference/declareModifierOnTypeAlias.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/declareModifierOnTypeAlias.ts ===
+declare type Foo = string;
+>Foo : Symbol(Foo, Decl(declareModifierOnTypeAlias.ts, 0, 0))
+
+type Bar = number;
+>Bar : Symbol(Bar, Decl(declareModifierOnTypeAlias.ts, 0, 26))
+
+declare type Baz = Bar;
+>Baz : Symbol(Baz, Decl(declareModifierOnTypeAlias.ts, 1, 18))
+>Bar : Symbol(Bar, Decl(declareModifierOnTypeAlias.ts, 0, 26))
+
diff --git a/tests/baselines/reference/declareModifierOnTypeAlias.types b/tests/baselines/reference/declareModifierOnTypeAlias.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/declareModifierOnTypeAlias.ts ===
+declare type Foo = string;
+>Foo : string
+
+type Bar = number;
+>Bar : number
+
+declare type Baz = Bar;
+>Baz : number
+>Bar : number
+
diff --git a/tests/baselines/reference/parserInterfaceDeclaration5.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration5.errors.txt
diff --git a/tests/baselines/reference/parserInterfaceDeclaration5.symbols b/tests/baselines/reference/parserInterfaceDeclaration5.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5.ts ===
+declare interface I {
+>I : Symbol(I, Decl(parserInterfaceDeclaration5.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/parserInterfaceDeclaration5.types b/tests/baselines/reference/parserInterfaceDeclaration5.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5.ts ===
+declare interface I {
+>I : I
+}
diff --git a/tests/cases/compiler/declareModifierOnTypeAlias.ts b/tests/cases/compiler/declareModifierOnTypeAlias.ts
@@ -0,0 +1,3 @@
+﻿declare type Foo = string;
+type Bar = number;
+declare type Baz = Bar;

Original file line number	Diff line number	Diff line change
`@@ -12361,9 +12361,6 @@ module ts {`
`12361`	`12361`	`else if ((node.kind === SyntaxKind.ImportDeclaration \|\| node.kind === SyntaxKind.ImportEqualsDeclaration) && flags & NodeFlags.Ambient) {`
`12362`	`12362`	`return grammarErrorOnNode(lastDeclare, Diagnostics.A_declare_modifier_cannot_be_used_with_an_import_declaration, "declare");`
`12363`	`12363`	`}`
`12364`		`- else if (node.kind === SyntaxKind.InterfaceDeclaration && flags & NodeFlags.Ambient) {`
`12365`		`- return grammarErrorOnNode(lastDeclare, Diagnostics.A_declare_modifier_cannot_be_used_with_an_interface_declaration, "declare");`
`12366`		`- }`
`12367`	`12364`	`else if (node.kind === SyntaxKind.Parameter && (flags & NodeFlags.AccessibilityModifier) && isBindingPattern((<ParameterDeclaration>node).name)) {`
`12368`	`12365`	`return grammarErrorOnNode(node, Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);`
`12369`	`12366`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5.ts ===
 +declare interface I {
 +>I : I
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+declare type Foo = string;`
	`2`	`+type Bar = number;`
	`3`	`+declare type Baz = Bar;`