Use xcrun to find sourcekit-lsp

klaaspieter · klaaspieter · commit f9abcf87f5a7 · 2020-01-09T14:51:09.000+01:00
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ See [sourcekit-lsp].
 |Key|Description|Default|
 |----|------------|-----|
 |`sourcekit.enable`|Enable sourcekit extension|true|
-|sourcekit.commandPath|Path to sourcekit-lsp binary|
+|`sourcekit.commandPath`|Path to sourcekit-lsp binary|Output of `xcrun --toolchain swift --find sourcekit-lsp`|
 
 ## Development
 
diff --git a/src/extension.ts b/src/extension.ts
@@ -19,8 +19,9 @@ export async function activate(context: ExtensionContext): Promise<void> {
     return
   }
 
+ const commandPath = (await workspace.runCommand('xcrun --toolchain swift --find sourcekit-lsp')).trim()
   const serverOptions: ServerOptions = {
-    command: config.commandPath,
+    command: config.commandPath || commandPath,
     transport: TransportKind.stdio
   }
 

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,9 @@ export async function activate(context: ExtensionContext): Promise<void> {`
`19`	`19`	`return`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ const commandPath = (await workspace.runCommand('xcrun --toolchain swift --find sourcekit-lsp')).trim()`
`22`	`23`	`const serverOptions: ServerOptions = {`
`23`		`- command: config.commandPath,`
	`24`	`+ command: config.commandPath \|\| commandPath,`
`24`	`25`	`transport: TransportKind.stdio`
`25`	`26`	`}`
`26`	`27`