Skip to content

Commit e293ef1

Browse files
committed
Make initialLoadPending as property instead of method
1 parent 7268f10 commit e293ef1

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

src/server/editorServices.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ function forEachAncestorProject<T>(
717717
while (true) {
718718
// Skip if project is not composite and we are only looking for solution
719719
if (
720-
!project.isInitialLoadPending() &&
720+
!project.initialLoadPending &&
721721
(
722722
!project.getCompilerOptions().composite ||
723723
project.getCompilerOptions().disableSolutionSearching
@@ -747,7 +747,7 @@ function forEachAncestorProject<T>(
747747

748748
// If this ancestor is new and was delay loaded, then set the project as potential project reference
749749
if (
750-
ancestor.project.isInitialLoadPending() &&
750+
ancestor.project.initialLoadPending &&
751751
project.getCompilerOptions().composite
752752
) {
753753
// Set a potential project reference
@@ -910,7 +910,7 @@ function forEachAnyProjectReferenceKind<T>(
910910
): T | undefined {
911911
return project.getCurrentProgram() ?
912912
project.forEachResolvedProjectReference(cb) :
913-
project.isInitialLoadPending() ?
913+
project.initialLoadPending ?
914914
forEachPotentialProjectReference(project, cbPotentialProjectRef) :
915915
forEach(project.getProjectReferences(), cbProjectRef);
916916
}
@@ -1969,7 +1969,7 @@ export class ProjectService {
19691969
scheduledAnyProjectUpdate = true;
19701970
if (projectCanonicalPath === canonicalConfigFilePath) {
19711971
// Skip refresh if project is not yet loaded
1972-
if (project.isInitialLoadPending()) return;
1972+
if (project.initialLoadPending) return;
19731973
project.pendingUpdateLevel = ProgramUpdateLevel.Full;
19741974
project.pendingUpdateReason = loadReason;
19751975
this.delayUpdateProjectGraph(project);
@@ -2047,7 +2047,7 @@ export class ProjectService {
20472047

20482048
// If this was not already updated, and its new project, schedule for update
20492049
// Existing projects dont need to update if they were not using the changed config in any way
2050-
if (tryAddToSet(updatedProjects, projectForInfo) && projectForInfo.isInitialLoadPending()) {
2050+
if (tryAddToSet(updatedProjects, projectForInfo) && projectForInfo.initialLoadPending) {
20512051
this.delayUpdateProjectGraph(projectForInfo);
20522052
}
20532053
});
@@ -3054,7 +3054,7 @@ export class ProjectService {
30543054
* @internal
30553055
*/
30563056
reloadConfiguredProject(project: ConfiguredProject, reason: string) {
3057-
project.isInitialLoadPending = returnFalse;
3057+
project.initialLoadPending = false;
30583058
project.pendingUpdateReason = undefined;
30593059
project.pendingUpdateLevel = ProgramUpdateLevel.Update;
30603060

@@ -3867,7 +3867,7 @@ export class ProjectService {
38673867
const reason = `Reloading configured project in external project: ${externalProjectName}`;
38683868
projects.forEach(project => {
38693869
if (this.getHostPreferences().lazyConfiguredProjectsFromExternalProject) {
3870-
if (!project.isInitialLoadPending()) {
3870+
if (!project.initialLoadPending) {
38713871
this.clearSemanticCache(project);
38723872
project.pendingUpdateLevel = ProgramUpdateLevel.Full;
38733873
project.pendingUpdateReason = reloadReason(reason);
@@ -4330,7 +4330,7 @@ export class ProjectService {
43304330
/** @internal */
43314331
loadAncestorProjectTree(forProjects?: ReadonlyCollection<string>) {
43324332
forProjects ??= new Set(
4333-
mapDefinedIterator(this.configuredProjects.entries(), ([key, project]) => !project.isInitialLoadPending() ? key : undefined),
4333+
mapDefinedIterator(this.configuredProjects.entries(), ([key, project]) => !project.initialLoadPending ? key : undefined),
43344334
);
43354335

43364336
const seenProjects = new Set<NormalizedPath>();

src/server/project.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ import {
109109
ResolvedTypeReferenceDirectiveWithFailedLookupLocations,
110110
resolvePackageNameToPackageJson,
111111
returnFalse,
112-
returnTrue,
113112
ScriptKind,
114113
some,
115114
sortAndDeduplicate,
@@ -434,7 +433,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
434433

435434
protected projectErrors: Diagnostic[] | undefined;
436435

437-
protected isInitialLoadPending: () => boolean = returnFalse;
436+
/** @internal */
437+
initialLoadPending = false;
438438

439439
/** @internal */
440440
dirty = false;
@@ -1913,7 +1913,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
19131913
}
19141914

19151915
private filesToStringWorker(writeProjectFileNames: boolean, writeFileExplaination: boolean, writeFileVersionAndText: boolean) {
1916-
if (this.isInitialLoadPending()) return "\tFiles (0) InitialLoadPending\n";
1916+
if (this.initialLoadPending) return "\tFiles (0) InitialLoadPending\n";
19171917
if (!this.program) return "\tFiles (0) NoProgram\n";
19181918
const sourceFiles = this.program.getSourceFiles();
19191919
let strBuilder = `\tFiles (${sourceFiles.length})\n`;
@@ -1993,7 +1993,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
19931993
: (files: Map<string, boolean>) => arrayFrom(files.keys());
19941994

19951995
// Update the graph only if initial configured project load is not pending
1996-
if (!this.isInitialLoadPending()) {
1996+
if (!this.initialLoadPending) {
19971997
updateProjectIfDirty(this);
19981998
}
19991999

@@ -2856,7 +2856,7 @@ export class ConfiguredProject extends Project {
28562856
projectOptions?: ProjectOptions | true;
28572857

28582858
/** @internal */
2859-
override isInitialLoadPending: () => boolean = returnTrue;
2859+
override initialLoadPending = true;
28602860

28612861
/** @internal */
28622862
sendLoadingProjectFinish = false;
@@ -2936,7 +2936,7 @@ export class ConfiguredProject extends Project {
29362936
override updateGraph(): boolean {
29372937
if (this.deferredClose) return false;
29382938
const isDirty = this.dirty;
2939-
this.isInitialLoadPending = returnFalse;
2939+
this.initialLoadPending = false;
29402940
const updateLevel = this.pendingUpdateLevel;
29412941
this.pendingUpdateLevel = ProgramUpdateLevel.Update;
29422942
let result: boolean;
@@ -2996,7 +2996,7 @@ export class ConfiguredProject extends Project {
29962996

29972997
/** @internal */
29982998
setPotentialProjectReference(canonicalConfigPath: NormalizedPath) {
2999-
Debug.assert(this.isInitialLoadPending());
2999+
Debug.assert(this.initialLoadPending);
30003000
(this.potentialProjectReferences || (this.potentialProjectReferences = new Set())).add(canonicalConfigPath);
30013001
}
30023002

tests/baselines/reference/api/typescript.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2828,7 +2828,6 @@ declare namespace ts {
28282828
private lastReportedFileNames;
28292829
private lastReportedVersion;
28302830
protected projectErrors: Diagnostic[] | undefined;
2831-
protected isInitialLoadPending: () => boolean;
28322831
private typingsCache;
28332832
private typingWatchers;
28342833
private readonly cancellationToken;

0 commit comments

Comments
 (0)