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

Use DocumentProvider instead of Hover

Browse source
This commit is contained in:
Edwin Cheng 2019-11-20 01:06:10 +08:00
parent 80fe467ce8
commit d16cc223e1
3 changed files with 75 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
editors/code/src/extension.ts
View file

@ -3,7 +3,7 @@ import * as lc from 'vscode-languageclient';
import * as commands from './commands';
import { CargoWatchProvider } from './commands/cargo_watch';
import { ExpandMacroHoverProvider } from './commands/expand_macro';
import { ExpandMacroContentProvider } from './commands/expand_macro';
import { HintsUpdater } from './commands/inlay_hints';
import {
interactivelyStartCargoWatch,
@ -98,6 +98,7 @@ export function activate(context: vscode.ExtensionContext) {
]
];
const syntaxTreeContentProvider = new SyntaxTreeContentProvider();
const expandMacroContentProvider = new ExpandMacroContentProvider();
// The events below are plain old javascript events, triggered and handled by vscode
vscode.window.onDidChangeActiveTextEditor(
@ -110,11 +111,21 @@ export function activate(context: vscode.ExtensionContext) {
syntaxTreeContentProvider
)
);
disposeOnDeactivation(
vscode.workspace.registerTextDocumentContentProvider(
'rust-analyzer',
expandMacroContentProvider
)
);
registerCommand(
'rust-analyzer.syntaxTree',
commands.syntaxTree.createHandle(syntaxTreeContentProvider)
);
registerCommand(
'rust-analyzer.expandMacro',
commands.expandMacro.createHandle(expandMacroContentProvider)
);
vscode.workspace.onDidChangeTextDocument(
events.changeTextDocument.createHandler(syntaxTreeContentProvider),
@ -122,15 +133,6 @@ export function activate(context: vscode.ExtensionContext) {
context.subscriptions
);
const expandMacroContentProvider = new ExpandMacroHoverProvider();
disposeOnDeactivation(
vscode.languages.registerHoverProvider(
'rust',
expandMacroContentProvider
)
);
const startServer = () => Server.start(allNotifications);
const reloadCommand = () => reloadServer(startServer);