feat: run/cancel/clear flycheck

fannheyward · Dec 19, 2022 · e259fca · e259fca
1 parent 0975292
commit e259fca
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -159,7 +159,9 @@ You can use these commands by `:CocCommand XYZ`.
 | rust-analyzer.viewCrateGraph | View Crate Graph |
 | rust-analyzer.viewFullCrateGraph | View Crate Graph (Full) |
 | rust-analyzer.shuffleCrateGraph | Shuffle Crate Graph |
+| rust-analyzer.runFlycheck | Run flycheck |
 | rust-analyzer.cancelFlycheck | Cancel running flychecks |
+| rust-analyzer.clearFlycheck | Clear flycheck diagnostics |
 
 ## Highlight Group
 

diff --git a/package.json b/package.json
@@ -1177,11 +1177,21 @@
         "title": "Move item down",
         "category": "Rust Analyzer"
       },
+      {
+        "command": "rust-analyzer.runFlycheck",
+        "title": "Run flycheck",
+        "category": "rust-analyzer"
+      },
       {
         "command": "rust-analyzer.cancelFlycheck",
         "title": "Cancel running flychecks",
         "category": "rust-analyzer"
       },
+      {
+        "command": "rust-analyzer.clearFlycheck",
+        "title": "Clear flycheck diagnostics",
+        "category": "rust-analyzer"
+      },
       {
         "command": "rust-analyzer.explainError",
         "title": "Explain the currently hovered diagnostic",

diff --git a/src/commands.ts b/src/commands.ts
@@ -627,9 +627,24 @@ export function applySnippetWorkspaceEditCommand(): Cmd {
   };
 }
 
+export function runFlycheck(ctx: Ctx): Cmd {
+  return async () => {
+    const { document } = await workspace.getCurrentState();
+    if (!isRustDocument(document)) return;
+
+    ctx.client.sendNotification(ra.runFlycheck, { textDocument: { uri: document.uri } });
+  };
+}
+
 export function cancelFlycheck(ctx: Ctx): Cmd {
   return async () => {
-    await ctx.client.sendRequest(ra.cancelFlycheck);
+    ctx.client.sendNotification(ra.cancelFlycheck);
+  };
+}
+
+export function clearFlycheck(ctx: Ctx): Cmd {
+  return async () => {
+    ctx.client.sendNotification(ra.clearFlycheck);
   };
 }
 

diff --git a/src/index.ts b/src/index.ts
@@ -68,7 +68,9 @@ export async function activate(context: ExtensionContext): Promise<void> {
   ctx.registerCommand('matchingBrace', cmds.matchingBrace);
   ctx.registerCommand('openCargoToml', cmds.openCargoToml);
   ctx.registerCommand('serverVersion', cmds.serverVersion);
+  ctx.registerCommand('runFlycheck', cmds.runFlycheck);
   ctx.registerCommand('cancelFlycheck', cmds.cancelFlycheck);
+  ctx.registerCommand('clearFlycheck', cmds.clearFlycheck);
   ctx.registerCommand('analyzerStatus', cmds.analyzerStatus);
   ctx.registerCommand('viewCrateGraph', cmds.viewCrateGraph);
   ctx.registerCommand('shuffleCrateGraph', cmds.shuffleCrateGraph);

diff --git a/src/lsp_ext.ts b/src/lsp_ext.ts
@@ -62,7 +62,11 @@ export const expandMacro = new lc.RequestType<ExpandMacroParams, ExpandedMacro |
 
 export const relatedTests = new lc.RequestType<lc.TextDocumentPositionParams, TestInfo[], void>('rust-analyzer/relatedTests');
 
-export const cancelFlycheck = new lc.RequestType0<void, void>('rust-analyzer/cancelFlycheck');
+export const cancelFlycheck = new lc.NotificationType0('rust-analyzer/cancelFlycheck');
+export const clearFlycheck = new lc.NotificationType0('rust-analyzer/clearFlycheck');
+export const runFlycheck = new lc.NotificationType<{
+  textDocument: lc.TextDocumentIdentifier | null;
+}>('rust-analyzer/runFlycheck');
 
 // Experimental extensions
 
@@ -145,5 +149,5 @@ export interface MoveItemParams {
 
 export const enum Direction {
   Up = 'Up',
-  Down = 'Down'
+  Down = 'Down',
 }