Deprecate module syntax

src/compiler/checker.ts

@@ -347,7 +347,6 @@ import {
     getNamespaceDeclarationNode,
     getNewTargetContainer,
     getNonAugmentationDeclaration,
-    getNonModifierTokenPosOfNode,
     getNormalizedAbsolutePath,
     getObjectFlags,
     getOriginalNode,
@@ -48104,12 +48103,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             if (isIdentifier(node.name)) {
                 checkCollisionsForDeclarationName(node, node.name);
                 if (!(node.flags & (NodeFlags.Namespace | NodeFlags.GlobalAugmentation))) {
-                    const sourceFile = getSourceFileOfNode(node);
-                    const pos = getNonModifierTokenPosOfNode(node);
-                    const span = getSpanOfTokenAtPosition(sourceFile, pos);
-                    suggestionDiagnostics.add(
-                        createFileDiagnostic(sourceFile, span.start, span.length, Diagnostics.A_namespace_declaration_should_not_be_declared_using_the_module_keyword_Please_use_the_namespace_keyword_instead),
-                    );
+                    error(node.name, Diagnostics.A_namespace_declaration_should_not_be_declared_using_the_module_keyword_Please_use_the_namespace_keyword_instead);
                 }
             }
 

src/compiler/diagnosticMessages.json

@@ -1821,9 +1821,8 @@
         "code": 1539
     },
     "A 'namespace' declaration should not be declared using the 'module' keyword. Please use the 'namespace' keyword instead.": {
-        "category": "Suggestion",
-        "code": 1540,
-        "reportsDeprecated": true
+        "category": "Error",
+        "code": 1540
     },
     "Type-only import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.": {
         "category": "Error",

src/compiler/utilities.ts

@@ -1282,16 +1282,6 @@ export function getNonDecoratorTokenPosOfNode(node: Node, sourceFile?: SourceFil
     return skipTrivia((sourceFile || getSourceFileOfNode(node)).text, lastDecorator.end);
 }
 
-/** @internal */
-export function getNonModifierTokenPosOfNode(node: Node, sourceFile?: SourceFileLike): number {
-    const lastModifier = !nodeIsMissing(node) && canHaveModifiers(node) && node.modifiers ? last(node.modifiers) : undefined;
-    if (!lastModifier) {
-        return getTokenPosOfNode(node, sourceFile);
-    }
-
-    return skipTrivia((sourceFile || getSourceFileOfNode(node)).text, lastModifier.end);
-}
-
 /** @internal */
 export function getSourceTextOfNodeFromSourceFile(sourceFile: SourceFile, node: Node, includeTrivia = false): string {
     return getTextOfNodeFromSourceText(sourceFile.text, node, includeTrivia);

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.errors.txt

@@ -14,7 +14,7 @@ TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(26,26): error
         }
     }
 
-    module A{
+    namespace A{
         // expected error
         export class Point {
                      ~~~~~

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js

@@ -8,7 +8,7 @@ namespace A {
     }
 }
 
-module A{
+namespace A{
     // expected error
     export class Point {
         origin: number;

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.symbols

@@ -15,12 +15,12 @@ namespace A {
     }
 }
 
-module A{
+namespace A{
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 5, 1))
 
     // expected error
     export class Point {
->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 7, 9))
+>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 7, 12))
 
         origin: number;
 >origin : Symbol(Point.origin, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 9, 24))

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.types

@@ -19,7 +19,7 @@ namespace A {
     }
 }
 
-module A{
+namespace A{
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js

@@ -5,7 +5,7 @@ namespace A.B {
     export var x: number;
 }
 
-module A{ 
+namespace A{ 
     namespace B {
         export var x: string;
     }

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols

@@ -9,11 +9,11 @@ namespace A.B {
 >x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 1, 14))
 }
 
-module A{ 
+namespace A{ 
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 2, 1))
 
     namespace B {
->B : Symbol(B, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 4, 9))
+>B : Symbol(B, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 4, 12))
 
         export var x: string;
 >x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 6, 18))

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types

@@ -12,7 +12,7 @@ namespace A.B {
 >  : ^^^^^^
 }
 
-module A{ 
+namespace A{ 
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt

@@ -3,7 +3,7 @@ cannotInvokeNewOnErrorExpression.ts(5,22): error TS1011: An element access expre
 
 
 ==== cannotInvokeNewOnErrorExpression.ts (2 errors) ====
-    module M
+    namespace M
     {
         class ClassA {}
     }

tests/baselines/reference/cannotInvokeNewOnErrorExpression.js

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts] ////
 
 //// [cannotInvokeNewOnErrorExpression.ts]
-module M
+namespace M
 {
     class ClassA {}
 }

tests/baselines/reference/cannotInvokeNewOnErrorExpression.symbols

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts] ////
 
 === cannotInvokeNewOnErrorExpression.ts ===
