From 7a11453e3599a40f41495ac7a656e6e47779b2d0 Mon Sep 17 00:00:00 2001
From: Jason Ramsay <jasonra@microsoft.com>
Date: Wed, 7 Dec 2016 15:45:41 -0800
Subject: [PATCH] Fix merge issues

---
 src/server/editorServices.ts | 4 ++--
 src/server/project.ts        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 19e9d6870bb..44381e9e19f 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -254,12 +254,12 @@ namespace ts.server {
         private readonly directoryWatchers: DirectoryWatchers;
         private readonly throttledOperations: ThrottledOperations;
 
+        private readonly hostConfiguration: HostConfiguration;
+
         private changedFiles: ScriptInfo[];
 
         readonly toCanonicalFileName: (f: string) => string;
 
-        public readonly hostConfiguration: HostConfiguration;
-
         public lastDeletedFile: ScriptInfo;
 
         constructor(public readonly host: ServerHost,
diff --git a/src/server/project.ts b/src/server/project.ts
index 5b20da1dbeb..9df839aad28 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -296,6 +296,9 @@ namespace ts.server {
         }
 
         enableLanguageService() {
+            if (this.languageServiceEnabled) {
+                return;
+            }
             this.languageServiceEnabled = true;
             this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ true);
         }