Skip to content

Commit 492692e

Browse files
CopilotRyanCavanaugh
Copilot
and
RyanCavanaugh
committed
Fix code style and update test files to use namespace instead of module
Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
1 parent 8387013 commit 492692e

File tree

39 files changed

+100
-112
lines changed

39 files changed

+100
-112
lines changed

‎src/compiler/checker.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48002,25 +48002,25 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
4800248002
// Check if ignoreDeprecations should suppress this error
4800348003
const shouldSuppress = compilerOptions.ignoreDeprecations === "6.0";
4800448004

48005-
if (!shouldSuppress) {
48006-
// Generate error for module keyword usage in namespace declarations
48007-
const errorDiagnostic = createFileDiagnostic(
48005+
if (shouldSuppress) {
48006+
// When suppressed by ignoreDeprecations, keep as suggestion
48007+
const suggestionDiagnostic = createFileDiagnostic(
4800848008
sourceFile,
4800948009
span.start,
4801048010
span.length,
48011-
Diagnostics.The_module_keyword_is_not_allowed_for_namespace_declarations_Use_the_namespace_keyword_instead,
48011+
Diagnostics.A_namespace_declaration_should_not_be_declared_using_the_module_keyword_Please_use_the_namespace_keyword_instead,
4801248012
);
48013-
diagnostics.add(errorDiagnostic);
48013+
suggestionDiagnostics.add(suggestionDiagnostic);
4801448014
}
4801548015
else {
48016-
// When suppressed by ignoreDeprecations, keep as suggestion
48017-
const suggestionDiagnostic = createFileDiagnostic(
48016+
// Generate error for module keyword usage in namespace declarations
48017+
const errorDiagnostic = createFileDiagnostic(
4801848018
sourceFile,
4801948019
span.start,
4802048020
span.length,
48021-
Diagnostics.A_namespace_declaration_should_not_be_declared_using_the_module_keyword_Please_use_the_namespace_keyword_instead,
48021+
Diagnostics.The_module_keyword_is_not_allowed_for_namespace_declarations_Use_the_namespace_keyword_instead,
4802248022
);
48023-
suggestionDiagnostics.add(suggestionDiagnostic);
48023+
diagnostics.add(errorDiagnostic);
4802448024
}
4802548025
}
4802648026
}

‎tests/baselines/reference/clodulesDerivedClasses.errors.txt‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
clodulesDerivedClasses.ts(5,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
2-
clodulesDerivedClasses.ts(5,14): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
31
clodulesDerivedClasses.ts(9,7): error TS2417: Class static side 'typeof Path' incorrectly extends base class static side 'typeof Shape'.
42
Types of property 'Utils' are incompatible.
53
Property 'convert' is missing in type 'typeof Path.Utils' but required in type 'typeof Shape.Utils'.
6-
clodulesDerivedClasses.ts(14,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
7-
clodulesDerivedClasses.ts(14,13): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
84

95

10-
==== clodulesDerivedClasses.ts (5 errors) ====
6+
==== clodulesDerivedClasses.ts (1 errors) ====
117
class Shape {
128
id: number;
139
}
1410

15-
module Shape.Utils {
16-
~~~~~~
17-
!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
18-
~~~~~
19-
!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
11+
namespace Shape.Utils {
2012
export function convert(): Shape { return null;}
2113
}
2214

@@ -30,11 +22,7 @@ clodulesDerivedClasses.ts(14,13): error TS1547: The 'module' keyword is not allo
3022

3123
}
3224

33-
module Path.Utils {
34-
~~~~~~
35-
!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
36-
~~~~~
37-
!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.
25+
namespace Path.Utils {
3826
export function convert2(): Path {
3927
return null;
4028
}

‎tests/baselines/reference/clodulesDerivedClasses.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Shape {
55
id: number;
66
}
77

8-
module Shape.Utils {
8+
namespace Shape.Utils {
99
export function convert(): Shape { return null;}
1010
}
1111

@@ -14,7 +14,7 @@ class Path extends Shape {
1414

1515
}
1616

17-
module Path.Utils {
17+
namespace Path.Utils {
1818
export function convert2(): Path {
1919
return null;
2020
}

‎tests/baselines/reference/clodulesDerivedClasses.symbols‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class Shape {
88
>id : Symbol(Shape.id, Decl(clodulesDerivedClasses.ts, 0, 13))
99
}
1010

11-
module Shape.Utils {
11+
namespace Shape.Utils {
1212
>Shape : Symbol(Shape, Decl(clodulesDerivedClasses.ts, 0, 0), Decl(clodulesDerivedClasses.ts, 2, 1))
13-
>Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 4, 13))
13+
>Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 4, 16))
1414

1515
export function convert(): Shape { return null;}
16-
>convert : Symbol(convert, Decl(clodulesDerivedClasses.ts, 4, 20))
16+
>convert : Symbol(convert, Decl(clodulesDerivedClasses.ts, 4, 23))
1717
>Shape : Symbol(Shape, Decl(clodulesDerivedClasses.ts, 0, 0), Decl(clodulesDerivedClasses.ts, 2, 1))
1818
}
1919

@@ -26,12 +26,12 @@ class Path extends Shape {
2626

2727
}
2828

29-
module Path.Utils {
29+
namespace Path.Utils {
3030
>Path : Symbol(Path, Decl(clodulesDerivedClasses.ts, 6, 1), Decl(clodulesDerivedClasses.ts, 11, 1))
31-
>Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 13, 12))
31+
>Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 13, 15))
3232

3333
export function convert2(): Path {
34-
>convert2 : Symbol(convert2, Decl(clodulesDerivedClasses.ts, 13, 19))
34+
>convert2 : Symbol(convert2, Decl(clodulesDerivedClasses.ts, 13, 22))
3535
>Path : Symbol(Path, Decl(clodulesDerivedClasses.ts, 6, 1), Decl(clodulesDerivedClasses.ts, 11, 1))
3636

3737
return null;

‎tests/baselines/reference/clodulesDerivedClasses.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Shape {
1010
> : ^^^^^^
1111
}
1212

13-
module Shape.Utils {
13+
namespace Shape.Utils {
1414
>Shape : typeof Shape
1515
> : ^^^^^^^^^^^^
1616
>Utils : typeof Utils
@@ -33,7 +33,7 @@ class Path extends Shape {
3333

3434
}
3535

36-
module Path.Utils {
36+
namespace Path.Utils {
3737
>Path : typeof Path
3838
> : ^^^^^^^^^^^
3939
>Utils : typeof Utils

‎tests/baselines/reference/declarationEmitNameConflicts3.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
//// [tests/cases/compiler/declarationEmitNameConflicts3.ts] ////
22

33
//// [declarationEmitNameConflicts3.ts]
4-
module M {
4+
namespace M {
55
export interface D { }
6-
export module D {
6+
export namespace D {
77
export function f() { }
88
}
9-
export module C {
9+
export namespace C {
1010
export function f() { }
1111
}
12-
export module E {
12+
export namespace E {
1313
export function f() { }
1414
}
1515
}
1616

17-
module M.P {
17+
namespace M.P {
1818
export class C {
1919
static f() { }
2020
}

‎tests/baselines/reference/declarationEmitNameConflicts3.symbols‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
//// [tests/cases/compiler/declarationEmitNameConflicts3.ts] ////
22

33
=== declarationEmitNameConflicts3.ts ===
4-
module M {
4+
namespace M {
55
>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1))
66

77
export interface D { }
8-
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26))
8+
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26))
99

10-
export module D {
11-
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26))
10+
export namespace D {
11+
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26))
1212

1313
export function f() { }
14-
>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 2, 21))
14+
>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 2, 24))
1515
}
16-
export module C {
16+
export namespace C {
1717
>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5))
1818

1919
export function f() { }
20-
>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 5, 21))
20+
>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 5, 24))
2121
}
22-
export module E {
22+
export namespace E {
2323
>E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5))
2424

