Skip to content

Commit 3b2c868

Browse files
andrewbranchandrewbranch
committed
Update missing baselines
1 parent 12a8b18 commit 3b2c868

File tree

5 files changed

+33
-53
lines changed

5 files changed

+33
-53
lines changed

‎src/harness/fourslashImpl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2352,7 +2352,7 @@ export class TestState {
23522352
}
23532353

23542354
public baselineSyntacticAndSemanticDiagnostics() {
2355-
const files = ts.filter(this.getCompilerTestFiles(), f => !ts.endsWith(f.unitName, ".json") && !!this.languageService.getProgram()!.getSourceFile(f.unitName));
2355+
const files = ts.filter(this.getCompilerTestFiles(), f => !ts.endsWith(f.unitName, ".json") && (this.testType === FourSlashTestType.Server || !!this.languageService.getProgram()!.getSourceFile(f.unitName)));
23562356
const result = this.getSyntacticDiagnosticBaselineText(files)
23572357
+ Harness.IO.newLine()
23582358
+ Harness.IO.newLine()

‎tests/baselines/reference/reactJsxReactResolvedNodeNextEsm.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export const a = <div></div>;
1313
"main": "",
1414
"types": "index.d.ts",
1515
"exports": {
16+
".": "./index.d.ts",
1617
"./*.js": "./*.js",
1718
"./*": "./*.js"
1819
}

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,15 @@ Info seq [hh:mm:ss:mss] event:
154154
}
155155
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
156156
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
157+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
157158
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
158159
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
159-
Info seq [hh:mm:ss:mss] Files (4)
160+
Info seq [hh:mm:ss:mss] Files (5)
160161
/lib.d.ts Text-1 lib.d.ts-Text
161162
/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
162163
/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
163164
/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"nodenext\"\n }\n}"
165+
/node_modules/@types/dependency/lib/index.d.ts Text-1 "export declare function fooFromIndex(): void;"
164166

165167

166168
lib.d.ts
@@ -171,6 +173,9 @@ Info seq [hh:mm:ss:mss] Files (4)
171173
Library referenced via 'decorators.legacy' from file 'lib.d.ts'
172174
tsconfig.json
173175
Root file specified for compilation
176+
node_modules/@types/dependency/lib/index.d.ts
177+
Entry point for implicit type library 'dependency' with packageId '@types/dependency/lib/[email protected]'
178+
File is ECMAScript module because 'node_modules/@types/dependency/package.json' has field "type" with value "module"
174179

175180
Info seq [hh:mm:ss:mss] -----------------------------------------------
176181
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /package.json 250 undefined WatchType: package.json file
@@ -179,7 +184,7 @@ Info seq [hh:mm:ss:mss] Files (5)
179184

180185
Info seq [hh:mm:ss:mss] -----------------------------------------------
181186
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
182-
Info seq [hh:mm:ss:mss] Files (4)
187+
Info seq [hh:mm:ss:mss] Files (5)
183188

184189
Info seq [hh:mm:ss:mss] -----------------------------------------------
185190
Info seq [hh:mm:ss:mss] Open files:
@@ -197,6 +202,7 @@ watchedFiles::
197202
{"pollingInterval":500}
198203
/node_modules/@types/dependency/lib/package.json: *new*
199204
{"pollingInterval":2000}
205+
{"pollingInterval":2000}
200206
/node_modules/@types/dependency/package.json: *new*
201207
{"pollingInterval":2000}
202208
{"pollingInterval":2000}
@@ -238,8 +244,9 @@ ScriptInfos::
238244
/dev/null/inferredProject1*
239245
/node_modules/@types/dependency/lib/index.d.ts *new*
240246
version: Text-1
241-
containingProjects: 1
247+
containingProjects: 2
242248
/tsconfig.json
249+
/dev/null/inferredProject1*
243250
/src/foo.ts *new*
244251
version: Text-1
245252
containingProjects: 1
@@ -265,7 +272,7 @@ Info seq [hh:mm:ss:mss] Files (5)
265272

266273
Info seq [hh:mm:ss:mss] -----------------------------------------------
267274
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
268-
Info seq [hh:mm:ss:mss] Files (4)
275+
Info seq [hh:mm:ss:mss] Files (5)
269276

