aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-28 17:43:51 +0000
committerGitHub <[email protected]>2021-01-28 17:43:51 +0000
commit703e6bfdb6d7db87318a8f7c3b5c8c96283ee379 (patch)
tree479c972997987d535c84d8cb03ab0c05d935a280 /editors/code
parent00b9b2d6458d20e15e602e659cafe6c09765c5ae (diff)
parentd069ef60b6d46925bebbb7bb0b59953ef38153a2 (diff)
Merge #7412
7412: Async loading for outdir and proc-macro r=maklad a=edwin0cheng cc #7328 ![Peek 2021-01-24 02-04](https://user-images.githubusercontent.com/11014119/105610083-8f208100-5de8-11eb-8e96-c2d4e349b352.gif) [Edit] ~~Finding a way to know when the workspace and build data are loaded...~~ [Edit 2] Not perfect solution, but seem to work now. Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/src/ctx.ts6
-rw-r--r--editors/code/src/lsp_ext.ts2
2 files changed, 7 insertions, 1 deletions
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index e7585184b..c07583cfa 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -74,6 +74,12 @@ export class Ctx {
74 this.statusBar.command = undefined; 74 this.statusBar.command = undefined;
75 this.statusBar.color = undefined; 75 this.statusBar.color = undefined;
76 break; 76 break;
77 case "readyPartial":
78 this.statusBar.text = "rust-analyzer";
79 this.statusBar.tooltip = "Ready (Partial)";
80 this.statusBar.command = undefined;
81 this.statusBar.color = undefined;
82 break;
77 case "ready": 83 case "ready":
78 this.statusBar.text = "rust-analyzer"; 84 this.statusBar.text = "rust-analyzer";
79 this.statusBar.tooltip = "Ready"; 85 this.statusBar.tooltip = "Ready";
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts
index d21a3db86..2de1e427d 100644
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -10,7 +10,7 @@ export interface AnalyzerStatusParams {
10export const analyzerStatus = new lc.RequestType<AnalyzerStatusParams, string, void>("rust-analyzer/analyzerStatus"); 10export const analyzerStatus = new lc.RequestType<AnalyzerStatusParams, string, void>("rust-analyzer/analyzerStatus");
11export const memoryUsage = new lc.RequestType0<string, void>("rust-analyzer/memoryUsage"); 11export const memoryUsage = new lc.RequestType0<string, void>("rust-analyzer/memoryUsage");
12 12
13export type Status = "loading" | "ready" | "invalid" | "needsReload"; 13export type Status = "loading" | "ready" | "readyPartial" | "invalid" | "needsReload";
14export interface StatusParams { 14export interface StatusParams {
15 status: Status; 15 status: Status;
16} 16}