Skip to content

Commit 86151e1

Browse files
andrewbranchandrewbranch
committed
Clean up naming, @internal marking, and fix empty project creation bug
1 parent c0066b3 commit 86151e1

File tree

7 files changed

+40
-21
lines changed

7 files changed

+40
-21
lines changed

‎src/compiler/program.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ namespace ts {
861861
forEach(rootNames, name => processRootFile(name, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false));
862862

863863
// load type declarations specified via 'types' argument or implicitly from types/ and node_modules/@types folders
864-
const typeReferences: string[] = getAutomaticTypeDirectiveNames(options, host);
864+
const typeReferences: string[] = rootNames.length ? getAutomaticTypeDirectiveNames(options, host) : emptyArray;
865865

866866
if (typeReferences.length) {
867867
// This containingFilename needs to match with the one used in managed-side

‎src/server/editorServices.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ namespace ts.server {
674674
/*@internal*/
675675
readonly watchFactory: WatchFactory<WatchType, Project>;
676676

677+
/*@internal*/
677678
readonly usePackageJsonAutoImportProvider: boolean;
678679
/*@internal*/
679680
readonly packageJsonCache: PackageJsonCache;
@@ -1091,7 +1092,7 @@ namespace ts.server {
10911092
this.logger.msg(`Error: got watch notification for unknown file: ${fileName}`);
10921093
}
10931094
else {
1094-
info.containedAsAuxiliaryFile?.forEach(p => p.markAutoImportProviderAsDirty());
1095+
info.getAuxiliaryFileContainingProjects()?.forEach(p => p.markAutoImportProviderAsDirty());
10951096
if (info.containingProjects) {
10961097
info.containingProjects.forEach(project => project.resolutionCache.removeResolutionsFromProjectReferenceRedirects(info.path));
10971098
}
@@ -3718,6 +3719,7 @@ namespace ts.server {
37183719
return result;
37193720
}
37203721

3722+
/*@internal*/
37213723
private watchPackageJsonFile(path: Path, watchOptions: WatchOptions | undefined) {
37223724
const watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = createMap());
37233725
if (!watchers.has(path)) {

‎src/server/project.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ namespace ts.server {
188188
*/
189189
private projectStateVersion = 0;
190190

191+
/*@internal*/
191192
private autoImportProgramVersion = 0;
192193

193194
protected isInitialLoadPending: () => boolean = returnFalse;
@@ -345,6 +346,7 @@ namespace ts.server {
345346
return this.projectStateVersion.toString();
346347
}
347348

349+
/*@internal*/
348350
getPackageJsonAutoImportProviderVersion() {
349351
return this.autoImportProgramVersion.toString();
350352
}
@@ -930,6 +932,7 @@ namespace ts.server {
930932
}
931933
}
932934

935+
/*@internal*/
933936
markAutoImportProviderAsDirty() {
934937
this.autoImportProgramVersion++;
935938
}
@@ -1577,6 +1580,7 @@ namespace ts.server {
15771580
return this.importSuggestionsCache;
15781581
}
15791582

1583+
/*@internal*/
15801584
usePackageJsonAutoImportProvider() {
15811585
return this.projectService.usePackageJsonAutoImportProvider && this.isDefaultProjectForOpenFiles();
15821586
}
@@ -1585,7 +1589,10 @@ namespace ts.server {
15851589
private isDefaultProjectForOpenFiles(): boolean {
15861590
return someIterator(
15871591
this.projectService.openFiles.keys(),
1588-
fileName => this.getScriptInfo(fileName)?.getDefaultProject() === this);
1592+
fileName => {
1593+
const info = this.getScriptInfo(fileName);
1594+
return !!info?.containingProjects.length && info.getDefaultProject() === this;
1595+
});
15891596
}
15901597
}
15911598

‎src/server/scriptInfo.ts

+17-8
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ namespace ts.server {
298298
* @internal
299299
* Projects whose auto-import providers include this file
300300
*/
301-
containedAsAuxiliaryFile: Project[] | undefined;
301+
private auxiliaryFileContainingProjects: Project[] | undefined;
302302
private formatSettings: FormatCodeSettings | undefined;
303303
private preferences: protocol.UserPreferences | undefined;
304304

@@ -439,7 +439,7 @@ namespace ts.server {
439439
attachToProjectAsAuxiliaryFile(project: Project) {
440440
const isNew = !this.isAttachedAsAuxiliaryFile(project);
441441
if (isNew) {
442-
this.containedAsAuxiliaryFile = append(this.containedAsAuxiliaryFile, project);
442+
this.auxiliaryFileContainingProjects = append(this.auxiliaryFileContainingProjects, project);
443443
}
444444
return isNew;
445445
}
@@ -450,8 +450,8 @@ namespace ts.server {
450450

451451
/*@internal*/
452452
isAttachedAsAuxiliaryFile(project: Project): boolean {
453-
return !!this.containedAsAuxiliaryFile
454-
&& this.isContainedBy(project, this.containedAsAuxiliaryFile);
453+
return !!this.auxiliaryFileContainingProjects
454+
&& this.isContainedBy(project, this.auxiliaryFileContainingProjects);
455455
}
456456

457457
/*@internal*/
@@ -471,8 +471,8 @@ namespace ts.server {
471471

472472
/*@internal*/
473473
detachFromProjectAsAuxiliaryFile(project: Project) {
474-
if (this.containedAsAuxiliaryFile) {
475-
this.removeFromContainingProject(project, this.containedAsAuxiliaryFile, /*invokeProjectCallback*/ false);
474+
if (this.auxiliaryFileContainingProjects) {
475+
this.removeFromContainingProject(project, this.auxiliaryFileContainingProjects, /*invokeProjectCallback*/ false);
476476
}
477477
}
478478

@@ -529,7 +529,7 @@ namespace ts.server {
529529
}
530530
}
531531
clear(this.containingProjects);
532-
this.containedAsAuxiliaryFile = undefined;
532+
this.auxiliaryFileContainingProjects = undefined;
533533
}
534534

535535
getDefaultProject() {
@@ -576,6 +576,14 @@ namespace ts.server {
576576
}
577577
}
578578

579+
/**
580+
* @internal
581+
* Gets projects whose auto-import providers include this file
582+
*/
583+
getAuxiliaryFileContainingProjects() {
584+
return this.auxiliaryFileContainingProjects;
585+
}
586+
579587
registerFileUpdate(): void {
580588
for (const p of this.containingProjects) {
581589
p.registerFileUpdate(this.path);
@@ -653,8 +661,9 @@ namespace ts.server {
653661
return !forEach(this.containingProjects, p => !p.isOrphan());
654662
}
655663

664+
/*@internal*/
656665
isContainedAsAuxiliaryFile() {
657-
return !!this.containedAsAuxiliaryFile?.length;
666+
return !!this.auxiliaryFileContainingProjects?.length;
658667
}
659668

660669
/**

‎src/services/codefixes/importFixes.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ namespace ts.codefix {
227227

228228
function getAllReExportingModules(importingFile: SourceFile, exportedSymbol: Symbol, exportingModuleSymbol: Symbol, symbolName: string, host: LanguageServiceHost, program: Program, autoImportProvider: Program | undefined): readonly SymbolExportInfo[] {
229229
const result: SymbolExportInfo[] = [];
230-
const checker = program.getTypeChecker();
231230
const compilerOptions = program.getCompilerOptions();
232-
forEachExternalModuleFromEachAutoImportProvider(program, autoImportProvider, host, importingFile, /*filterByPackageJson*/ false, (moduleSymbol, moduleFile) => {
231+
forEachExternalModuleToImportFrom(program, autoImportProvider, host, importingFile, /*filterByPackageJson*/ false, (moduleSymbol, moduleFile, program) => {
232+
const checker = program.getTypeChecker();
233233
// Don't import from a re-export when looking "up" like to `./index` or `../index`.
234234
if (moduleFile && moduleSymbol !== exportingModuleSymbol && startsWith(importingFile.fileName, getDirectoryPath(moduleFile.fileName))) {
235235
return;
@@ -523,7 +523,7 @@ namespace ts.codefix {
523523
function addSymbol(moduleSymbol: Symbol, exportedSymbol: Symbol, importKind: ImportKind): void {
524524
originalSymbolToExportInfos.add(getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol, importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
525525
}
526-
forEachExternalModuleFromEachAutoImportProvider(program, autoImportProvider, host, sourceFile, /*filterByPackageJson*/ true, moduleSymbol => {
526+
forEachExternalModuleToImportFrom(program, autoImportProvider, host, sourceFile, /*filterByPackageJson*/ true, moduleSymbol => {
527527
cancellationToken.throwIfCancellationRequested();
528528

529529
const defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions());
@@ -788,23 +788,23 @@ namespace ts.codefix {
788788
return some(declarations, decl => !!(getMeaningFromDeclaration(decl) & meaning));
789789
}
790790

791-
export function forEachExternalModuleFromEachAutoImportProvider(
791+
export function forEachExternalModuleToImportFrom(
792792
program: Program,
793793
autoImportProvider: Program | undefined,
794794
host: LanguageServiceHost,
795795
from: SourceFile,
796796
filterByPackageJson: boolean,
797797
cb: (module: Symbol, moduleFile: SourceFile | undefined, program: Program) => void,
798798
) {
799-
forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, (module, file) => cb(module, file, program));
799+
forEachExternalModuleToImportFromInProgram(program, host, from, filterByPackageJson, (module, file) => cb(module, file, program));
800800
if (autoImportProvider) {
801801
const start = timestamp();
802-
forEachExternalModuleToImportFrom(autoImportProvider, host, from, filterByPackageJson, (module, file) => cb(module, file, autoImportProvider));
802+
forEachExternalModuleToImportFromInProgram(autoImportProvider, host, from, filterByPackageJson, (module, file) => cb(module, file, autoImportProvider));
803803
host.log?.(`forEachExternalModuleToImportFrom autoImportProvider: ${timestamp() - start}`);
804804
}
805805
}
806806

807-
function forEachExternalModuleToImportFrom(
807+
function forEachExternalModuleToImportFromInProgram(
808808
program: Program,
809809
host: LanguageServiceHost,
810810
from: SourceFile,

‎src/services/completions.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1620,12 +1620,13 @@ namespace ts.Completions {
16201620
/** Ids present in `results` for faster lookup */
16211621
const resultSymbolIds = createMap<true>();
16221622

1623-
codefix.forEachExternalModuleFromEachAutoImportProvider(program, autoImportProvider, host, sourceFile, !detailsEntryId, moduleSymbol => {
1623+
codefix.forEachExternalModuleToImportFrom(program, autoImportProvider, host, sourceFile, !detailsEntryId, (moduleSymbol, _, program) => {
16241624
// Perf -- ignore other modules if this is a request for details
16251625
if (detailsEntryId && detailsEntryId.source && stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
16261626
return;
16271627
}
16281628

1629+
const typeChecker = program.getTypeChecker();
16291630
const resolvedModuleSymbol = typeChecker.resolveExternalModuleSymbol(moduleSymbol);
16301631
// resolvedModuleSymbol may be a namespace. A namespace may be `export =` by multiple module declarations, but only keep the first one.
16311632
if (!addToSeen(seenResolvedModules, getSymbolId(resolvedModuleSymbol))) {

‎tests/baselines/reference/api/tsserverlibrary.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8944,7 +8944,7 @@ declare namespace ts.server {
89448944
private getOrCreateScriptInfoAndAttachToProject;
89458945
getScriptKind(fileName: string): ScriptKind;
89468946
getScriptVersion(filename: string): string;
8947-
getScriptSnapshot(filename: string): IScriptSnapshot | undefined;
8947+
getScriptSnapshot(filename: string, isAuxiliaryFile?: boolean): IScriptSnapshot | undefined;
89488948
getCancellationToken(): HostCancellationToken;
89498949
getCurrentDirectory(): string;
89508950
getDefaultLibFileName(): string;
@@ -9020,7 +9020,6 @@ declare namespace ts.server {
90209020
private enableProxy;
90219021
/** Starts a new check for diagnostics. Call this if some file has updated that would cause diagnostics to be changed. */
90229022
refreshDiagnostics(): void;
9023-
private watchPackageJsonFile;
90249023
}
90259024
/**
90269025
* If a file is opened and no tsconfig (or jsconfig) is found,
@@ -9248,6 +9247,7 @@ declare namespace ts.server {
92489247
allowLocalPluginLoads?: boolean;
92499248
typesMapLocation?: string;
92509249
syntaxOnly?: boolean;
9250+
usePackageJsonAutoImportProvider?: boolean;
92519251
}
92529252
export class ProjectService {
92539253
private readonly scriptInfoInNodeModulesWatchers;

0 commit comments

Comments
 (0)