From eb8df6d72015d4b4ef2a6efcc9118bd6e0546dff Mon Sep 17 00:00:00 2001 From: leonardoi Date: Thu, 27 Oct 2022 10:58:07 -0300 Subject: [PATCH 1/2] Remove deprecated FSAC arg --- client/fsac.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/fsac.ts b/client/fsac.ts index c5b83fa..8e69822 100644 --- a/client/fsac.ts +++ b/client/fsac.ts @@ -61,7 +61,7 @@ export default class FSAC { const config = workspace.getConfiguration('FSharp') let verbose = false; let statePath = path.join(workspace.cwd, ".coc-fsharp") - let serverArgs = [languageServerExe, "--background-service-enabled", "--state-directory", statePath] + let serverArgs = [languageServerExe, "--state-directory", statePath] if (config.get("server.trace")) { serverArgs.push("--verbose") @@ -105,9 +105,9 @@ export default class FSAC { ], }, initializationOptions: { - // setting it to true will start Workspace Loading without need to run fsharp/workspacePeek and fsharp/workspaceLoad commands. - // It will always choose top workspace from the found list - all projects in workspace if 0 .sln files are found, .sln file - // if 1 .sln file was found, .sln file with most projects if multiple .sln files were found. It's designed to be used in clients + // setting it to true will start Workspace Loading without need to run fsharp/workspacePeek and fsharp/workspaceLoad commands. + // It will always choose top workspace from the found list - all projects in workspace if 0 .sln files are found, .sln file + // if 1 .sln file was found, .sln file with most projects if multiple .sln files were found. It's designed to be used in clients // that doesn't allow to create custom UI for selecting workspaces. AutomaticWorkspaceInit: autoInit }, @@ -118,13 +118,13 @@ export default class FSAC { FSAC.client = new LanguageClient('fsharp', 'FsAutoComplete Language Server', serverOptions, clientOptions); FSAC.clientDisposable = FSAC.client.start(); FSAC.client.onReady().then(() => { - FSAC.client.onNotification("fsharp/notifyWorkspace", (p) => { + FSAC.client.onNotification("fsharp/notifyWorkspace", (p) => { let content = JSON.parse(p.content) - server_outputchannel.appendLine(`[notifyWorkspace]: ${JSON.stringify(content)}`) + server_outputchannel.appendLine(`[notifyWorkspace]: ${JSON.stringify(content)}`) }); }); - // Push the disposable to the context's subscriptions so that the + // Push the disposable to the context's subscriptions so that the // client can be deactivated on extension deactivation context.subscriptions.push(FSAC.clientDisposable); context.subscriptions.push( @@ -156,8 +156,8 @@ export default class FSAC { return `Directory: ${v.Data.Directory} (${v.Data.Fsprojs.length} projects)` } }) - let items = await ( async () => { - let selected = x.Data.Found[await window.showMenuPicker(entryNames, "F# Workspace Peek")] + let items = await ( async () => { + let selected = x.Data.Found[await window.showMenuPicker(entryNames, "F# Workspace Peek")] if (selected.Type == "solution") { return [TextDocumentIdentifier.create(Uri.file(selected.Data.Path).toString())] } else { From ae8a93acebc054b1a5e2d309c2755dfac6803aeb Mon Sep 17 00:00:00 2001 From: leonardoi Date: Thu, 27 Oct 2022 11:08:32 -0300 Subject: [PATCH 2/2] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f4553d..c1419e4 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Yatao Li", "license": "MIT", "icon": "Icon512.png", - "version": "0.3.5", + "version": "0.3.6", "publisher": "yatli", "repository": { "type": "git",