Skip to content

Commit eea2ddd

Browse files
author
Zhengbo Li
authored
Correct default compileOnSave value for different projects (microsoft#10528)
1 parent 84b5fe6 commit eea2ddd

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/server/editorServices.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ namespace ts.server {
712712
this.documentRegistry,
713713
options,
714714
/*languageServiceEnabled*/ !this.exceededTotalSizeLimitForNonTsFiles(options, files, externalFilePropertyReader),
715-
!!options.compileOnSave);
715+
options.compileOnSave === undefined ? true : options.compileOnSave);
716716

717717
const errors = this.addFilesToProjectAndUpdateGraph(project, files, externalFilePropertyReader, /*clientFileName*/ undefined, typingOptions);
718718

@@ -730,7 +730,7 @@ namespace ts.server {
730730
projectOptions.compilerOptions,
731731
projectOptions.wildcardDirectories,
732732
/*languageServiceEnabled*/ !sizeLimitExceeded,
733-
/*compileOnSaveEnabled*/ !!projectOptions.compileOnSave);
733+
projectOptions.compileOnSave === undefined ? false : projectOptions.compileOnSave);
734734

735735
const errors = this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typingOptions);
736736

@@ -877,7 +877,7 @@ namespace ts.server {
877877
const useExistingProject = this.useSingleInferredProject && this.inferredProjects.length;
878878
const project = useExistingProject
879879
? this.inferredProjects[0]
880-
: new InferredProject(this, this.documentRegistry, /*languageServiceEnabled*/ true, this.compilerOptionsForInferredProjects);
880+
: new InferredProject(this, this.documentRegistry, /*languageServiceEnabled*/ true, this.compilerOptionsForInferredProjects, /*compileOnSaveEnabled*/ false);
881881

882882
project.addRoot(root);
883883

src/server/project.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,14 @@ namespace ts.server {
491491
// Used to keep track of what directories are watched for this project
492492
directoriesWatchedForTsconfig: string[] = [];
493493

494-
constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions) {
494+
constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions, public compileOnSaveEnabled: boolean) {
495495
super(ProjectKind.Inferred,
496496
projectService,
497497
documentRegistry,
498498
/*files*/ undefined,
499499
languageServiceEnabled,
500500
compilerOptions,
501-
/*compileOnSaveEnabled*/ false);
501+
compileOnSaveEnabled);
502502

503503
this.inferredProjectName = makeInferredProjectName(InferredProject.NextId);
504504
InferredProject.NextId++;
@@ -540,7 +540,7 @@ namespace ts.server {
540540
compilerOptions: CompilerOptions,
541541
private wildcardDirectories: Map<WatchDirectoryFlags>,
542542
languageServiceEnabled: boolean,
543-
public compileOnSaveEnabled = false) {
543+
public compileOnSaveEnabled: boolean) {
544544
super(ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
545545
}
546546

@@ -628,7 +628,7 @@ namespace ts.server {
628628
documentRegistry: ts.DocumentRegistry,
629629
compilerOptions: CompilerOptions,
630630
languageServiceEnabled: boolean,
631-
public compileOnSaveEnabled = true) {
631+
public compileOnSaveEnabled: boolean) {
632632
super(ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
633633
}
634634

0 commit comments

Comments
 (0)