Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit 7f2b4e6

Browse files
committed
[vknabel/sourcekite#9] Fixed ignored ToolchainPath
1 parent b1442c7 commit 7f2b4e6

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# Changelog
22

3+
## 2.8.3
4+
5+
- Fixed ignored Toolchain Path [vknabel/sourcekite#9](https://github.com/vknabel/sourcekite/issues/9)
6+
37
## 2.8.2
48

5-
- Fixed diagnostics not being shown [#58](https://github.com/vknabel/sourcekite/issues/58) [#57](https://github.com/vknabel/vscode-swift-development-environment/issues/57)
9+
- 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)
610

711
## 2.8.1
812

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://github.com/vknabel"
99
},
1010
"license": "Apache-2.0",
11-
"version": "2.8.2",
11+
"version": "2.8.3",
1212
"publisher": "vknabel",
1313
"icon": "icons/icon.png",
1414
"galleryBanner": {

src/server/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ connection.onInitialize(
7171
uri.replace("file://", "")
7272
);
7373
skProtocolPath = params.initializationOptions.skProtocolProcess;
74+
Current.config.toolchainPath = params.initializationOptions.toolchainPath;
7475
skProtocolProcessAsShellCmd =
7576
params.initializationOptions.skProtocolProcessAsShellCmd;
7677
skCompilerOptions = params.initializationOptions.skCompilerOptions;
@@ -136,7 +137,6 @@ connection.onDidChangeConfiguration(change => {
136137
Current.config.swiftPath = sdeSettings.path.swift_driver_bin;
137138
Current.config.shellPath = sdeSettings.path.shell || "/bin/bash";
138139
Current.config.targets = sdeSettings.targets || [];
139-
Current.config.toolchainPath = sdeSettings.toolchainPath || null;
140140

141141
Current.log(`-->onDidChangeConfiguration tracing:
142142
swiftDiverBinPath=[${Current.config.swiftPath}],

0 commit comments

Comments
 (0)