Clean up naming, @internal marking, and fix empty project creation bug

andrewbranch · andrewbranch · commit 86151e118482 · 2020-06-03T14:50:06.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -861,7 +861,7 @@ namespace ts {
             forEach(rootNames, name => processRootFile(name, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false));
 
             // load type declarations specified via 'types' argument or implicitly from types/ and node_modules/@types folders
-            const typeReferences: string[] = getAutomaticTypeDirectiveNames(options, host);
+            const typeReferences: string[] = rootNames.length ? getAutomaticTypeDirectiveNames(options, host) : emptyArray;
 
             if (typeReferences.length) {
                 // This containingFilename needs to match with the one used in managed-side
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -674,6 +674,7 @@ namespace ts.server {
         /*@internal*/
         readonly watchFactory: WatchFactory<WatchType, Project>;
 
+        /*@internal*/
         readonly usePackageJsonAutoImportProvider: boolean;
         /*@internal*/
         readonly packageJsonCache: PackageJsonCache;
@@ -1091,7 +1092,7 @@ namespace ts.server {
                 this.logger.msg(`Error: got watch notification for unknown file: ${fileName}`);
             }
             else {
-                info.containedAsAuxiliaryFile?.forEach(p => p.markAutoImportProviderAsDirty());
+                info.getAuxiliaryFileContainingProjects()?.forEach(p => p.markAutoImportProviderAsDirty());
                 if (info.containingProjects) {
                     info.containingProjects.forEach(project => project.resolutionCache.removeResolutionsFromProjectReferenceRedirects(info.path));
                 }
@@ -3718,6 +3719,7 @@ namespace ts.server {
             return result;
         }
 
+        /*@internal*/
         private watchPackageJsonFile(path: Path, watchOptions: WatchOptions | undefined) {
             const watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = createMap());
             if (!watchers.has(path)) {
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -188,6 +188,7 @@ namespace ts.server {
          */
         private projectStateVersion = 0;
 
+        /*@internal*/
         private autoImportProgramVersion = 0;
 
         protected isInitialLoadPending: () => boolean = returnFalse;
@@ -345,6 +346,7 @@ namespace ts.server {
             return this.projectStateVersion.toString();
         }
 
+        /*@internal*/
         getPackageJsonAutoImportProviderVersion() {
             return this.autoImportProgramVersion.toString();
         }
@@ -930,6 +932,7 @@ namespace ts.server {
             }
         }
 
+        /*@internal*/
         markAutoImportProviderAsDirty() {
             this.autoImportProgramVersion++;
         }
@@ -1577,6 +1580,7 @@ namespace ts.server {
             return this.importSuggestionsCache;
         }
 
+        /*@internal*/
         usePackageJsonAutoImportProvider() {
             return this.projectService.usePackageJsonAutoImportProvider && this.isDefaultProjectForOpenFiles();
         }
@@ -1585,7 +1589,10 @@ namespace ts.server {
         private isDefaultProjectForOpenFiles(): boolean {
             return someIterator(
                 this.projectService.openFiles.keys(),
-                fileName => this.getScriptInfo(fileName)?.getDefaultProject() === this);
+                fileName => {
+                    const info = this.getScriptInfo(fileName);
+                    return !!info?.containingProjects.length && info.getDefaultProject() === this;
+                });
         }
     }
 
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
@@ -298,7 +298,7 @@ namespace ts.server {
          * @internal
          * Projects whose auto-import providers include this file
          */
-        containedAsAuxiliaryFile: Project[] | undefined;
+        private auxiliaryFileContainingProjects: Project[] | undefined;
         private formatSettings: FormatCodeSettings | undefined;
         private preferences: protocol.UserPreferences | undefined;
 
@@ -439,7 +439,7 @@ namespace ts.server {
         attachToProjectAsAuxiliaryFile(project: Project) {
             const isNew = !this.isAttachedAsAuxiliaryFile(project);
             if (isNew) {
-                this.containedAsAuxiliaryFile = append(this.containedAsAuxiliaryFile, project);
+                this.auxiliaryFileContainingProjects = append(this.auxiliaryFileContainingProjects, project);
             }
             return isNew;
         }
@@ -450,8 +450,8 @@ namespace ts.server {
 
         /*@internal*/
         isAttachedAsAuxiliaryFile(project: Project): boolean {
-            return !!this.containedAsAuxiliaryFile
-                && this.isContainedBy(project, this.containedAsAuxiliaryFile);
+            return !!this.auxiliaryFileContainingProjects
+                && this.isContainedBy(project, this.auxiliaryFileContainingProjects);
         }
 
         /*@internal*/
@@ -471,8 +471,8 @@ namespace ts.server {
 
         /*@internal*/
         detachFromProjectAsAuxiliaryFile(project: Project) {
-            if (this.containedAsAuxiliaryFile) {
-                this.removeFromContainingProject(project, this.containedAsAuxiliaryFile, /*invokeProjectCallback*/ false);
+            if (this.auxiliaryFileContainingProjects) {
+                this.removeFromContainingProject(project, this.auxiliaryFileContainingProjects, /*invokeProjectCallback*/ false);
             }
         }
 
@@ -529,7 +529,7 @@ namespace ts.server {
                 }
             }
             clear(this.containingProjects);
-            this.containedAsAuxiliaryFile = undefined;
+            this.auxiliaryFileContainingProjects = undefined;
         }
 
         getDefaultProject() {
@@ -576,6 +576,14 @@ namespace ts.server {
             }
         }
 
+        /**
+         * @internal
+         * Gets projects whose auto-import providers include this file
+         */
+        getAuxiliaryFileContainingProjects() {
+            return this.auxiliaryFileContainingProjects;
+        }
+
         registerFileUpdate(): void {
             for (const p of this.containingProjects) {
                 p.registerFileUpdate(this.path);
@@ -653,8 +661,9 @@ namespace ts.server {
             return !forEach(this.containingProjects, p => !p.isOrphan());
         }
 
+        /*@internal*/
         isContainedAsAuxiliaryFile() {
-            return !!this.containedAsAuxiliaryFile?.length;
+            return !!this.auxiliaryFileContainingProjects?.length;
         }
 
         /**
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -227,9 +227,9 @@ namespace ts.codefix {
 
     function getAllReExportingModules(importingFile: SourceFile, exportedSymbol: Symbol, exportingModuleSymbol: Symbol, symbolName: string, host: LanguageServiceHost, program: Program, autoImportProvider: Program | undefined): readonly SymbolExportInfo[] {
         const result: SymbolExportInfo[] = [];
-        const checker = program.getTypeChecker();
         const compilerOptions = program.getCompilerOptions();
-        forEachExternalModuleFromEachAutoImportProvider(program, autoImportProvider, host, importingFile, /*filterByPackageJson*/ false, (moduleSymbol, moduleFile) => {
+        forEachExternalModuleToImportFrom(program, autoImportProvider, host, importingFile, /*filterByPackageJson*/ false, (moduleSymbol, moduleFile, program) => {
+            const checker = program.getTypeChecker();
             // Don't import from a re-export when looking "up" like to `./index` or `../index`.
             if (moduleFile && moduleSymbol !== exportingModuleSymbol && startsWith(importingFile.fileName, getDirectoryPath(moduleFile.fileName))) {
                 return;
@@ -523,7 +523,7 @@ namespace ts.codefix {
         function addSymbol(moduleSymbol: Symbol, exportedSymbol: Symbol, importKind: ImportKind): void {
             originalSymbolToExportInfos.add(getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol, importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
         }
-        forEachExternalModuleFromEachAutoImportProvider(program, autoImportProvider, host, sourceFile, /*filterByPackageJson*/ true, moduleSymbol => {
+        forEachExternalModuleToImportFrom(program, autoImportProvider, host, sourceFile, /*filterByPackageJson*/ true, moduleSymbol => {
             cancellationToken.throwIfCancellationRequested();
 
             const defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions());
@@ -788,23 +788,23 @@ namespace ts.codefix {
         return some(declarations, decl => !!(getMeaningFromDeclaration(decl) & meaning));
     }
 
-    export function forEachExternalModuleFromEachAutoImportProvider(
+    export function forEachExternalModuleToImportFrom(
         program: Program,
         autoImportProvider: Program | undefined,
         host: LanguageServiceHost,
         from: SourceFile,
         filterByPackageJson: boolean,
         cb: (module: Symbol, moduleFile: SourceFile | undefined, program: Program) => void,
     ) {
-        forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, (module, file) => cb(module, file, program));
+        forEachExternalModuleToImportFromInProgram(program, host, from, filterByPackageJson, (module, file) => cb(module, file, program));
         if (autoImportProvider) {
             const start = timestamp();
-            forEachExternalModuleToImportFrom(autoImportProvider, host, from, filterByPackageJson, (module, file) => cb(module, file, autoImportProvider));
+            forEachExternalModuleToImportFromInProgram(autoImportProvider, host, from, filterByPackageJson, (module, file) => cb(module, file, autoImportProvider));
             host.log?.(`forEachExternalModuleToImportFrom autoImportProvider: ${timestamp() - start}`);
         }
     }
 
-    function forEachExternalModuleToImportFrom(
+    function forEachExternalModuleToImportFromInProgram(
         program: Program,
         host: LanguageServiceHost,
         from: SourceFile,
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -1620,12 +1620,13 @@ namespace ts.Completions {
             /** Ids present in `results` for faster lookup */
             const resultSymbolIds = createMap<true>();
 
-            codefix.forEachExternalModuleFromEachAutoImportProvider(program, autoImportProvider, host, sourceFile, !detailsEntryId, moduleSymbol => {
+            codefix.forEachExternalModuleToImportFrom(program, autoImportProvider, host, sourceFile, !detailsEntryId, (moduleSymbol, _, program) => {
                 // Perf -- ignore other modules if this is a request for details
                 if (detailsEntryId && detailsEntryId.source && stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
                     return;
                 }
 
+                const typeChecker = program.getTypeChecker();
                 const resolvedModuleSymbol = typeChecker.resolveExternalModuleSymbol(moduleSymbol);
                 // resolvedModuleSymbol may be a namespace. A namespace may be `export =` by multiple module declarations, but only keep the first one.
                 if (!addToSeen(seenResolvedModules, getSymbolId(resolvedModuleSymbol))) {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -8944,7 +8944,7 @@ declare namespace ts.server {
         private getOrCreateScriptInfoAndAttachToProject;
         getScriptKind(fileName: string): ScriptKind;
         getScriptVersion(filename: string): string;
-        getScriptSnapshot(filename: string): IScriptSnapshot | undefined;
+        getScriptSnapshot(filename: string, isAuxiliaryFile?: boolean): IScriptSnapshot | undefined;
         getCancellationToken(): HostCancellationToken;
         getCurrentDirectory(): string;
         getDefaultLibFileName(): string;
@@ -9020,7 +9020,6 @@ declare namespace ts.server {
         private enableProxy;
         /** Starts a new check for diagnostics. Call this if some file has updated that would cause diagnostics to be changed. */
         refreshDiagnostics(): void;
-        private watchPackageJsonFile;
     }
     /**
      * If a file is opened and no tsconfig (or jsconfig) is found,
@@ -9248,6 +9247,7 @@ declare namespace ts.server {
         allowLocalPluginLoads?: boolean;
         typesMapLocation?: string;
         syntaxOnly?: boolean;
+        usePackageJsonAutoImportProvider?: boolean;
     }
     export class ProjectService {
         private readonly scriptInfoInNodeModulesWatchers;

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ namespace ts.server {`
`188`	`188`	`*/`
`189`	`189`	`private projectStateVersion = 0;`
`190`	`190`
	`191`	`+ /@internal/`
`191`	`192`	`private autoImportProgramVersion = 0;`
`192`	`193`
`193`	`194`	`protected isInitialLoadPending: () => boolean = returnFalse;`
`@@ -345,6 +346,7 @@ namespace ts.server {`
`345`	`346`	`return this.projectStateVersion.toString();`
`346`	`347`	`}`
`347`	`348`
	`349`	`+ /@internal/`
`348`	`350`	`getPackageJsonAutoImportProviderVersion() {`
`349`	`351`	`return this.autoImportProgramVersion.toString();`
`350`	`352`	`}`
`@@ -930,6 +932,7 @@ namespace ts.server {`
`930`	`932`	`}`
`931`	`933`	`}`
`932`	`934`
	`935`	`+ /@internal/`
`933`	`936`	`markAutoImportProviderAsDirty() {`
`934`	`937`	`this.autoImportProgramVersion++;`
`935`	`938`	`}`
`@@ -1577,6 +1580,7 @@ namespace ts.server {`
`1577`	`1580`	`return this.importSuggestionsCache;`
`1578`	`1581`	`}`
`1579`	`1582`
	`1583`	`+ /@internal/`
`1580`	`1584`	`usePackageJsonAutoImportProvider() {`
`1581`	`1585`	`return this.projectService.usePackageJsonAutoImportProvider && this.isDefaultProjectForOpenFiles();`
`1582`	`1586`	`}`
`@@ -1585,7 +1589,10 @@ namespace ts.server {`
`1585`	`1589`	`private isDefaultProjectForOpenFiles(): boolean {`
`1586`	`1590`	`return someIterator(`
`1587`	`1591`	`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`	`+ });`
`1589`	`1596`	`}`
`1590`	`1597`	`}`
`1591`	`1598`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ namespace ts.server {`
`298`	`298`	`* @internal`
`299`	`299`	`* Projects whose auto-import providers include this file`
`300`	`300`	`*/`
`301`		`- containedAsAuxiliaryFile: Project[] \| undefined;`
	`301`	`+ private auxiliaryFileContainingProjects: Project[] \| undefined;`
`302`	`302`	`private formatSettings: FormatCodeSettings \| undefined;`
`303`	`303`	`private preferences: protocol.UserPreferences \| undefined;`
`304`	`304`
`@@ -439,7 +439,7 @@ namespace ts.server {`
`439`	`439`	`attachToProjectAsAuxiliaryFile(project: Project) {`
`440`	`440`	`const isNew = !this.isAttachedAsAuxiliaryFile(project);`
`441`	`441`	`if (isNew) {`
`442`		`- this.containedAsAuxiliaryFile = append(this.containedAsAuxiliaryFile, project);`
	`442`	`+ this.auxiliaryFileContainingProjects = append(this.auxiliaryFileContainingProjects, project);`
`443`	`443`	`}`
`444`	`444`	`return isNew;`
`445`	`445`	`}`
`@@ -450,8 +450,8 @@ namespace ts.server {`
`450`	`450`
`451`	`451`	`/@internal/`
`452`	`452`	`isAttachedAsAuxiliaryFile(project: Project): boolean {`
`453`		`- return !!this.containedAsAuxiliaryFile`
`454`		`- && this.isContainedBy(project, this.containedAsAuxiliaryFile);`
	`453`	`+ return !!this.auxiliaryFileContainingProjects`
	`454`	`+ && this.isContainedBy(project, this.auxiliaryFileContainingProjects);`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`/@internal/`
`@@ -471,8 +471,8 @@ namespace ts.server {`
`471`	`471`
`472`	`472`	`/@internal/`
`473`	`473`	`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);`
`476`	`476`	`}`
`477`	`477`	`}`
`478`	`478`
`@@ -529,7 +529,7 @@ namespace ts.server {`
`529`	`529`	`}`
`530`	`530`	`}`
`531`	`531`	`clear(this.containingProjects);`
`532`		`- this.containedAsAuxiliaryFile = undefined;`
	`532`	`+ this.auxiliaryFileContainingProjects = undefined;`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`getDefaultProject() {`
`@@ -576,6 +576,14 @@ namespace ts.server {`
`576`	`576`	`}`
`577`	`577`	`}`
`578`	`578`
	`579`	`+ /**`
	`580`	`+ * @internal`
	`581`	`+ * Gets projects whose auto-import providers include this file`
	`582`	`+ */`
	`583`	`+ getAuxiliaryFileContainingProjects() {`
	`584`	`+ return this.auxiliaryFileContainingProjects;`
	`585`	`+ }`
	`586`	`+`
`579`	`587`	`registerFileUpdate(): void {`
`580`	`588`	`for (const p of this.containingProjects) {`
`581`	`589`	`p.registerFileUpdate(this.path);`
`@@ -653,8 +661,9 @@ namespace ts.server {`
`653`	`661`	`return !forEach(this.containingProjects, p => !p.isOrphan());`
`654`	`662`	`}`
`655`	`663`
	`664`	`+ /@internal/`
`656`	`665`	`isContainedAsAuxiliaryFile() {`
`657`		`- return !!this.containedAsAuxiliaryFile?.length;`
	`666`	`+ return !!this.auxiliaryFileContainingProjects?.length;`
`658`	`667`	`}`
`659`	`668`
`660`	`669`	`/**`