From 7f2b4e6a455a6069dbe875ce067e4aa497893441 Mon Sep 17 00:00:00 2001
From: Valentin Knabel <dev@vknabel.com>
Date: Mon, 20 Jan 2020 11:12:16 +0100
Subject: [PATCH] [vknabel/sourcekite#9] Fixed ignored ToolchainPath

---
 CHANGELOG.md         | 6 +++++-
 package.json         | 2 +-
 src/server/server.ts | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8268d90..59ba6e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
+## 2.8.3
+
+- Fixed ignored Toolchain Path [vknabel/sourcekite#9](https://github.com/vknabel/sourcekite/issues/9)
+
 ## 2.8.2
 
-- Fixed diagnostics not being shown [#58](https://github.com/vknabel/sourcekite/issues/58) [#57](https://github.com/vknabel/vscode-swift-development-environment/issues/57)
+- Fixed diagnostics not being shown [#58](https://github.com/vknabel/vscode-swift-development-environment/issues/58) [#57](https://github.com/vknabel/vscode-swift-development-environment/issues/57)
 
 ## 2.8.1
 
diff --git a/package.json b/package.json
index 2cbb0f9..3dc863e 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/vknabel"
   },
   "license": "Apache-2.0",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "publisher": "vknabel",
   "icon": "icons/icon.png",
   "galleryBanner": {
diff --git a/src/server/server.ts b/src/server/server.ts
index 0691959..9243325 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -71,6 +71,7 @@ connection.onInitialize(
       uri.replace("file://", "")
     );
     skProtocolPath = params.initializationOptions.skProtocolProcess;
+    Current.config.toolchainPath = params.initializationOptions.toolchainPath;
     skProtocolProcessAsShellCmd =
       params.initializationOptions.skProtocolProcessAsShellCmd;
     skCompilerOptions = params.initializationOptions.skCompilerOptions;
@@ -136,7 +137,6 @@ connection.onDidChangeConfiguration(change => {
   Current.config.swiftPath = sdeSettings.path.swift_driver_bin;
   Current.config.shellPath = sdeSettings.path.shell || "/bin/bash";
   Current.config.targets = sdeSettings.targets || [];
-  Current.config.toolchainPath = sdeSettings.toolchainPath || null;
 
   Current.log(`-->onDidChangeConfiguration tracing:
 	    swiftDiverBinPath=[${Current.config.swiftPath}],