language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

vscode: moved to getters as per matklad

Browse source
This commit is contained in:
Veetaha 2020-02-14 23:04:50 +02:00
parent fd37151ade
commit 4fb427743c
5 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
editors/code/src/client.ts
View file

@ -10,7 +10,7 @@ export async function createClient(config: Config): Promise<null | lc.LanguageCl
// It might be a good idea to test if the uri points to a file.
const workspaceFolderPath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.';
const langServerPath = await ensureLanguageServerBinary(config.langServerBinarySource());
const langServerPath = await ensureLanguageServerBinary(config.langServerBinarySource);
if (!langServerPath) return null;
const run: lc.Executable = {
@ -24,23 +24,23 @@ export async function createClient(config: Config): Promise<null | lc.LanguageCl
const traceOutputChannel = vscode.window.createOutputChannel(
'Rust Analyzer Language Server Trace',
);
const cargoWatchOpts = config.cargoWatchOptions();
const cargoWatchOpts = config.cargoWatchOptions;
const clientOptions: lc.LanguageClientOptions = {
documentSelector: [{ scheme: 'file', language: 'rust' }],
initializationOptions: {
publishDecorations: true,
lruCapacity: config.lruCapacity(),
maxInlayHintLength: config.maxInlayHintLength(),
lruCapacity: config.lruCapacity,
maxInlayHintLength: config.maxInlayHintLength,
cargoWatchEnable: cargoWatchOpts.enable,
cargoWatchArgs: cargoWatchOpts.arguments,
cargoWatchCommand: cargoWatchOpts.command,
cargoWatchAllTargets: cargoWatchOpts.allTargets,
excludeGlobs: config.excludeGlobs(),
useClientWatching: config.useClientWatching(),
featureFlags: config.featureFlags(),
withSysroot: config.withSysroot(),
cargoFeatures: config.cargoFeatures(),
excludeGlobs: config.excludeGlobs,
useClientWatching: config.useClientWatching,
featureFlags: config.featureFlags,
withSysroot: config.withSysroot,
cargoFeatures: config.cargoFeatures,
},
traceOutputChannel,
};