Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 15:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use types from vscode-langaugeclient

Browse source
This commit is contained in:
Emil Lauridsen 2020-01-15 11:47:56 +01:00
parent 876f92d547
commit 70cba0fe0f
3 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editors/code/rollup.config.js
View file

@ -13,7 +13,7 @@ export default {
commonjs({
namedExports: {
// squelch missing import warnings
'vscode-languageclient': ['CreateFile', 'RenameFile', 'ErrorCodes']
'vscode-languageclient': ['CreateFile', 'RenameFile', 'ErrorCodes', 'WorkDoneProgress', 'WorkDoneProgressBegin', 'WorkDoneProgressReport', 'WorkDoneProgressEnd']
}
})
],

2
editors/code/src/inlay_hints.ts
View file

@ -42,7 +42,7 @@ const parameterHintDecorationType = vscode.window.createTextEditorDecorationType
before: {
color: new vscode.ThemeColor('rust_analyzer.inlayHint'),
}
})
});
class HintsUpdater {
private pending: Map<string, vscode.CancellationTokenSource> = new Map();

36
editors/code/src/status_display.ts
View file

@ -1,5 +1,7 @@
import * as vscode from 'vscode';
import { WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd } from 'vscode-languageclient';
import { Ctx } from './ctx';
const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
@ -8,7 +10,7 @@ export function activateStatusDisplay(ctx: Ctx) {
const statusDisplay = new StatusDisplay(ctx.config.cargoWatchOptions.command);
ctx.pushCleanup(statusDisplay);
ctx.onDidRestart(client => {
client.onNotification('$/progress', params => statusDisplay.handleProgressNotification(params));
client.onProgress(WorkDoneProgress.type, 'rustAnalyzer/cargoWatcher', params => statusDisplay.handleProgressNotification(params));
});
}
@ -63,20 +65,15 @@ class StatusDisplay implements vscode.Disposable {
this.statusBarItem.dispose();
}
handleProgressNotification(params: ProgressParams) {
const { token, value } = params;
if (token !== 'rustAnalyzer/cargoWatcher') {
return;
}
switch (value.kind) {
handleProgressNotification(params: WorkDoneProgressBegin | WorkDoneProgressReport | WorkDoneProgressEnd) {
switch (params.kind) {
case 'begin':
this.show();
break;
case 'report':
if (value.message) {
this.packageName = value.message;
if (params.message) {
this.packageName = params.message;
}
break;
@ -90,22 +87,3 @@ class StatusDisplay implements vscode.Disposable {
return spinnerFrames[(this.i = ++this.i % spinnerFrames.length)];
}
}
// FIXME: Replace this once vscode-languageclient is updated to LSP 3.15
interface ProgressParams {
token: string;
value: WorkDoneProgress;
}
enum WorkDoneProgressKind {
Begin = 'begin',
Report = 'report',
End = 'end',
}
interface WorkDoneProgress {
kind: WorkDoneProgressKind;
message?: string;
cancelable?: boolean;
percentage?: string;
}