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

Avoid shared mutable state

Browse source
This commit is contained in:
Kirill Bulatov 2019-08-05 22:31:12 +03:00
parent 777552b6a8
commit c5598d9ade
2 changed files with 55 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,15 +151,27 @@ export function activate(context: vscode.ExtensionContext) {
if (Server.config.displayInlayHints) {
const hintsUpdater = new HintsUpdater();
hintsUpdater.loadHints(vscode.window.activeTextEditor).then(() => {
hintsUpdater.refreshHintsForVisibleEditors().then(() => {
// vscode may ignore top level hintsUpdater.refreshHintsForVisibleEditors()
// so update the hints once when the focus changes to guarantee their presence
let editorChangeDisposable: vscode.Disposable | null = null;
editorChangeDisposable = vscode.window.onDidChangeActiveTextEditor(
_ => {
if (editorChangeDisposable !== null) {
editorChangeDisposable.dispose();
}
return hintsUpdater.refreshHintsForVisibleEditors();
}
);
disposeOnDeactivation(
vscode.window.onDidChangeActiveTextEditor(editor =>
hintsUpdater.loadHints(editor)
vscode.window.onDidChangeVisibleTextEditors(_ =>
hintsUpdater.refreshHintsForVisibleEditors()
)
);
disposeOnDeactivation(
vscode.workspace.onDidChangeTextDocument(e =>
hintsUpdater.updateHints(e)
hintsUpdater.refreshHintsForVisibleEditors(e)
)
);
disposeOnDeactivation(