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

Use WeakMap to avoid memory leaks

Browse source
This commit is contained in:
Kirill Bulatov 2019-08-05 11:07:27 +03:00
parent 3fb6462d54
commit f358b4c0c0
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
editors/code/src/commands/inlay_hints.ts
View file

@ -21,7 +21,10 @@ const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
export class HintsUpdater {
private displayHints = true;
private drawnDecorations = new Map<string, vscode.DecorationOptions[]>();
private drawnDecorations = new WeakMap<
vscode.Uri,
vscode.DecorationOptions[]
>();
public async loadHints(editor?: vscode.TextEditor): Promise<void> {
if (this.displayHints) {
@ -48,7 +51,7 @@ export class HintsUpdater {
public async toggleHintsDisplay(displayHints: boolean): Promise<void> {
if (this.displayHints !== displayHints) {
this.displayHints = displayHints;
this.drawnDecorations.clear();
this.drawnDecorations = new WeakMap();
if (displayHints) {
return this.updateHints();
@ -77,10 +80,7 @@ export class HintsUpdater {
return;
}
return await this.updateDecorationsFromServer(
document.uri.toString(),
editor
);
return await this.updateDecorationsFromServer(document.uri, editor);
}
private isRustDocument(document: vscode.TextDocument): boolean {
@ -88,10 +88,10 @@ export class HintsUpdater {
}
private async updateDecorationsFromServer(
documentUri: string,
documentUri: vscode.Uri,
editor: TextEditor
): Promise<void> {
const newHints = await this.queryHints(documentUri);
const newHints = await this.queryHints(documentUri.toString());
if (newHints != null) {
const newDecorations = newHints.map(hint => ({
range: hint.range,
@ -127,9 +127,11 @@ export class HintsUpdater {
);
}
private getEditorDocumentUri(editor?: vscode.TextEditor): string | null {
private getEditorDocumentUri(
editor?: vscode.TextEditor
): vscode.Uri | null {
if (editor && this.isRustDocument(editor.document)) {
return editor.document.uri.toString();
return editor.document.uri;
}
return null;
}