Deprecate module syntax (#62876)

Author: RyanCavanaugh

src/compiler/checker.ts

@@ -347,7 +347,6 @@ import {
     getNamespaceDeclarationNode,
     getNewTargetContainer,
     getNonAugmentationDeclaration,
-    getNonModifierTokenPosOfNode,
     getNormalizedAbsolutePath,
     getObjectFlags,
     getOriginalNode,
@@ -48121,12 +48120,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
 >  : ^^^^^^^^