fix: fix inactive bugs

Author: shezhangzhang

src/decoration-manager.ts

@@ -36,7 +36,7 @@ export default class DecorationManager {
      */
     if (!isEdit) {
       if (this.fileDecorationMap.has(this.fileName)) {
-        this.clearCurrentFileDecoration();
+        this.clearFileDecoration(this.fileName);
         this.fileDecorationMap.set(this.fileName, new Map());
       }
     }
@@ -78,12 +78,12 @@ export default class DecorationManager {
       const lines = this.getLines(startLine, endLine);
 
       if (diffLine < 0) {
-        this.clearCurrentFileDecoration(lines);
+        this.clearFileDecoration(this.fileName, lines);
         this.updateFileDecorationMap(diffLine, startLine);
       }
 
       if (diffLine === 0) {
-        this.clearCurrentFileDecoration([startLine]);
+        this.clearFileDecoration(this.fileName, [startLine]);
         this.setDecorations([startLine]);
       }
 
@@ -96,7 +96,7 @@ export default class DecorationManager {
             originalStartLine,
             originalEndLine
           );
-          this.clearCurrentFileDecoration(originalLines);
+          this.clearFileDecoration(this.fileName, originalLines);
         }
 
         this.updateFileDecorationMap(diffLine, startLine);
@@ -138,8 +138,9 @@ export default class DecorationManager {
     this.fileDecorationMap.set(this.fileName, lineDecorationMap);
   }
 
-  clearCurrentFileDecoration(lines?: number[]) {
-    const lineDecorationMapItem = this.fileDecorationMap.get(this.fileName);
+  clearFileDecoration(fileName: string, lines?: number[]) {
+    const lineDecorationMapItem = this.fileDecorationMap.get(fileName);
+
     if (lineDecorationMapItem?.size) {
       if (lines) {
         lines.forEach((line) => {
@@ -238,4 +239,16 @@ export default class DecorationManager {
 
     this.fileDecorationMap.set(this.fileName, newMap);
   }
+
+  clearAllFileDecorations() {
+    console.log(11111);
+    console.log(this);
+    console.log(this.fileDecorationMap);
+    if (this.fileDecorationMap?.size) {
+      this.fileDecorationMap.forEach((value, key) => {
+        console.log("key", key);
+        this.clearFileDecoration(key);
+      });
+    }
+  }
 }

src/decorator.ts

@@ -1,35 +1,31 @@
 import getDesignToken from "antd-token-previewer/es/utils/getDesignToken";
 import * as vscode from "vscode";
-import setupEventListener from "./listener";
+import setupEventListener, { DisposableAndClear } from "./listener";
 import setupAntdTokenCompletion from "./typing";
 
 export function activate(context: vscode.ExtensionContext) {
   let isActive = true;
   let disposeTyping: vscode.Disposable;
+  let disposableAndClear: DisposableAndClear;
 
-  const fullToken = getDesignToken();
-
-  if (!fullToken) {
-    vscode.window.showErrorMessage("Failed to get antd fullToken.");
-    return;
-  }
-
-  disposeTyping = setupAntdTokenCompletion(fullToken);
-
-  setupEventListener(context, fullToken);
+  setup();
 
   const disposable = vscode.commands.registerCommand(
     "antd-design-token.toggle",
     () => {
       isActive = !isActive;
 
       if (isActive) {
-        disposeTyping = setupAntdTokenCompletion(fullToken);
+        setup();
         vscode.window.showInformationMessage(
           "antd design token is active now."
         );
       } else {
         disposeTyping.dispose();
+        disposableAndClear.disposable.forEach((disposable) =>
+          disposable.dispose()
+        );
+        disposableAndClear.clear();
         vscode.window.showInformationMessage(
           "antd design token is inactive now."
         );
@@ -38,6 +34,18 @@ export function activate(context: vscode.ExtensionContext) {
   );
 
   context.subscriptions.push(disposable);
+
+  function setup() {
+    const fullToken = getDesignToken();
+
+    if (!fullToken) {
+      vscode.window.showErrorMessage("Failed to get antd fullToken.");
+      return;
+    }
+
+    disposeTyping = setupAntdTokenCompletion(fullToken);
+    disposableAndClear = setupEventListener(context, fullToken);
+  }
 }
 
 // this method is called when your extension is deactivated

src/extension.ts

@@ -1,10 +1,15 @@
 import * as vscode from "vscode";
 import DecorationManager from "./decoration-manager";
 
+export interface DisposableAndClear {
+  disposable: vscode.Disposable[];
+  clear: () => void;
+}
+
 export default function setupEventListener(
   context: vscode.ExtensionContext,
   fullToken: any
-) {
+): DisposableAndClear {
   let diffLine: number = 0;
   let fileLineCount: number = 0;
   let activeEditor = vscode.window.activeTextEditor;
@@ -16,7 +21,7 @@ export default function setupEventListener(
     decorationManager.triggerUpdateDecorations();
   }
 
-  vscode.workspace.onDidChangeTextDocument(
+  const disposableTextChange = vscode.workspace.onDidChangeTextDocument(
     (event) => {
       if (event.contentChanges.length === 0) {
         return;
@@ -52,7 +57,7 @@ export default function setupEventListener(
     context.subscriptions
   );
 
-  vscode.window.onDidChangeActiveTextEditor(
+  const disposableActiveChange = vscode.window.onDidChangeActiveTextEditor(
     (editor) => {
       activeEditor = editor;
       if (editor) {
@@ -125,4 +130,9 @@ export default function setupEventListener(
 
     return [startLine, endLine];
   }
+
+  return {
+    disposable: [disposableTextChange, disposableActiveChange],
+    clear: () => decorationManager.clearAllFileDecorations(),
+  };
 }