language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Change return type of expand_macro

Browse source
This commit is contained in:
Edwin Cheng 2019-11-19 22:56:48 +08:00
parent 94c63d2802
commit 4012da07fd
5 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
editors/code/src/commands/expand_macro.ts
View file

@ -2,13 +2,16 @@ import * as vscode from 'vscode';
import { Position, TextDocumentIdentifier } from 'vscode-languageclient';
import { Server } from '../server';
type ExpandMacroResult = [string, string];
interface ExpandedMacro {
name: string,
expansion: string,
}
function code_format([name, text]: [string, string]): vscode.MarkdownString {
function code_format(expanded: ExpandedMacro): vscode.MarkdownString {
const markdown = new vscode.MarkdownString(
`#### Recursive expansion of ${name}! macro`
`#### Recursive expansion of ${expanded.name}! macro`
);
markdown.appendCodeblock(text, 'rust');
markdown.appendCodeblock(expanded.expansion, 'rust');
return markdown;
}
@ -23,7 +26,7 @@ export class ExpandMacroHoverProvider implements vscode.HoverProvider {
textDocument: { uri: document.uri.toString() },
position
};
const result = await Server.client.sendRequest<ExpandMacroResult>(
const result = await Server.client.sendRequest<ExpandedMacro>(
'rust-analyzer/expandMacro',
request
);