From eea2dddfe13879f09369ac4186605e83fa01c013 Mon Sep 17 00:00:00 2001 From: Zhengbo Li Date: Thu, 25 Aug 2016 10:46:41 -0700 Subject: [PATCH] Correct default compileOnSave value for different projects (#10528) --- src/server/editorServices.ts | 6 +++--- src/server/project.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 68390ce3c36..ba2d4386a75 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -712,7 +712,7 @@ namespace ts.server { this.documentRegistry, options, /*languageServiceEnabled*/ !this.exceededTotalSizeLimitForNonTsFiles(options, files, externalFilePropertyReader), - !!options.compileOnSave); + options.compileOnSave === undefined ? true : options.compileOnSave); const errors = this.addFilesToProjectAndUpdateGraph(project, files, externalFilePropertyReader, /*clientFileName*/ undefined, typingOptions); @@ -730,7 +730,7 @@ namespace ts.server { projectOptions.compilerOptions, projectOptions.wildcardDirectories, /*languageServiceEnabled*/ !sizeLimitExceeded, - /*compileOnSaveEnabled*/ !!projectOptions.compileOnSave); + projectOptions.compileOnSave === undefined ? false : projectOptions.compileOnSave); const errors = this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typingOptions); @@ -877,7 +877,7 @@ namespace ts.server { const useExistingProject = this.useSingleInferredProject && this.inferredProjects.length; const project = useExistingProject ? this.inferredProjects[0] - : new InferredProject(this, this.documentRegistry, /*languageServiceEnabled*/ true, this.compilerOptionsForInferredProjects); + : new InferredProject(this, this.documentRegistry, /*languageServiceEnabled*/ true, this.compilerOptionsForInferredProjects, /*compileOnSaveEnabled*/ false); project.addRoot(root); diff --git a/src/server/project.ts b/src/server/project.ts index 21694e0ea32..8d12c418ac1 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -491,14 +491,14 @@ namespace ts.server { // Used to keep track of what directories are watched for this project directoriesWatchedForTsconfig: string[] = []; - constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions) { + constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions, public compileOnSaveEnabled: boolean) { super(ProjectKind.Inferred, projectService, documentRegistry, /*files*/ undefined, languageServiceEnabled, compilerOptions, - /*compileOnSaveEnabled*/ false); + compileOnSaveEnabled); this.inferredProjectName = makeInferredProjectName(InferredProject.NextId); InferredProject.NextId++; @@ -540,7 +540,7 @@ namespace ts.server { compilerOptions: CompilerOptions, private wildcardDirectories: Map, languageServiceEnabled: boolean, - public compileOnSaveEnabled = false) { + public compileOnSaveEnabled: boolean) { super(ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled); } @@ -628,7 +628,7 @@ namespace ts.server { documentRegistry: ts.DocumentRegistry, compilerOptions: CompilerOptions, languageServiceEnabled: boolean, - public compileOnSaveEnabled = true) { + public compileOnSaveEnabled: boolean) { super(ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, languageServiceEnabled, compilerOptions, compileOnSaveEnabled); }