Skip to content

Commit e5f3b15

Browse files
sheetalkamatsheetalkamat
committed
Now that work with unresolved imports cleanup is done, remove the temp logging added
1 parent 708ec90 commit e5f3b15

231 files changed

Lines changed: 1 addition & 1354 deletions

File tree

Some content is hidden

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

‎src/harness/incrementalUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ function verifyProgram(service: ts.server.ProjectService, project: ts.server.Pro
534534
function verifyUnresolvedImports(_service: ts.server.ProjectService, project: ts.server.Project) {
535535
const cachedUnresolvedImportsPerFile = new Map<ts.Path, readonly string[]>();
536536
const lastCachedUnresolvedImportsList = project.useTypingsFromGlobalCache() ?
537-
ts.server.getUnresolvedImports(project.getCurrentProgram()!, cachedUnresolvedImportsPerFile, ts.noop) :
537+
ts.server.getUnresolvedImports(project.getCurrentProgram()!, cachedUnresolvedImportsPerFile) :
538538
undefined;
539539
verifyArray(
540540
lastCachedUnresolvedImportsList,

‎src/server/project.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
14491449
this.lastCachedUnresolvedImportsList ??= getUnresolvedImports(
14501450
this.program!,
14511451
this.cachedUnresolvedImportsPerFile,
1452-
s => this.writeLog(s),
14531452
);
14541453
this.enqueueInstallTypingsForProject(hasAddedorRemovedFiles);
14551454
}
@@ -2373,10 +2372,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
23732372
export function getUnresolvedImports(
23742373
program: Program,
23752374
cachedUnresolvedImportsPerFile: Map<Path, readonly string[]>,
2376-
writeLog: (s: string) => void,
23772375
): SortedReadonlyArray<string> {
23782376
const sourceFiles = program.getSourceFiles();
2379-
writeLog(`Calculating unresolved imports list of program:: Files:: ${sourceFiles.length}`);
23802377
tracing?.push(tracing.Phase.Session, "getUnresolvedImports", { count: sourceFiles.length });
23812378
const ambientModules = program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName()));
23822379
const result = sortAndDeduplicate(flatMap(sourceFiles, sourceFile =>
@@ -2385,18 +2382,15 @@ export function getUnresolvedImports(
23852382
sourceFile,
23862383
ambientModules,
23872384
cachedUnresolvedImportsPerFile,
2388-
writeLog,
23892385
)));
23902386
tracing?.pop();
2391-
writeLog(`Calculating unresolved imports list of program:: Files:: ${sourceFiles.length} Done: ${JSON.stringify(result)}`);
23922387
return result;
23932388
}
23942389
function extractUnresolvedImportsFromSourceFile(
23952390
program: Program,
23962391
file: SourceFile,
23972392
ambientModules: readonly string[],
23982393
cachedUnresolvedImportsPerFile: Map<Path, readonly string[]>,
2399-
writeLog: (s: string) => void,
24002394
): readonly string[] {
24012395
return getOrUpdate(cachedUnresolvedImportsPerFile, file.path, () => {
24022396
let unresolvedImports: string[] | undefined;
@@ -2409,7 +2403,6 @@ function extractUnresolvedImportsFromSourceFile(
24092403
unresolvedImports = append(unresolvedImports, parsePackageName(name).packageName);
24102404
}
24112405
}, file);
2412-
writeLog(`New unresolvedImports for ${file.path}:: ${JSON.stringify(unresolvedImports || emptyArray)}`);
24132406
return unresolvedImports || emptyArray;
24142407
});
24152408
}

‎tests/baselines/reference/tsserver/autoImportProvider/Auto-importable-file-is-in-inferred-project-until-imported.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ Info seq [hh:mm:ss:mss] Files (1)
4242
Root file specified for compilation
4343

4444
Info seq [hh:mm:ss:mss] -----------------------------------------------
45-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1
46-
Info seq [hh:mm:ss:mss] New unresolvedImports for /node_modules/@angular/forms/forms.d.ts:: []
47-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1 Done: []
4845
TI:: Creating typing installer
4946

5047
PolledWatches::

‎tests/baselines/reference/tsserver/autoImportProvider/Responds-to-manual-changes-in-node_modules.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,6 @@ Info seq [hh:mm:ss:mss] Files (1)
256256
Root file specified for compilation
257257

