Skip to content

Commit 81209a2

Browse files
sheetalkamatsheetalkamat
committed
Now that work with unresolved imports cleanup is done, remove the temp logging added
1 parent e382fea commit 81209a2

File tree

242 files changed

+1
-1420
lines changed

Some content is hidden

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

242 files changed

+1
-1420
lines changed

‎src/harness/incrementalUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ function verifyProgram(service: ts.server.ProjectService, project: ts.server.Pro
579579
function verifyUnresolvedImports(_service: ts.server.ProjectService, project: ts.server.Project) {
580580
const cachedUnresolvedImportsPerFile = new Map<ts.Path, readonly string[]>();
581581
const lastCachedUnresolvedImportsList = project.useTypingsFromGlobalCache() ?
582-
ts.server.getUnresolvedImports(project.getCurrentProgram()!, cachedUnresolvedImportsPerFile, ts.noop) :
582+
ts.server.getUnresolvedImports(project.getCurrentProgram()!, cachedUnresolvedImportsPerFile) :
583583
undefined;
584584
verifyArray(
585585
lastCachedUnresolvedImportsList,

‎src/server/project.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
14541454
this.lastCachedUnresolvedImportsList ??= getUnresolvedImports(
14551455
this.program!,
14561456
this.cachedUnresolvedImportsPerFile,
1457-
s => this.writeLog(s),
14581457
);
14591458
this.enqueueInstallTypingsForProject(hasAddedorRemovedFiles);
14601459
}
@@ -2401,10 +2400,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
24012400
export function getUnresolvedImports(
24022401
program: Program,
24032402
cachedUnresolvedImportsPerFile: Map<Path, readonly string[]>,
2404-
writeLog: (s: string) => void,
24052403
): SortedReadonlyArray<string> {
24062404
const sourceFiles = program.getSourceFiles();
2407-
writeLog(`getUnresolvedImports:: Files:: ${sourceFiles.length}`);
24082405
tracing?.push(tracing.Phase.Session, "getUnresolvedImports", { count: sourceFiles.length });
24092406
const ambientModules = program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName()));
24102407
const result = sortAndDeduplicate(flatMap(sourceFiles, sourceFile =>
@@ -2413,18 +2410,15 @@ export function getUnresolvedImports(
24132410
sourceFile,
24142411
ambientModules,
24152412
cachedUnresolvedImportsPerFile,
2416-
writeLog,
24172413
)));
24182414
tracing?.pop();
2419-
writeLog(`getUnresolvedImports:: Files:: ${sourceFiles.length} Done: ${JSON.stringify(result)}`);
24202415
return result;
24212416
}
24222417
function extractUnresolvedImportsFromSourceFile(
24232418
program: Program,
24242419
file: SourceFile,
24252420
ambientModules: readonly string[],
24262421
cachedUnresolvedImportsPerFile: Map<Path, readonly string[]>,
2427-
writeLog: (s: string) => void,
24282422
): readonly string[] {
24292423
return getOrUpdate(cachedUnresolvedImportsPerFile, file.path, () => {
24302424
let unresolvedImports: string[] | undefined;
@@ -2437,7 +2431,6 @@ function extractUnresolvedImportsFromSourceFile(
24372431
unresolvedImports = append(unresolvedImports, parsePackageName(name).packageName);
24382432
}
24392433
}, file);
2440-
writeLog(`extractUnresolvedImportsFromSourceFile:: ${file.path}:: ${JSON.stringify(unresolvedImports || emptyArray)}`);
24412434
return unresolvedImports || emptyArray;
24422435
});
24432436
}

‎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
@@ -65,9 +65,6 @@ Info seq [hh:mm:ss:mss] Files (1)
6565
Root file specified for compilation
6666

6767
Info seq [hh:mm:ss:mss] -----------------------------------------------
68-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1
69-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /node_modules/@angular/forms/forms.d.ts:: []
70-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1 Done: []
7168
TI:: Creating typing installer
7269

7370
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
@@ -309,9 +309,6 @@ Info seq [hh:mm:ss:mss] Files (1)
309309
Root file specified for compilation
310310

311311
Info seq [hh:mm:ss:mss] -----------------------------------------------
312-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1
313-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /node_modules/@angular/forms/forms.d.ts:: []
314-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1 Done: []
315312
TI:: Creating typing installer
316313

317314
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
@@ -62,9 +62,6 @@ Info seq [hh:mm:ss:mss] Files (1)
6262
Root file specified for compilation
6363

6464
Info seq [hh:mm:ss:mss] -----------------------------------------------
65-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1
66-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /node_modules/@angular/forms/forms.d.ts:: []
67-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1 Done: []
6865
TI:: Creating typing installer
6966

7067
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
@@ -200,9 +200,6 @@ Info seq [hh:mm:ss:mss] Files (1)
200200
Root file specified for compilation
201201

202202
Info seq [hh:mm:ss:mss] -----------------------------------------------
203-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1
204-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /b.js:: []
205-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1 Done: []
206203
TI:: Creating typing installer
207204

208205
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
@@ -177,14 +177,6 @@ Info seq [hh:mm:ss:mss] Files (6)
177177
Root file specified for compilation
178178

179179
Info seq [hh:mm:ss:mss] -----------------------------------------------
180-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 6
181-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: c:/a/lib/lib.d.ts:: []
182-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: e:/myproject/node_modules/@types/prop-types/index.d.ts:: []
183-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: e:/myproject/node_modules/@types/react/index.d.ts:: []
184-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: c:/typescript/node_modules/@types/react/index.d.ts:: []
185-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: c:/typescript/node_modules/@types/react-router-dom/index.d.ts:: []
186-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: e:/myproject/src/app.js:: []
187-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 6 Done: []
188180
TI:: Creating typing installer
189181

190182
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
@@ -57,10 +57,6 @@ Info seq [hh:mm:ss:mss] Files (2)
5757
Root file specified for compilation
5858

5959
Info seq [hh:mm:ss:mss] -----------------------------------------------
60-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
61-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /a/lib/lib.d.ts:: []
62-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js:: []
63-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
6460
TI:: Creating typing installer
6561

6662
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
@@ -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] getUnresolvedImports:: Files:: 2
62-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /a/lib/lib.d.ts:: []
63-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js:: []
64-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
6561
TI:: Creating typing installer
6662

6763
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
@@ -343,9 +343,6 @@ Info seq [hh:mm:ss:mss] Files (1)
343343
Root file specified for compilation
344344
345345
Info seq [hh:mm:ss:mss] -----------------------------------------------
346-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1
347-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /aa.js:: []
348-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 1 Done: []
349346
TI:: Creating typing installer
350347
351348
Projects::

0 commit comments

Comments
 (0)