2525
export function f() { }
26-
>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 8, 21))
26+
>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 8, 24))
2727
}
2828
}
2929

30-
module M.P {
30+
namespace M.P {
3131
>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1))
32-
>P : Symbol(P, Decl(declarationEmitNameConflicts3.ts, 13, 9))
32+
>P : Symbol(P, Decl(declarationEmitNameConflicts3.ts, 13, 12))
3333

3434
export class C {
35-
>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 12))
35+
>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 15))
3636

3737
static f() { }
3838
>f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 14, 20))
3939
}
4040
export class E extends C { }
4141
>E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 16, 5))
42-
>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 12))
42+
>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 15))
4343

4444
export enum D {
4545
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 17, 32))
@@ -50,29 +50,29 @@ module M.P {
5050
export var v: M.D; // ok
5151
>v : Symbol(v, Decl(declarationEmitNameConflicts3.ts, 21, 14))
5252
>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1))
53-
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26))
53+
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26))
5454

5555
export var w = M.D.f; // error, should be typeof M.D.f
5656
>w : Symbol(w, Decl(declarationEmitNameConflicts3.ts, 22, 14))
57-
>M.D.f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 21))
58-
>M.D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26))
57+
>M.D.f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 24))
58+
>M.D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26))
5959
>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1))
60-
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26))
61-
>f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 21))
60+
>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26))
61+
>f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 24))
6262

