Skip to content

Remove deprecated FSAC arg #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove deprecated FSAC arg #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8df6d
Remove deprecated FSAC arg
Oct 27, 2022
ae8a93a
Bump version
Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions client/fsac.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<boolean>("server.trace")) {
serverArgs.push("--verbose")
Expand Down Expand Up @@ -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
},
Expand All @@ -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(
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down