258258
Info seq [hh:mm:ss:mss] -----------------------------------------------
259-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1
260-
Info seq [hh:mm:ss:mss] New unresolvedImports for /node_modules/@angular/forms/forms.d.ts:: []
261-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1 Done: []
262259
TI:: Creating typing installer
263260

264261
PolledWatches::

‎tests/baselines/reference/tsserver/autoImportProvider/projects-already-inside-node_modules.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ Info seq [hh:mm:ss:mss] Files (1)
3939
Root file specified for compilation
4040

4141
Info seq [hh:mm:ss:mss] -----------------------------------------------
42-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1
43-
Info seq [hh:mm:ss:mss] New unresolvedImports for /node_modules/@angular/forms/forms.d.ts:: []
44-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1 Done: []
4542
TI:: Creating typing installer
4643

4744
PolledWatches::

‎tests/baselines/reference/tsserver/auxiliaryProject/does-not-remove-scrips-from-InferredProject.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ Info seq [hh:mm:ss:mss] Files (1)
150150
Root file specified for compilation
151151

152152
Info seq [hh:mm:ss:mss] -----------------------------------------------
153-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1
154-
Info seq [hh:mm:ss:mss] New unresolvedImports for /b.js:: []
155-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1 Done: []
156153
TI:: Creating typing installer
157154

158155
PolledWatches::

‎tests/baselines/reference/tsserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,6 @@ Info seq [hh:mm:ss:mss] Files (6)
153153
Root file specified for compilation
154154

155155
Info seq [hh:mm:ss:mss] -----------------------------------------------
156-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 6
157-
Info seq [hh:mm:ss:mss] New unresolvedImports for c:/a/lib/lib.d.ts:: []
158-
Info seq [hh:mm:ss:mss] New unresolvedImports for e:/myproject/node_modules/@types/prop-types/index.d.ts:: []
159-
Info seq [hh:mm:ss:mss] New unresolvedImports for e:/myproject/node_modules/@types/react/index.d.ts:: []
160-
Info seq [hh:mm:ss:mss] New unresolvedImports for c:/typescript/node_modules/@types/react/index.d.ts:: []
161-
Info seq [hh:mm:ss:mss] New unresolvedImports for c:/typescript/node_modules/@types/react-router-dom/index.d.ts:: []
162-
Info seq [hh:mm:ss:mss] New unresolvedImports for e:/myproject/src/app.js:: []
163-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 6 Done: []
164156
TI:: Creating typing installer
165157

166158
PolledWatches::

‎tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ Info seq [hh:mm:ss:mss] Files (2)
5858
Root file specified for compilation
5959

6060
Info seq [hh:mm:ss:mss] -----------------------------------------------
61-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 2
62-
Info seq [hh:mm:ss:mss] New unresolvedImports for /a/lib/lib.d.ts:: []
63-
Info seq [hh:mm:ss:mss] New unresolvedImports for /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js:: []
64-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 2 Done: []
6561
TI:: Creating typing installer
6662

6763
PolledWatches::

‎tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ Info seq [hh:mm:ss:mss] Files (2)
5959
Root file specified for compilation
6060

6161
Info seq [hh:mm:ss:mss] -----------------------------------------------
62-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 2
63-
Info seq [hh:mm:ss:mss] New unresolvedImports for /a/lib/lib.d.ts:: []
64-
Info seq [hh:mm:ss:mss] New unresolvedImports for /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js:: []
65-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 2 Done: []
6662
TI:: Creating typing installer
6763

6864
PolledWatches::

‎tests/baselines/reference/tsserver/configuredProjects/files-are-properly-detached-when-language-service-is-disabled.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,6 @@ Info seq [hh:mm:ss:mss] Files (1)
298298
Root file specified for compilation
299299
300300
Info seq [hh:mm:ss:mss] -----------------------------------------------
301-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1
302-
Info seq [hh:mm:ss:mss] New unresolvedImports for /aa.js:: []
303-
Info seq [hh:mm:ss:mss] Calculating unresolved imports list of program:: Files:: 1 Done: []
304301
TI:: Creating typing installer
305302
306303
TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json

0 commit comments

Comments
 (0)