6363
export var x = M.C.f; // error, should be typeof M.C.f
6464
>x : Symbol(x, Decl(declarationEmitNameConflicts3.ts, 23, 14), Decl(declarationEmitNameConflicts3.ts, 24, 14))
65-
>M.C.f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 21))
65+
>M.C.f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 24))
6666
>M.C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5))
6767
>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1))
6868
>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5))
69-
>f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 21))
69+
>f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 24))
7070

7171
export var x = M.E.f; // error, should be typeof M.E.f
7272
>x : Symbol(x, Decl(declarationEmitNameConflicts3.ts, 23, 14), Decl(declarationEmitNameConflicts3.ts, 24, 14))
73-
>M.E.f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 21))
73+
>M.E.f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 24))
7474
>M.E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5))
7575
>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1))
7676
>E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5))
77-
>f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 21))
77+
>f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 24))
7878
}

‎tests/baselines/reference/declarationEmitNameConflicts3.types‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
//// [tests/cases/compiler/declarationEmitNameConflicts3.ts] ////
22

33
=== declarationEmitNameConflicts3.ts ===
4-
module M {
4+
namespace M {
55
>M : typeof M
66
> : ^^^^^^^^
77

88
export interface D { }
9-
export module D {
9+
export namespace D {
1010
>D : typeof D
1111
> : ^^^^^^^^
1212

1313
export function f() { }
1414
>f : () => void
1515
> : ^^^^^^^^^^
1616
}
17-
export module C {
17+
export namespace C {
1818
>C : typeof C
1919
> : ^^^^^^^^
2020

2121
export function f() { }
2222
>f : () => void
2323
> : ^^^^^^^^^^
2424
}
25-
export module E {
25+
export namespace E {
2626
>E : typeof E
2727
> : ^^^^^^^^
2828

@@ -32,7 +32,7 @@ module M {
3232
}
3333
}
3434

35-
module M.P {
35+
namespace M.P {
3636
>M : typeof M
3737
> : ^^^^^^^^
3838
>P : typeof P

‎tests/cases/compiler/clodulesDerivedClasses.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class Shape {
22
id: number;
33
}
44

5-
module Shape.Utils {
5+
namespace Shape.Utils {
66
export function convert(): Shape { return null;}
77
}
88

@@ -11,7 +11,7 @@ class Path extends Shape {
1111

1212
}
1313

14-
module Path.Utils {
14+
namespace Path.Utils {
1515
export function convert2(): Path {
1616
return null;
1717
}

‎tests/cases/compiler/crashRegressionTest.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module MsPortal.Util.TemplateEngine {
1+
namespace MsPortal.Util.TemplateEngine {
22
"use strict";
33

44
interface TemplateKeyValue {

0 commit comments

Comments
 (0)