Skip to content

ensure updated config is synced on use of restart command #438

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

Merged
merged 2 commits into from
May 30, 2022
Merged

ensure updated config is synced on use of restart command #438

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb86231
ensure updated config is synced on use of restart command, and clean …
zth May 30, 2022
008596c
move all needed things into createLanguageClient
zth May 30, 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
31 changes: 15 additions & 16 deletions client/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export function activate(context: ExtensionContext) {
"ReScriptLSP",
"ReScript Language Server",
serverOptions,
clientOptions
createClientOptions()
);
attachCodeAnalysis(client);
return client;
Expand All @@ -122,21 +122,20 @@ export function activate(context: ExtensionContext) {
},
};

// Options to control the language client
let clientOptions: LanguageClientOptions = {
// Register the server for plain text documents
documentSelector: [{ scheme: "file", language: "rescript" }],
synchronize: {
// Notify the server about file changes to '.clientrc files contained in the workspace
fileEvents: workspace.createFileSystemWatcher("**/.clientrc"),
},
// We'll send the initial configuration in here, but this might be
// problematic because every consumer of the LS will need to mimic this.
// We'll leave it like this for now, but might be worth revisiting later on.
initializationOptions: {
extensionConfiguration: workspace.getConfiguration("rescript.settings"),
},
};
function createClientOptions() {
// Options to control the language client
let clientOptions: LanguageClientOptions = {
documentSelector: [{ scheme: "file", language: "rescript" }],
// We'll send the initial configuration in here, but this might be
// problematic because every consumer of the LS will need to mimic this.
// We'll leave it like this for now, but might be worth revisiting later on.
initializationOptions: {
extensionConfiguration: workspace.getConfiguration("rescript.settings"),
},
};

return clientOptions;
}

// Create the language client and start the client.
client = createLanguageClient();
Expand Down