270277
Info seq [hh:mm:ss:mss] -----------------------------------------------
271278
Info seq [hh:mm:ss:mss] Open files:
@@ -285,6 +292,7 @@ watchedFiles::
285292
{"pollingInterval":500}
286293
/node_modules/@types/dependency/lib/package.json:
287294
{"pollingInterval":2000}
295+
{"pollingInterval":2000}
288296
/node_modules/@types/dependency/package.json:
289297
{"pollingInterval":2000}
290298
{"pollingInterval":2000}
@@ -328,8 +336,9 @@ ScriptInfos::
328336
/dev/null/inferredProject1*
329337
/node_modules/@types/dependency/lib/index.d.ts
330338
version: Text-1
331-
containingProjects: 1
339+
containingProjects: 2
332340
/tsconfig.json
341+
/dev/null/inferredProject1*
333342
/src/foo.ts (Open) *changed*
334343
open: true *changed*
335344
version: Text-1
@@ -1140,6 +1149,7 @@ watchedFiles::
11401149
/node_modules/@types/dependency/lib/lol.d.ts: *new*
11411150
{"pollingInterval":500}
11421151
/node_modules/@types/dependency/lib/package.json:
1152+
{"pollingInterval":2000}
11431153
{"pollingInterval":2000}
11441154
{"pollingInterval":2000} *new*
11451155
/node_modules/@types/dependency/package.json:
@@ -1187,8 +1197,9 @@ ScriptInfos::
11871197
/dev/null/inferredProject1*
11881198
/node_modules/@types/dependency/lib/index.d.ts
11891199
version: Text-1
1190-
containingProjects: 1
1200+
containingProjects: 2
11911201
/tsconfig.json
1202+
/dev/null/inferredProject1*
11921203
/node_modules/@types/dependency/lib/lol.d.ts *new*
11931204
version: Text-1
11941205
containingProjects: 1

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

Lines changed: 12 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ fooFrom
6666
//// [/tsconfig.json]
6767
{
6868
"compilerOptions": {
69-
"module": "nodenext"
69+
"module": "nodenext",
70+
"types": []
7071
}
7172
}
7273

@@ -102,6 +103,7 @@ Info seq [hh:mm:ss:mss] Config: /tsconfig.json : {
102103
],
103104
"options": {
104105
"module": 199,
106+
"types": [],
105107
"configFilePath": "/tsconfig.json"
106108
}
107109
}
@@ -112,17 +114,13 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.d.ts 5
112114
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
113115
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /src/foo.ts 500 undefined WatchType: Closed Script info
114116
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tsconfig.json
115-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/package.json 2000 undefined Project: /tsconfig.json WatchType: File location affecting resolution
116-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/lib/index.d.ts 500 undefined WatchType: Closed Script info
117-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/lib/package.json 2000 undefined Project: /tsconfig.json WatchType: File location affecting resolution
118117
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
119118
Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured)
120-
Info seq [hh:mm:ss:mss] Files (5)
119+
Info seq [hh:mm:ss:mss] Files (4)
121120
/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
122121
/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
123122
/lib.d.ts Text-1 lib.d.ts-Text
124123
/src/foo.ts Text-1 "fooFrom"
125-
/node_modules/@types/dependency/lib/index.d.ts Text-1 "export declare function fooFromAtTypesIndex(): void;"
126124

127125

128126
lib.decorators.d.ts
@@ -136,9 +134,6 @@ Info seq [hh:mm:ss:mss] Files (5)
136134
src/foo.ts
137135
Matched by default include pattern '**/*'
138136
File is ECMAScript module because 'package.json' has field "type" with value "module"
139-
node_modules/@types/dependency/lib/index.d.ts
140-
Entry point for implicit type library 'dependency' with packageId '@types/dependency/lib/[email protected]'
141-
File is ECMAScript module because 'node_modules/@types/dependency/package.json' has field "type" with value "module"
142137

143138
Info seq [hh:mm:ss:mss] -----------------------------------------------
144139
Info seq [hh:mm:ss:mss] event:
@@ -163,14 +158,15 @@ Info seq [hh:mm:ss:mss] event:
163158
}
164159
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
165160
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
161+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/lib/index.d.ts 500 undefined WatchType: Closed Script info
166162
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /node_modules/@types/dependency/lib/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution
167163
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
168164
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
169165
Info seq [hh:mm:ss:mss] Files (5)
170166
/lib.d.ts Text-1 lib.d.ts-Text
171167
/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
172168
/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
173-
/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"nodenext\"\n }\n}"
169+
/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"nodenext\",\n \"types\": []\n }\n}"
174170
/node_modules/@types/dependency/lib/index.d.ts Text-1 "export declare function fooFromAtTypesIndex(): void;"
175171

176172

@@ -189,7 +185,7 @@ Info seq [hh:mm:ss:mss] Files (5)
189185
Info seq [hh:mm:ss:mss] -----------------------------------------------
190186
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /package.json 250 undefined WatchType: package.json file
191187
Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured)
192-
Info seq [hh:mm:ss:mss] Files (5)
188+
Info seq [hh:mm:ss:mss] Files (4)
193189

