Skip to content

Commit 667e1dd

Browse files
committed
fix: dispose listener
1 parent bfeb34e commit 667e1dd

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "antd-design-token",
33
"displayName": "antd Design Token",
44
"description": "VSCode extension for antd v5 design token.",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"publisher": "shezhangzhang",
77
"engines": {
88
"vscode": "^1.68.0"

src/extension.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export function activate(context: vscode.ExtensionContext) {
1111
const isActive = context.globalState.get(ACTIVE_KEY);
1212
let disposeTyping: vscode.Disposable | undefined;
1313
let disposableAndClear: DisposableAndClear | undefined;
14+
let disposeEditor: vscode.Disposable | undefined;
1415

1516
if (isActive || isActive === undefined) {
1617
setup();
@@ -28,6 +29,7 @@ export function activate(context: vscode.ExtensionContext) {
2829
"antd design token is inactive now."
2930
);
3031
} else {
32+
disposeEditor?.dispose();
3133
setup();
3234
vscode.window.showInformationMessage(
3335
"antd design token is active now."
@@ -64,21 +66,21 @@ export function activate(context: vscode.ExtensionContext) {
6466

6567
function disposeAll() {
6668
if (disposeTyping) {
67-
disposeTyping?.dispose();
69+
disposeTyping.dispose();
6870
disposeTyping = undefined;
6971
}
7072

7173
if (disposableAndClear) {
72-
disposableAndClear?.disposable?.forEach((disposable) =>
74+
disposableAndClear.disposable.forEach((disposable) =>
7375
disposable?.dispose()
7476
);
75-
disposableAndClear?.clear();
77+
disposableAndClear.clear();
7678
disposableAndClear = undefined;
7779
}
7880
}
7981

8082
function activeEditorListener(fullToken: any) {
81-
vscode.window.onDidChangeActiveTextEditor(
83+
disposeEditor = vscode.window.onDidChangeActiveTextEditor(
8284
(editor) => {
8385
if (editor) {
8486
const isAntdProject = checkAntdProject();

src/listener.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export default function setupEventListenerAndDecorations(
1919
if (activeEditor) {
2020
fileLineCount = activeEditor.document.lineCount;
2121
decorationManager.setActiveEditor(activeEditor);
22-
console.log(44444);
2322
decorationManager.triggerUpdateDecorations();
2423
}
2524

@@ -62,7 +61,6 @@ export default function setupEventListenerAndDecorations(
6261

6362
const disposableActiveChange = vscode.window.onDidChangeActiveTextEditor(
6463
(editor) => {
65-
console.log("change!!!!!");
6664
activeEditor = editor;
6765
if (editor) {
6866
fileLineCount = editor.document.lineCount || 0;

src/utils/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export function getColorTokenValue(value: string): string {
3434

3535
export function checkAntdProject(): boolean {
3636
const projectPath = getProjectPath();
37-
console.log("projectPath", projectPath);
3837

3938
if (projectPath) {
4039
const pkgFilePath = path.join(projectPath, "/package.json");
@@ -55,7 +54,6 @@ export function checkAntdProject(): boolean {
5554

5655
export function getProjectPath(): string | undefined {
5756
const fileName = vscode.window.activeTextEditor?.document?.fileName;
58-
console.log("filename", fileName);
5957

6058
return vscode.workspace.workspaceFolders
6159
?.map((folder) => folder.uri.fsPath)

0 commit comments

Comments
 (0)