fix error message with public class inside namespace

plantain-00 · plantain-00 · commit a0782d91ac4e · 2016-02-03T10:02:59.000+08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -16214,7 +16214,7 @@ namespace ts {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
                         else if (node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
-                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
+                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & NodeFlags.Abstract) {
                             if (modifier.kind === SyntaxKind.PrivateKeyword) {
@@ -16238,7 +16238,7 @@ namespace ts {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
                         else if (node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
-                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
+                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
                         else if (node.kind === SyntaxKind.Parameter) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -123,7 +123,7 @@
         "category": "Error",
         "code": 1043
     },
-    "'{0}' modifier cannot appear on a module element.": {
+    "'{0}' modifier cannot appear on a module or namespace element.": {
         "category": "Error",
         "code": 1044
     },
diff --git a/tests/baselines/reference/Protected1.errors.txt b/tests/baselines/reference/Protected1.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module element.
+tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module or namespace element.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts (1 errors) ====
     protected class C {
     ~~~~~~~~~
-!!! error TS1044: 'protected' modifier cannot appear on a module element.
+!!! error TS1044: 'protected' modifier cannot appear on a module or namespace element.
     }
diff --git a/tests/baselines/reference/Protected2.errors.txt b/tests/baselines/reference/Protected2.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module element.
+tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module or namespace element.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts (1 errors) ====
     protected module M {
     ~~~~~~~~~
-!!! error TS1044: 'protected' modifier cannot appear on a module element.
+!!! error TS1044: 'protected' modifier cannot appear on a module or namespace element.
     }
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/compiler/importDeclWithClassModifiers.ts(5,8): error TS1044: 'public' modifier cannot appear on a module element.
+tests/cases/compiler/importDeclWithClassModifiers.ts(5,8): error TS1044: 'public' modifier cannot appear on a module or namespace element.
 tests/cases/compiler/importDeclWithClassModifiers.ts(5,28): error TS2305: Module 'x' has no exported member 'c'.
-tests/cases/compiler/importDeclWithClassModifiers.ts(6,8): error TS1044: 'private' modifier cannot appear on a module element.
+tests/cases/compiler/importDeclWithClassModifiers.ts(6,8): error TS1044: 'private' modifier cannot appear on a module or namespace element.
 tests/cases/compiler/importDeclWithClassModifiers.ts(6,29): error TS2305: Module 'x' has no exported member 'c'.
-tests/cases/compiler/importDeclWithClassModifiers.ts(7,8): error TS1044: 'static' modifier cannot appear on a module element.
+tests/cases/compiler/importDeclWithClassModifiers.ts(7,8): error TS1044: 'static' modifier cannot appear on a module or namespace element.
 tests/cases/compiler/importDeclWithClassModifiers.ts(7,28): error TS2305: Module 'x' has no exported member 'c'.
 
 
@@ -13,17 +13,17 @@ tests/cases/compiler/importDeclWithClassModifiers.ts(7,28): error TS2305: Module
     }
     export public import a = x.c;
            ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
                                ~
 !!! error TS2305: Module 'x' has no exported member 'c'.
     export private import b = x.c;
            ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
                                 ~
 !!! error TS2305: Module 'x' has no exported member 'c'.
     export static import c = x.c;
            ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
                                ~
 !!! error TS2305: Module 'x' has no exported member 'c'.
     var b: a;
diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.errors.txt b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.errors.txt
@@ -1,24 +1,24 @@
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(4,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(6,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(12,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(13,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(15,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(19,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(25,5): error TS1044: 'public' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(29,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(31,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(37,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(38,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(40,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(44,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(50,5): error TS1044: 'private' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(55,5): error TS1044: 'static' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(57,5): error TS1044: 'static' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(63,5): error TS1044: 'static' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(64,5): error TS1044: 'static' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(66,5): error TS1044: 'static' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(70,5): error TS1044: 'static' modifier cannot appear on a module element.
-tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier cannot appear on a module element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(4,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(6,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(12,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(13,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(15,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(19,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(25,5): error TS1044: 'public' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(29,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(31,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(37,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(38,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(40,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(44,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(50,5): error TS1044: 'private' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(55,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(57,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(63,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(64,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(66,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(70,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
+tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier cannot appear on a module or namespace element.
 
 
 ==== tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts (21 errors) ====
@@ -27,118 +27,118 @@ tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOf
     module Y {
         public class A { s: string }
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
     
         public class BB<T> extends A {
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
             id: number;
         }
     }
     
     module Y2 {
         public class AA<T> { s: T }
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
         public interface I { id: number }
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
     
         public class B extends AA<string> implements I { id: number }
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
     }
     
     module Y3 {
         public module Module {
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
             class A { s: string }
         }
     }
     
     module Y4 {
         public enum Color { Blue, Red }
         ~~~~~~
-!!! error TS1044: 'public' modifier cannot appear on a module element.
+!!! error TS1044: 'public' modifier cannot appear on a module or namespace element.
     }
     
     module YY {
         private class A { s: string }
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
     
         private class BB<T> extends A {
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
             id: number;
         }
     }
     
     module YY2 {
         private class AA<T> { s: T }
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
         private interface I { id: number }
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
     
         private class B extends AA<string> implements I { id: number }
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
     }
     
     module YY3 {
         private module Module {
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
             class A { s: string }
         }
     }
     
     module YY4 {
         private enum Color { Blue, Red }
         ~~~~~~~
-!!! error TS1044: 'private' modifier cannot appear on a module element.
+!!! error TS1044: 'private' modifier cannot appear on a module or namespace element.
     }
     
     
     module YYY {
         static class A { s: string }
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
     
         static class BB<T> extends A {
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
             id: number;
         }
     }
     
     module YYY2 {
         static class AA<T> { s: T }
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
         static interface I { id: number }
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
     
         static class B extends AA<string> implements I { id: number }
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
     }
     
     module YYY3 {
         static module Module {
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
             class A { s: string }
         }
     }
     
     module YYY4 {
         static enum Color { Blue, Red }
         ~~~~~~
-!!! error TS1044: 'static' modifier cannot appear on a module element.
+!!! error TS1044: 'static' modifier cannot appear on a module or namespace element.
     }
     
diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.errors.txt b/tests/baselines/reference/invalidModuleWithVarStatements.errors.txt
diff --git a/tests/baselines/reference/parserInterfaceDeclaration3.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration3.errors.txt
diff --git a/tests/baselines/reference/parserInterfaceDeclaration4.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration4.errors.txt

Original file line number	Diff line number	Diff line change
`@@ -16214,7 +16214,7 @@ namespace ts {`
`16214`	`16214`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "async");`
`16215`	`16215`	`}`
`16216`	`16216`	`else if (node.parent.kind === SyntaxKind.ModuleBlock \|\| node.parent.kind === SyntaxKind.SourceFile) {`
`16217`		`- return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);`
	`16217`	`+ return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);`
`16218`	`16218`	`}`
`16219`	`16219`	`else if (flags & NodeFlags.Abstract) {`
`16220`	`16220`	`if (modifier.kind === SyntaxKind.PrivateKeyword) {`
`@@ -16238,7 +16238,7 @@ namespace ts {`
`16238`	`16238`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");`
`16239`	`16239`	`}`
`16240`	`16240`	`else if (node.parent.kind === SyntaxKind.ModuleBlock \|\| node.parent.kind === SyntaxKind.SourceFile) {`
`16241`		`- return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");`
	`16241`	`+ return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");`
`16242`	`16242`	`}`
`16243`	`16243`	`else if (node.kind === SyntaxKind.Parameter) {`
`16244`	`16244`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module element.`
	`1`	`+tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module or namespace element.`
`2`	`2`
`3`	`3`
`4`	`4`	`==== tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts (1 errors) ====`
`5`	`5`	`protected class C {`
`6`	`6`	`~~~~~~~~~`
`7`		`-!!! error TS1044: 'protected' modifier cannot appear on a module element.`
	`7`	`+!!! error TS1044: 'protected' modifier cannot appear on a module or namespace element.`
`8`	`8`	`}`