Skip to content

Commit 3de47cb

Browse files
sokrasokra
committed
avoid disableLazyShapeComputation in tscWatch incremental test
change tscWatch incremental test to test for lazy shape computation
1 parent 9a5fca6 commit 3de47cb

File tree

5 files changed

+24
-36
lines changed

5 files changed

+24
-36
lines changed

‎src/testRunner/unittests/tscWatch/incremental.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ namespace ts.tscWatch {
110110
};
111111
const config: File = {
112112
path: configFile.path,
113-
content: JSON.stringify({ compilerOptions: { incremental: true, disableLazyShapeComputation: true, module: "amd" } })
113+
content: JSON.stringify({ compilerOptions: { incremental: true, module: "amd" } })
114114
};
115115

116116
verifyIncrementalWatchEmit({
@@ -132,7 +132,7 @@ namespace ts.tscWatch {
132132
});
133133

134134
it("verify that state is read correctly", () => {
135-
const system = createWatchedSystem([libFile, file1, fileModified, config], { currentDirectory: project });
135+
const system = createWatchedSystem([libFile, file1, file2, config], { currentDirectory: project });
136136
const reportDiagnostic = createDiagnosticReporter(system);
137137
const parsedConfig = parseConfigFileWithSystem("tsconfig.json", {}, /*watchOptionsToExtend*/ undefined, system, reportDiagnostic)!;
138138
performIncrementalCompilation({
@@ -143,6 +143,15 @@ namespace ts.tscWatch {
143143
reportDiagnostic,
144144
system
145145
});
146+
system.writeFile(file2.path, fileModified.content);
147+
performIncrementalCompilation({
148+
rootNames: parsedConfig.fileNames,
149+
options: parsedConfig.options,
150+
projectReferences: parsedConfig.projectReferences,
151+
configFileParsingDiagnostics: getConfigFileParsingDiagnostics(parsedConfig),
152+
reportDiagnostic,
153+
system
154+
});
146155

147156
const command = parseConfigFileWithSystem("tsconfig.json", {}, /*watchOptionsToExtend*/ undefined, system, noop)!;
148157
const builderProgram = createIncrementalProgram({
@@ -164,7 +173,7 @@ namespace ts.tscWatch {
164173
});
165174
assert.deepEqual(state.fileInfos.get(file1.path as Path), {
166175
version: system.createHash(file1.content),
167-
signature: system.createHash(`${file1.content.replace("export ", "export declare ")}\n`),
176+
signature: undefined, // this must not have a signature, as it should be lazy computed
168177
affectsGlobalScope: false,
169178
});
170179
assert.deepEqual(state.fileInfos.get(file2.path as Path), {
@@ -175,7 +184,6 @@ namespace ts.tscWatch {
175184

176185
assert.deepEqual(state.compilerOptions, {
177186
incremental: true,
178-
disableLazyShapeComputation: true,
179187
module: ModuleKind.AMD,
180188
configFilePath: config.path
181189
});

‎tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-incremental.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const x = 10;
1919
export const y: string = 20;
2020

2121
//// [/users/username/projects/project/tsconfig.json]
22-
{"compilerOptions":{"incremental":true,"disableLazyShapeComputation":true,"module":"amd"}}
22+
{"compilerOptions":{"incremental":true,"module":"amd"}}
2323

2424

2525
/a/lib/tsc.js -i
@@ -35,7 +35,7 @@ Found 1 error.
3535

3636

3737
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
38-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
38+
Program options: {"incremental":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
3939
Program structureReused: Not
4040
Program files::
4141
/a/lib/lib.d.ts
@@ -84,18 +84,15 @@ define(["require", "exports"], function (require, exports) {
8484
},
8585
"./file1.ts": {
8686
"version": "-10726455937-export const x = 10;",
87-
"signature": "-6821242887-export declare const x = 10;\n",
8887
"affectsGlobalScope": false
8988
},
9089
"./file2.ts": {
9190
"version": "-13939690350-export const y: string = 20;",
92-
"signature": "-7924398419-export declare const y: string;\n",
9391
"affectsGlobalScope": false
9492
}
9593
},
9694
"options": {
9795
"incremental": true,
98-
"disableLazyShapeComputation": true,
9996
"module": 2,
10097
"configFilePath": "./tsconfig.json"
10198
},
@@ -142,7 +139,7 @@ Found 1 error.
142139

143140

144141
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
145-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
142+
Program options: {"incremental":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
146143
Program structureReused: Not
147144
Program files::
148145
/a/lib/lib.d.ts
@@ -185,13 +182,11 @@ define(["require", "exports"], function (require, exports) {
185182
},
186183
"./file2.ts": {
187184
"version": "-13939690350-export const y: string = 20;",
188-
"signature": "-7924398419-export declare const y: string;\n",
189185
"affectsGlobalScope": false
190186
}
191187
},
192188
"options": {
193189
"incremental": true,
194-
"disableLazyShapeComputation": true,
195190
"module": 2,
196191
"configFilePath": "./tsconfig.json"
197192
},

‎tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const x = 10;
1919
export const y: string = 20;
2020

2121
//// [/users/username/projects/project/tsconfig.json]
22-
{"compilerOptions":{"incremental":true,"disableLazyShapeComputation":true,"module":"amd"}}
22+
{"compilerOptions":{"incremental":true,"module":"amd"}}
2323

2424

2525
/a/lib/tsc.js -w
@@ -37,7 +37,7 @@ Output::
3737

3838

3939
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
40-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
40+
Program options: {"incremental":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
4141
Program structureReused: Not
4242
Program files::
4343
/a/lib/lib.d.ts
@@ -98,18 +98,15 @@ define(["require", "exports"], function (require, exports) {
9898
},
9999
"./file1.ts": {
100100
"version": "-10726455937-export const x = 10;",
101-
"signature": "-6821242887-export declare const x = 10;\n",
102101
"affectsGlobalScope": false
103102
},
104103
"./file2.ts": {
105104
"version": "-13939690350-export const y: string = 20;",
106-
"signature": "-7924398419-export declare const y: string;\n",
107105
"affectsGlobalScope": false
108106
}
109107
},
110108
"options": {
111109
"incremental": true,
112-
"disableLazyShapeComputation": true,
113110
"module": 2,
114111
"watch": true,
115112
"configFilePath": "./tsconfig.json"
@@ -159,7 +156,7 @@ Output::
159156

160157

161158
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
162-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
159+
Program options: {"incremental":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
163160
Program structureReused: Not
164161
Program files::
165162
/a/lib/lib.d.ts
@@ -214,13 +211,11 @@ define(["require", "exports"], function (require, exports) {
214211
},
215212
"./file2.ts": {
216213
"version": "-13939690350-export const y: string = 20;",
217-
"signature": "-7924398419-export declare const y: string;\n",
218214
"affectsGlobalScope": false
219215
}
220216
},
221217
"options": {
222218
"incremental": true,
223-
"disableLazyShapeComputation": true,
224219
"module": 2,
225220
"watch": true,
226221
"configFilePath": "./tsconfig.json"

‎tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-incremental.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ export const x = 10;
1919
export const y = 20;
2020

2121
//// [/users/username/projects/project/tsconfig.json]
22-
{"compilerOptions":{"incremental":true,"disableLazyShapeComputation":true,"module":"amd"}}
22+
{"compilerOptions":{"incremental":true,"module":"amd"}}
2323

2424

2525
/a/lib/tsc.js -i
2626
Output::
2727

2828

2929
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
30-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
30+
Program options: {"incremental":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
3131
Program structureReused: Not
3232
Program files::
3333
/a/lib/lib.d.ts
@@ -76,18 +76,15 @@ define(["require", "exports"], function (require, exports) {
7676
},
7777
"./file1.ts": {
7878
"version": "-10726455937-export const x = 10;",
79-
"signature": "-6821242887-export declare const x = 10;\n",
8079
"affectsGlobalScope": false
8180
},
8281
"./file2.ts": {
8382
"version": "-13729954175-export const y = 20;",
84-
"signature": "-7152436933-export declare const y = 20;\n",
8583
"affectsGlobalScope": false
8684
}
8785
},
8886
"options": {
8987
"incremental": true,
90-
"disableLazyShapeComputation": true,
9188
"module": 2,
9289
"configFilePath": "./tsconfig.json"
9390
},
@@ -114,7 +111,7 @@ Output::
114111

115112

116113
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
117-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
114+
Program options: {"incremental":true,"module":2,"configFilePath":"/users/username/projects/project/tsconfig.json"}
118115
Program structureReused: Not
119116
Program files::
120117
/a/lib/lib.d.ts
@@ -152,7 +149,6 @@ define(["require", "exports"], function (require, exports) {
152149
},
153150
"./file1.ts": {
154151
"version": "-10726455937-export const x = 10;",
155-
"signature": "-6821242887-export declare const x = 10;\n",
156152
"affectsGlobalScope": false
157153
},
158154
"./file2.ts": {
@@ -163,7 +159,6 @@ define(["require", "exports"], function (require, exports) {
163159
},
164160
"options": {
165161
"incremental": true,
166-
"disableLazyShapeComputation": true,
167162
"module": 2,
168163
"configFilePath": "./tsconfig.json"
169164
},

‎tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const x = 10;
1919
export const y = 20;
2020

2121
//// [/users/username/projects/project/tsconfig.json]
22-
{"compilerOptions":{"incremental":true,"disableLazyShapeComputation":true,"module":"amd"}}
22+
{"compilerOptions":{"incremental":true,"module":"amd"}}
2323

2424

2525
/a/lib/tsc.js -w
@@ -32,7 +32,7 @@ Output::
3232

3333

3434
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
35-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
35+
Program options: {"incremental":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
3636
Program structureReused: Not
3737
Program files::
3838
/a/lib/lib.d.ts
@@ -93,18 +93,15 @@ define(["require", "exports"], function (require, exports) {
9393
},
9494
"./file1.ts": {
9595
"version": "-10726455937-export const x = 10;",
96-
"signature": "-6821242887-export declare const x = 10;\n",
9796
"affectsGlobalScope": false
9897
},
9998
"./file2.ts": {
10099
"version": "-13729954175-export const y = 20;",
101-
"signature": "-7152436933-export declare const y = 20;\n",
102100
"affectsGlobalScope": false
103101
}
104102
},
105103
"options": {
106104
"incremental": true,
107-
"disableLazyShapeComputation": true,
108105
"module": 2,
109106
"watch": true,
110107
"configFilePath": "./tsconfig.json"
@@ -137,7 +134,7 @@ Output::
137134

138135

139136
Program root files: ["/users/username/projects/project/file1.ts","/users/username/projects/project/file2.ts"]
140-
Program options: {"incremental":true,"disableLazyShapeComputation":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
137+
Program options: {"incremental":true,"module":2,"watch":true,"configFilePath":"/users/username/projects/project/tsconfig.json"}
141138
Program structureReused: Not
142139
Program files::
143140
/a/lib/lib.d.ts
@@ -187,7 +184,6 @@ define(["require", "exports"], function (require, exports) {
187184
},
188185
"./file1.ts": {
189186
"version": "-10726455937-export const x = 10;",
190-
"signature": "-6821242887-export declare const x = 10;\n",
191187
"affectsGlobalScope": false
192188
},
193189
"./file2.ts": {
@@ -198,7 +194,6 @@ define(["require", "exports"], function (require, exports) {
198194
},
199195
"options": {
200196
"incremental": true,
201-
"disableLazyShapeComputation": true,
202197
"module": 2,
203198
"watch": true,
204199
"configFilePath": "./tsconfig.json"

0 commit comments

Comments
 (0)