-module M
+namespace M
 >M : Symbol(M, Decl(cannotInvokeNewOnErrorExpression.ts, 0, 0))
 {
     class ClassA {}

tests/baselines/reference/cannotInvokeNewOnErrorExpression.types

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts] ////
 
 === cannotInvokeNewOnErrorExpression.ts ===
-module M
+namespace M
 >M : typeof M
 >  : ^^^^^^^^
 {

tests/baselines/reference/circularModuleImports.errors.txt

@@ -2,7 +2,7 @@ circularModuleImports.ts(5,5): error TS2303: Circular definition of import alias
 
 
 ==== circularModuleImports.ts (1 errors) ====
-    module M
+    namespace M
 
     {
 

tests/baselines/reference/circularModuleImports.js

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/circularModuleImports.ts] ////
 
 //// [circularModuleImports.ts]
-module M
+namespace M
 
 {
 

tests/baselines/reference/circularModuleImports.symbols

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/circularModuleImports.ts] ////
 
 === circularModuleImports.ts ===
-module M
+namespace M
 >M : Symbol(M, Decl(circularModuleImports.ts, 0, 0))
 
 {

tests/baselines/reference/circularModuleImports.types

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/circularModuleImports.ts] ////
 
 === circularModuleImports.ts ===
-module M
+namespace M
 
 {
 

tests/baselines/reference/cloduleTest1.js

@@ -5,7 +5,7 @@
   interface $ {
       addClass(className: string): $;
   }
-  module $ {
+  namespace $ {
     export interface AjaxSettings {
     }
     export function ajax(options: AjaxSettings) { }

tests/baselines/reference/cloduleTest1.symbols

@@ -14,16 +14,16 @@
 >className : Symbol(className, Decl(cloduleTest1.ts, 2, 15))
 >$ : Symbol($, Decl(cloduleTest1.ts, 0, 0), Decl(cloduleTest1.ts, 0, 42), Decl(cloduleTest1.ts, 3, 3))
   }
-  module $ {
+  namespace $ {
 >$ : Symbol($, Decl(cloduleTest1.ts, 0, 0), Decl(cloduleTest1.ts, 0, 42), Decl(cloduleTest1.ts, 3, 3))
 
     export interface AjaxSettings {
->AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 12))
+>AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 15))
     }
     export function ajax(options: AjaxSettings) { }
 >ajax : Symbol(ajax, Decl(cloduleTest1.ts, 6, 5))
 >options : Symbol(options, Decl(cloduleTest1.ts, 7, 25))
->AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 12))
+>AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 15))
   }
   var it: $ = $('.foo').addClass('bar');
 >it : Symbol(it, Decl(cloduleTest1.ts, 9, 5))

tests/baselines/reference/cloduleTest1.types

@@ -14,7 +14,7 @@
 >className : string
 >          : ^^^^^^
   }
