From 58be3086f37a095658c7dcb4d1e62948856e39a6 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Wed, 8 May 2019 13:42:55 -0700
Subject: [PATCH 1/3] Fix launch.json creation with intelliSenseEngine
 Disabled.

---
 Extension/src/LanguageServer/extension.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
index 6e8206807..50e19b067 100644
--- a/Extension/src/LanguageServer/extension.ts
+++ b/Extension/src/LanguageServer/extension.ts
@@ -150,7 +150,12 @@ export async function getBuildTasks(returnComplerPath: boolean): Promise<vscode.
     // for the active file, remove duplicate compiler names, then finally add the user's compilerPath setting.
     let compilerPaths: string[];
     const isWindows: boolean = os.platform() === 'win32';
-    const activeClient: Client = getActiveClient();
+    let activeClient: Client;
+    try {
+        activeClient = getActiveClient();
+    } catch (e) {
+        return []; // Language Serivice features may be disabled.
+    }
     let userCompilerPath: string = await activeClient.getCompilerPath();
     if (userCompilerPath) {
         userCompilerPath = userCompilerPath.trim();

From 2f7d43c7a8b35b2b3b371f65072d0b11372f6da7 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Wed, 8 May 2019 13:49:38 -0700
Subject: [PATCH 2/3] Change comment.

---
 Extension/src/LanguageServer/extension.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
index 50e19b067..417beb42b 100644
--- a/Extension/src/LanguageServer/extension.ts
+++ b/Extension/src/LanguageServer/extension.ts
@@ -154,7 +154,7 @@ export async function getBuildTasks(returnComplerPath: boolean): Promise<vscode.
     try {
         activeClient = getActiveClient();
     } catch (e) {
-        return []; // Language Serivice features may be disabled.
+        return []; // Language service features may be disabled.
     }
     let userCompilerPath: string = await activeClient.getCompilerPath();
     if (userCompilerPath) {

From b21ee728ebbd792acce5ec7a7581768122372498 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Wed, 8 May 2019 17:12:33 -0700
Subject: [PATCH 3/3] Add error with unexpected exception.

---
 Extension/src/LanguageServer/extension.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
index 417beb42b..9334eb0f5 100644
--- a/Extension/src/LanguageServer/extension.ts
+++ b/Extension/src/LanguageServer/extension.ts
@@ -42,6 +42,7 @@ let buildInfoCache: BuildInfo | null = null;
 const taskSourceStr: string = "C/C++";
 const cppInstallVsixStr: string = 'C/C++: Install vsix -- ';
 let taskProvider: vscode.Disposable;
+const intelliSenseDisabledError: string = "Do not activate the extension when IntelliSense is disabled.";
 
 /**
  * activate: set up the extension for language services
@@ -154,6 +155,9 @@ export async function getBuildTasks(returnComplerPath: boolean): Promise<vscode.
     try {
         activeClient = getActiveClient();
     } catch (e) {
+        if (!e || e.message !== intelliSenseDisabledError) {
+            console.error("Unknown error calling getActiveClient().");
+        }
         return []; // Language service features may be disabled.
     }
     let userCompilerPath: string = await activeClient.getCompilerPath();
@@ -285,7 +289,7 @@ function onActivationEvent(): void {
 
 function realActivation(): void {
     if (new CppSettings().intelliSenseEngine === "Disabled") {
-        throw new Error("Do not activate the extension when IntelliSense is disabled.");
+        throw new Error(intelliSenseDisabledError);
     } else {
         console.log("activating extension");
         let checkForConflictingExtensions: PersistentState<boolean> = new PersistentState<boolean>("CPP." + util.packageJson.version + ".checkForConflictingExtensions", true);