From f358b4c0c05b20bd438f5fe3082a53dbe5b90e88 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Mon, 5 Aug 2019 11:07:27 +0300
Subject: Use WeakMap to avoid memory leaks

---
 editors/code/src/commands/inlay_hints.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'editors')

diff --git a/editors/code/src/commands/inlay_hints.ts b/editors/code/src/commands/inlay_hints.ts
index 11a2cfac5..aad28d564 100644
--- a/editors/code/src/commands/inlay_hints.ts
+++ b/editors/code/src/commands/inlay_hints.ts
@@ -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;
     }
-- 
cgit v1.2.3