-  module $ {
+  namespace $ {
 >$ : typeof $
 >  : ^^^^^^^^
 

tests/baselines/reference/cloduleWithRecursiveReference.js

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/cloduleWithRecursiveReference.ts] ////
 
 //// [cloduleWithRecursiveReference.ts]
-module M
+namespace M
 {
   export class C {  }
   export namespace C {

tests/baselines/reference/cloduleWithRecursiveReference.symbols

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/cloduleWithRecursiveReference.ts] ////
 
 === cloduleWithRecursiveReference.ts ===
-module M
+namespace M
 >M : Symbol(M, Decl(cloduleWithRecursiveReference.ts, 0, 0))
 {
   export class C {  }

tests/baselines/reference/cloduleWithRecursiveReference.types

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/cloduleWithRecursiveReference.ts] ////
 
 === cloduleWithRecursiveReference.ts ===
-module M
+namespace M
 >M : typeof M
 >  : ^^^^^^^^
 {

tests/baselines/reference/declareDottedExtend.js

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/declareDottedExtend.ts] ////
 
 //// [declareDottedExtend.ts]
-declare module A.B
+declare namespace A.B
 {
     export class C{ }
 }

tests/baselines/reference/declareDottedExtend.symbols

@@ -1,9 +1,9 @@
 //// [tests/cases/compiler/declareDottedExtend.ts] ////
 
 === declareDottedExtend.ts ===
-declare module A.B
+declare namespace A.B
 >A : Symbol(A, Decl(declareDottedExtend.ts, 0, 0))
->B : Symbol(B, Decl(declareDottedExtend.ts, 0, 17))
+>B : Symbol(B, Decl(declareDottedExtend.ts, 0, 20))
 {
     export class C{ }
 >C : Symbol(C, Decl(declareDottedExtend.ts, 1, 1))
@@ -12,7 +12,7 @@ declare module A.B
 import ab = A.B;
 >ab : Symbol(ab, Decl(declareDottedExtend.ts, 3, 1))
 >A : Symbol(A, Decl(declareDottedExtend.ts, 0, 0))
->B : Symbol(ab, Decl(declareDottedExtend.ts, 0, 17))
+>B : Symbol(ab, Decl(declareDottedExtend.ts, 0, 20))
 
 class D extends ab.C{ }
 >D : Symbol(D, Decl(declareDottedExtend.ts, 5, 16))
@@ -23,8 +23,8 @@ class D extends ab.C{ }
 class E extends A.B.C{ }
 >E : Symbol(E, Decl(declareDottedExtend.ts, 7, 23))
 >A.B.C : Symbol(ab.C, Decl(declareDottedExtend.ts, 1, 1))
->A.B : Symbol(ab, Decl(declareDottedExtend.ts, 0, 17))
+>A.B : Symbol(ab, Decl(declareDottedExtend.ts, 0, 20))
 >A : Symbol(A, Decl(declareDottedExtend.ts, 0, 0))
->B : Symbol(ab, Decl(declareDottedExtend.ts, 0, 17))
+>B : Symbol(ab, Decl(declareDottedExtend.ts, 0, 20))
 >C : Symbol(ab.C, Decl(declareDottedExtend.ts, 1, 1))
 

tests/baselines/reference/declareDottedExtend.types

@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/declareDottedExtend.ts] ////
 
 === declareDottedExtend.ts ===
-declare module A.B
+declare namespace A.B
 >A : typeof A
 >  : ^^^^^^^^
 >B : typeof B

tests/baselines/reference/dottedModuleName2.js

@@ -22,7 +22,7 @@ var tmpOK = AA.B.x;
 var tmpError = A.B.x;
 
 
-module A.B.C
+namespace A.B.C
 
 {
 
@@ -32,7 +32,7 @@ module A.B.C
 
 
 
-module M
+namespace M
 
 {
 

tests/baselines/reference/dottedModuleName2.symbols

@@ -3,7 +3,7 @@
 === dottedModuleName2.ts ===
 namespace A.B {
 >A : Symbol(A, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21))
->B : Symbol(B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 9))
+>B : Symbol(B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12))
 
   export var x = 1;
 >x : Symbol(x, Decl(dottedModuleName2.ts, 2, 12))
@@ -34,16 +34,16 @@ var tmpOK = AA.B.x;
 var tmpError = A.B.x;
 >tmpError : Symbol(tmpError, Decl(dottedModuleName2.ts, 18, 3))
 >A.B.x : Symbol(A.B.x, Decl(dottedModuleName2.ts, 2, 12))
->A.B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 9))
+>A.B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12))
 >A : Symbol(A, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21))
->B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 9))
+>B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12))
 >x : Symbol(A.B.x, Decl(dottedModuleName2.ts, 2, 12))
 
 
-module A.B.C
+namespace A.B.C
 >A : Symbol(A, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21))
->B : Symbol(B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 9))
->C : Symbol(C, Decl(dottedModuleName2.ts, 21, 11))
+>B : Symbol(B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12))
+>C : Symbol(C, Decl(dottedModuleName2.ts, 21, 14))
 
 {
 
@@ -54,7 +54,7 @@ module A.B.C
 
 
 
-module M
+namespace M
 >M : Symbol(M, Decl(dottedModuleName2.ts, 27, 1))
 
 {
@@ -66,13 +66,13 @@ module M
     import X2 = A.B;
 >X2 : Symbol(X2, Decl(dottedModuleName2.ts, 35, 18))
 >A : Symbol(X1, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21))
->B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 9))
+>B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12))
 
     import X3 = A.B.C;
 >X3 : Symbol(X3, Decl(dottedModuleName2.ts, 37, 20))
 >A : Symbol(X1, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21))
->B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 9))
->C : Symbol(X2.C, Decl(dottedModuleName2.ts, 21, 11))
+>B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12))
+>C : Symbol(X2.C, Decl(dottedModuleName2.ts, 21, 14))
 
 }