194190
Info seq [hh:mm:ss:mss] -----------------------------------------------
195191
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -211,10 +207,8 @@ watchedFiles::
211207
{"pollingInterval":500}
212208
/node_modules/@types/dependency/lib/package.json: *new*
213209
{"pollingInterval":2000}
214-
{"pollingInterval":2000}
215210
/node_modules/@types/dependency/package.json: *new*
216211
{"pollingInterval":2000}
217-
{"pollingInterval":2000}
218212
/package.json: *new*
219213
{"pollingInterval":250}
220214
/src/foo.ts: *new*
@@ -253,8 +247,7 @@ ScriptInfos::
253247
/dev/null/inferredProject1*
254248
/node_modules/@types/dependency/lib/index.d.ts *new*
255249
version: Text-1
256-
containingProjects: 2
257-
/tsconfig.json
250+
containingProjects: 1
258251
/dev/null/inferredProject1*
259252
/src/foo.ts *new*
260253
version: Text-1
@@ -277,7 +270,7 @@ Info seq [hh:mm:ss:mss] request:
277270
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /src/foo.ts 500 undefined WatchType: Closed Script info
278271
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /src/foo.ts ProjectRootPath: undefined:: Result: /tsconfig.json
279272
Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured)
280-
Info seq [hh:mm:ss:mss] Files (5)
273+
Info seq [hh:mm:ss:mss] Files (4)
281274

282275
Info seq [hh:mm:ss:mss] -----------------------------------------------
283276
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
@@ -301,10 +294,8 @@ watchedFiles::
301294
{"pollingInterval":500}
302295
/node_modules/@types/dependency/lib/package.json:
303296
{"pollingInterval":2000}
304-
{"pollingInterval":2000}
305297
/node_modules/@types/dependency/package.json:
306298
{"pollingInterval":2000}
307-
{"pollingInterval":2000}
308299
/package.json:
309300
{"pollingInterval":250}
310301
/tsconfig.json:
@@ -345,8 +336,7 @@ ScriptInfos::
345336
/dev/null/inferredProject1*
346337
/node_modules/@types/dependency/lib/index.d.ts
347338
version: Text-1
348-
containingProjects: 2
349-
/tsconfig.json
339+
containingProjects: 1
350340
/dev/null/inferredProject1*
351341
/src/foo.ts (Open) *changed*
352342
open: true *changed*
@@ -418,7 +408,7 @@ Info seq [hh:mm:ss:mss] forEachExternalModuleToImportFrom autoImportProvider: *
418408
Info seq [hh:mm:ss:mss] getExportInfoMap: done in * ms
419409
Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
420410
Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
421-
Info seq [hh:mm:ss:mss] collectAutoImports: resolved 3 module specifiers, plus 0 ambient and 0 from cache
411+
Info seq [hh:mm:ss:mss] collectAutoImports: resolved 2 module specifiers, plus 0 ambient and 0 from cache
422412
Info seq [hh:mm:ss:mss] collectAutoImports: response is complete
423413
Info seq [hh:mm:ss:mss] collectAutoImports: *
424414
Info seq [hh:mm:ss:mss] getCompletionData: Semantic work: *
@@ -1092,26 +1082,6 @@ Info seq [hh:mm:ss:mss] response:
10921082
"kindModifiers": "",
10931083
"sortText": "15"
10941084
},
1095-
{
1096-
"name": "fooFromAtTypesIndex",
1097-
"kind": "function",
1098-
"kindModifiers": "export,declare",
1099-
"sortText": "16",
1100-
"hasAction": true,
1101-
"source": "dependency",
1102-
"sourceDisplay": [
1103-
{
1104-
"text": "dependency",
1105-
"kind": "text"
1106-
}
1107-
],
1108-
"data": {
1109-
"exportName": "fooFromAtTypesIndex",
1110-
"exportMapKey": "19 * fooFromAtTypesIndex ",
1111-
"moduleSpecifier": "dependency",
1112-
"fileName": "/node_modules/@types/dependency/lib/index.d.ts"
1113-
}
1114-
},
11151085
{
11161086
"name": "fooFromIndex",
11171087
"kind": "function",
@@ -1183,10 +1153,8 @@ watchedFiles::
11831153
{"pollingInterval":500}
11841154
/node_modules/@types/dependency/lib/package.json:
11851155
{"pollingInterval":2000}
1186-
{"pollingInterval":2000}
11871156
/node_modules/@types/dependency/package.json:
11881157
{"pollingInterval":2000}
1189-
{"pollingInterval":2000}
11901158
/node_modules/dependency/lib/index.d.ts: *new*
11911159
{"pollingInterval":500}
11921160
/node_modules/dependency/lib/lol.d.ts: *new*
@@ -1234,8 +1202,7 @@ ScriptInfos::
12341202
/dev/null/inferredProject1*
12351203
/node_modules/@types/dependency/lib/index.d.ts
12361204
version: Text-1
1237-
containingProjects: 2
1238-
/tsconfig.json
1205+
containingProjects: 1
12391206
/dev/null/inferredProject1*
12401207
/node_modules/dependency/lib/index.d.ts *new*
12411208
version: Text-1

‎tests/cases/fourslash/server/autoImportProvider_exportMap6.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
// @Filename: /tsconfig.json
66
//// {
77
//// "compilerOptions": {
8-
//// "module": "nodenext"
8+
//// "module": "nodenext",
9+
//// "types": []
910
//// }
1011
//// }
1112

0 commit comments

Comments
 (0)