Skip to content

Commit 0faa5b5

Browse files
jakebaileyjakebailey
committed
Force option on for some tests that are not pure baseline diffs
1 parent bf90e30 commit 0faa5b5

File tree

42 files changed

+274
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+274
-237
lines changed

‎tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInline.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Info seq [hh:mm:ss:mss] request:
77
"type": "request",
88
"arguments": {
99
"options": {
10+
"stableTypeOrdering": true,
1011
"module": "commonjs",
1112
"target": "es6",
1213
"lib": [
@@ -40,8 +41,8 @@ export declare class Foo {
4041
x: number;
4142
y?: undefined;
4243
} | {
43-
y: string;
4444
x?: undefined;
45+
y: string;
4546
};
4647
}
4748
export interface SomeType {
@@ -92,6 +93,7 @@ instance.methodName({member: 12});
9293
//// [/home/src/workspaces/project/tsconfig.json]
9394
{
9495
"compilerOptions": {
96+
"stableTypeOrdering": true,
9597
"module": "commonjs",
9698
"target": "es2015",
9799
"lib": ["es5"],
@@ -123,6 +125,7 @@ Info seq [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
123125
"/home/src/workspaces/project/index.ts"
124126
],
125127
"options": {
128+
"stableTypeOrdering": true,
126129
"module": 1,
127130
"target": 2,
128131
"lib": [
@@ -209,7 +212,7 @@ Info seq [hh:mm:ss:mss] Files (4)
209212
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
210213
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
211214
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
212-
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"inlineSourceMap\": true,\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
215+
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"stableTypeOrdering\": true,\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"inlineSourceMap\": true,\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
213216

214217

215218
../../tslibs/TS/Lib/lib.es5.d.ts
@@ -426,7 +429,7 @@ Info seq [hh:mm:ss:mss] response:
426429
{
427430
"name": "/home/src/workspaces/project/dist/index.d.ts",
428431
"writeByteOrderMark": false,
429-
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
432+
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
430433
}
431434
],
432435
"emitSkipped": false,
@@ -470,7 +473,7 @@ Info seq [hh:mm:ss:mss] Files (5)
470473
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
471474
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
472475
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
473-
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
476+
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
474477
/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
475478

476479

‎tests/baselines/reference/tsserver/fourslashServer/declarationMapsEnableMapping_NoInlineSources.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Info seq [hh:mm:ss:mss] request:
77
"type": "request",
88
"arguments": {
99
"options": {
10+
"stableTypeOrdering": true,
1011
"module": "commonjs",
1112
"target": "es6",
1213
"lib": [
@@ -41,8 +42,8 @@ export declare class Foo {
4142
x: number;
4243
y?: undefined;
4344
} | {
44-
y: string;
4545
x?: undefined;
46+
y: string;
4647
};
4748
}
4849
export interface SomeType {
@@ -93,6 +94,7 @@ instance.methodName({member: 12});
9394
//// [/home/src/workspaces/project/tsconfig.json]
9495
{
9596
"compilerOptions": {
97+
"stableTypeOrdering": true,
9698
"module": "commonjs",
9799
"target": "es2015",
98100
"lib": ["es5"],
@@ -125,6 +127,7 @@ Info seq [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
125127
"/home/src/workspaces/project/index.ts"
126128
],
127129
"options": {
130+
"stableTypeOrdering": true,
128131
"module": 1,
129132
"target": 2,
130133
"lib": [
@@ -212,7 +215,7 @@ Info seq [hh:mm:ss:mss] Files (4)
212215
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
213216
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
214217
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
215-
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"inlineSourceMap\": true,\n \"inlineSources\": true,\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
218+
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"stableTypeOrdering\": true,\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"inlineSourceMap\": true,\n \"inlineSources\": true,\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
216219

217220

218221
../../tslibs/TS/Lib/lib.es5.d.ts
@@ -429,7 +432,7 @@ Info seq [hh:mm:ss:mss] response:
429432
{
430433
"name": "/home/src/workspaces/project/dist/index.d.ts",
431434
"writeByteOrderMark": false,
432-
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
435+
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
433436
}
434437
],
435438
"emitSkipped": false,
@@ -473,7 +476,7 @@ Info seq [hh:mm:ss:mss] Files (5)
473476
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
474477
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
475478
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
476-
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
479+
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
477480
/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
478481

479482

‎tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Info seq [hh:mm:ss:mss] request:
77
"type": "request",
88
"arguments": {
99
"options": {
10+
"stableTypeOrdering": true,
1011
"module": "commonjs",
1112
"target": "es6",
1213
"lib": [
@@ -39,8 +40,8 @@ export declare class Foo {
3940
x: number;
4041
y?: undefined;
4142
} | {
42-
y: string;
4343
x?: undefined;
44+
y: string;
4445
};
4546
}
4647
export interface SomeType {
@@ -91,6 +92,7 @@ instance.methodName({member: 12});
9192
//// [/home/src/workspaces/project/tsconfig.json]
9293
{
9394
"compilerOptions": {
95+
"stableTypeOrdering": true,
9496
"module": "commonjs",
9597
"target": "es2015",
9698
"lib": ["es5"],
@@ -121,6 +123,7 @@ Info seq [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
121123
"/home/src/workspaces/project/index.ts"
122124
],
123125
"options": {
126+
"stableTypeOrdering": true,
124127
"module": 1,
125128
"target": 2,
126129
"lib": [
@@ -206,7 +209,7 @@ Info seq [hh:mm:ss:mss] Files (4)
206209
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
207210
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
208211
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
209-
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
212+
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"stableTypeOrdering\": true,\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
210213

211214

212215
../../tslibs/TS/Lib/lib.es5.d.ts
@@ -423,7 +426,7 @@ Info seq [hh:mm:ss:mss] response:
423426
{
424427
"name": "/home/src/workspaces/project/dist/index.d.ts",
425428
"writeByteOrderMark": false,
426-
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
429+
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
427430
}
428431
],
429432
"emitSkipped": false,
@@ -467,7 +470,7 @@ Info seq [hh:mm:ss:mss] Files (5)
467470
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
468471
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
469472
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
470-
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
473+
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
471474
/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
472475

473476

‎tests/baselines/reference/tsserver/fourslashServer/declarationMapsGeneratedMapsEnableMapping2.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Info seq [hh:mm:ss:mss] request:
77
"type": "request",
88
"arguments": {
99
"options": {
10+
"stableTypeOrdering": true,
1011
"module": "commonjs",
1112
"target": "es6",
1213
"lib": [
@@ -41,8 +42,8 @@ export declare class Foo {
4142
x: number;
4243
y?: undefined;
4344
} | {
44-
y: string;
4545
x?: undefined;
46+
y: string;
4647
};
4748
}
4849
export interface SomeType {
@@ -96,6 +97,7 @@ instance.methodName({member: 12});
9697
//// [/home/src/workspaces/project/tsconfig.json]
9798
{
9899
"compilerOptions": {
100+
"stableTypeOrdering": true,
99101
"module": "commonjs",
100102
"target": "es2015",
101103
"lib": ["es5"],
@@ -128,6 +130,7 @@ Info seq [hh:mm:ss:mss] Config: /home/src/workspaces/project/tsconfig.json : {
128130
"/home/src/workspaces/project/index.ts"
129131
],
130132
"options": {
133+
"stableTypeOrdering": true,
131134
"module": 1,
132135
"target": 2,
133136
"lib": [
@@ -215,7 +218,7 @@ Info seq [hh:mm:ss:mss] Files (4)
215218
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
216219
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
217220
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
218-
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"sourceMap\": true,\n \"sourceRoot\": \"/home/src/workspaces/project/\",\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
221+
/home/src/workspaces/project/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"stableTypeOrdering\": true,\n \"module\": \"commonjs\",\n \"target\": \"es2015\",\n \"lib\": [\"es5\"],\n \"strict\": false,\n \"outDir\": \"./dist\",\n \"sourceMap\": true,\n \"sourceRoot\": \"/home/src/workspaces/project/\",\n \"declaration\": true,\n \"declarationMap\": true,\n \"newLine\": \"lf\",\n },\n \"files\": [\"/home/src/workspaces/project/index.ts\"],\n}"
219222

220223

221224
../../tslibs/TS/Lib/lib.es5.d.ts
@@ -437,7 +440,7 @@ Info seq [hh:mm:ss:mss] response:
437440
{
438441
"name": "/home/src/workspaces/project/dist/index.d.ts",
439442
"writeByteOrderMark": false,
440-
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
443+
"text": "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
441444
}
442445
],
443446
"emitSkipped": false,
@@ -481,7 +484,7 @@ Info seq [hh:mm:ss:mss] Files (5)
481484
/home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text
482485
/home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
483486
/home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
484-
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n y: string;\n x?: undefined;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
487+
/home/src/workspaces/project/dist/index.d.ts Text-1 "export declare class Foo {\n member: string;\n methodName(propName: SomeType): SomeType;\n otherMethod(): {\n x: number;\n y?: undefined;\n } | {\n x?: undefined;\n y: string;\n };\n}\nexport interface SomeType {\n member: number;\n}\n//# sourceMappingURL=index.d.ts.map"
485488
/home/src/workspaces/project/mymodule.ts SVC-1-0 "import * as mod from \"/home/src/workspaces/project/dist/index\";\nconst instance = new mod.Foo();\ninstance.methodName({member: 12});"
486489

487490

0 commit comments

Comments
 (0)