Skip to content

Commit 8e23cb4

Browse files
sheetalkamatsheetalkamat
committed
Now that work with unresolved imports cleanup is done, remove the temp logging added
1 parent cbbbf4a commit 8e23cb4

288 files changed

Lines changed: 1 addition & 1984 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
@@ -594,7 +594,7 @@ function verifyProgram(service: ts.server.ProjectService, project: ts.server.Pro
594594
function verifyUnresolvedImports(_service: ts.server.ProjectService, project: ts.server.Project) {
595595
const cachedUnresolvedImportsPerFile = new Map<ts.Path, readonly string[]>();
596596
const lastCachedUnresolvedImportsList = project.useTypingsFromGlobalCache() ?
597-
ts.server.getUnresolvedImports(project.getCurrentProgram()!, cachedUnresolvedImportsPerFile, ts.noop) :
597+
ts.server.getUnresolvedImports(project.getCurrentProgram()!, cachedUnresolvedImportsPerFile) :
598598
undefined;
599599
verifyArray(
600600
lastCachedUnresolvedImportsList,

‎src/server/project.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
14721472
this.lastCachedUnresolvedImportsList ??= getUnresolvedImports(
14731473
this.program!,
14741474
this.cachedUnresolvedImportsPerFile,
1475-
s => this.writeLog(s),
14761475
);
14771476
this.enqueueInstallTypingsForProject(hasAddedorRemovedFiles);
14781477
}
@@ -2415,10 +2414,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
24152414
export function getUnresolvedImports(
24162415
program: Program,
24172416
cachedUnresolvedImportsPerFile: Map<Path, readonly string[]>,
2418-
writeLog: (s: string) => void,
24192417
): SortedReadonlyArray<string> {
24202418
const sourceFiles = program.getSourceFiles();
2421-
writeLog(`getUnresolvedImports:: Files:: ${sourceFiles.length}`);
24222419
tracing?.push(tracing.Phase.Session, "getUnresolvedImports", { count: sourceFiles.length });
24232420
const ambientModules = program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName()));
24242421
const result = sortAndDeduplicate(flatMap(sourceFiles, sourceFile =>
@@ -2427,18 +2424,15 @@ export function getUnresolvedImports(
24272424
sourceFile,
24282425
ambientModules,
24292426
cachedUnresolvedImportsPerFile,
2430-
writeLog,
24312427
)));
24322428
tracing?.pop();
2433-
writeLog(`getUnresolvedImports:: Files:: ${sourceFiles.length} Done: ${JSON.stringify(result)}`);
24342429
return result;
24352430
}
24362431
function extractUnresolvedImportsFromSourceFile(
24372432
program: Program,
24382433
file: SourceFile,
24392434
ambientModules: readonly string[],
24402435
cachedUnresolvedImportsPerFile: Map<Path, readonly string[]>,
2441-
writeLog: (s: string) => void,
24422436
): readonly string[] {
24432437
return getOrUpdate(cachedUnresolvedImportsPerFile, file.path, () => {
24442438
let unresolvedImports: string[] | undefined;
@@ -2451,7 +2445,6 @@ function extractUnresolvedImportsFromSourceFile(
24512445
unresolvedImports = append(unresolvedImports, parsePackageName(name).packageName);
24522446
}
24532447
}, file);
2454-
writeLog(`extractUnresolvedImportsFromSourceFile:: ${file.path}:: ${JSON.stringify(unresolvedImports || emptyArray)}`);
24552448
return unresolvedImports || emptyArray;
24562449
});
24572450
}

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

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

103103
Info seq [hh:mm:ss:mss] -----------------------------------------------
104-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
105-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/ts/lib/lib.d.ts:: []
106-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /user/username/projects/project/node_modules/@angular/forms/forms.d.ts:: []
107-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
108104
TI:: Creating typing installer
109105

110106
PolledWatches::

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

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

322322
Info seq [hh:mm:ss:mss] -----------------------------------------------
323-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
324-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/ts/lib/lib.d.ts:: []
325-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /user/username/projects/project/node_modules/@angular/forms/forms.d.ts:: []
326-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
327323
TI:: Creating typing installer
328324

329325
PolledWatches::

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

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

100100
Info seq [hh:mm:ss:mss] -----------------------------------------------
101-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
102-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/ts/lib/lib.d.ts:: []
103-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /user/username/projects/project/node_modules/@angular/forms/forms.d.ts:: []
104-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
105101
TI:: Creating typing installer
106102

107103
PolledWatches::

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

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

275275
Info seq [hh:mm:ss:mss] -----------------------------------------------
276-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
277-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/ts/lib/lib.d.ts:: []
278-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /user/username/projects/project/b.js:: []
279-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
280276
TI:: Creating typing installer
281277

282278
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
@@ -196,14 +196,6 @@ Info seq [hh:mm:ss:mss] Files (6)
196196
Root file specified for compilation
197197

198198
Info seq [hh:mm:ss:mss] -----------------------------------------------
199-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 6
200-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: c:/home/src/tslibs/ts/lib/lib.d.ts:: []
201-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: e:/solution/myproject/node_modules/@types/prop-types/index.d.ts:: []
202-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: e:/solution/myproject/node_modules/@types/react/index.d.ts:: []
203-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: c:/typescript/node_modules/@types/react/index.d.ts:: []
204-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: c:/typescript/node_modules/@types/react-router-dom/index.d.ts:: []
205-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: e:/solution/myproject/src/app.js:: []
206-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 6 Done: []
207199
TI:: Creating typing installer
208200

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

6464
Info seq [hh:mm:ss:mss] -----------------------------------------------
65-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
66-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/TS/Lib/lib.d.ts:: []
67-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js:: []
68-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
6965
TI:: Creating typing installer
7066

7167
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
@@ -63,10 +63,6 @@ Info seq [hh:mm:ss:mss] Files (2)
6363
Root file specified for compilation
6464

6565
Info seq [hh:mm:ss:mss] -----------------------------------------------
66-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
67-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/TS/Lib/lib.d.ts:: []
68-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js:: []
69-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
7066
TI:: Creating typing installer
7167

7268
PolledWatches::

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,6 @@ Info seq [hh:mm:ss:mss] Files (2)
331331
Root file specified for compilation
332332
333333
Info seq [hh:mm:ss:mss] -----------------------------------------------
334-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2
335-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /home/src/tslibs/ts/lib/lib.d.ts:: []
336-
Info seq [hh:mm:ss:mss] extractUnresolvedImportsFromSourceFile:: /user/username/projects/project/aa.js:: []
337-
Info seq [hh:mm:ss:mss] getUnresolvedImports:: Files:: 2 Done: []
338334
TI:: Creating typing installer
339335
340336
PolledWatches::

0 commit comments

Comments
 (0)