Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Format based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Query diagnostics only for visible documents and count split editors once per document, avoiding a workspace-wide scan on every diagnostics event.
- Fix double-counting of session coding time in `StatsEngine.getSnapshot()` (Fixes #22).
- Automatically recalculate and reset inactive streaks to 0 after 2 or more days without activity (Fixes #24).
- Dispose previous Sidebar webview message listener on view reopen to prevent memory leaks (Fixes #30).

---

Expand Down
1 change: 1 addition & 0 deletions extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ function activate(context) {
// ── Register everything ──
context.subscriptions.push(
statusBarItem,
sidebarProvider,
cmdSayHi,
cmdDashboard,
cmdReset,
Expand Down
30 changes: 27 additions & 3 deletions src/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const vscode = require('vscode');
const path = require('path');
const fs = require('fs');
const { PET_THEMES } = require('./moods');
const { getPetSvg, getAccessoriesSvg } = require('./pets');

class SidebarProvider {
/**
Expand All @@ -19,6 +20,8 @@ class SidebarProvider {
this.getCurrentMood = getCurrentMood;
/** @type {vscode.WebviewView | undefined} */
this._view = undefined;
/** @type {vscode.Disposable | undefined} */
this._messageListener = undefined;
}

resolveWebviewView(webviewView) {
Expand All @@ -28,15 +31,37 @@ class SidebarProvider {
localResourceRoots: [this.context.extensionUri]
};

webviewView.webview.onDidReceiveMessage(msg => {
// Dispose any previous message listener to prevent memory leaks on view reopen
if (this._messageListener) {
this._messageListener.dispose();
this._messageListener = undefined;
}

this._messageListener = webviewView.webview.onDidReceiveMessage(msg => {
if (msg.command === 'openDashboard') {
vscode.commands.executeCommand('codecritter.showDashboard');
}
}, undefined, this.context.subscriptions);
});

webviewView.onDidDispose(() => {
if (this._messageListener) {
this._messageListener.dispose();
this._messageListener = undefined;
}
this._view = undefined;
});

this.update();
}

dispose() {
if (this._messageListener) {
this._messageListener.dispose();
this._messageListener = undefined;
}
this._view = undefined;
}

update() {
if (!this._view) return;

Expand All @@ -49,7 +74,6 @@ class SidebarProvider {
const currentMood = this.getCurrentMood();
const petName = this.getPetName();

const { getPetSvg, getAccessoriesSvg } = require('./pets');
const petSvgRaw = getPetSvg(petSpecies).replace('__ACCESSORIES__', getAccessoriesSvg(stats.level));

const htmlPath = path.join(__dirname, '..', 'media', 'sidebar.html');
Expand Down
108 changes: 108 additions & 0 deletions tests/sidebar.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
'use strict';

const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const test = require('node:test');
const vm = require('node:vm');

test('Issue #30: SidebarProvider disposes previous message listener when view is reopened', () => {
let executedCommand = null;
const vscode = {
commands: {
executeCommand: cmd => { executedCommand = cmd; }
},
workspace: {
getConfiguration: () => ({ get: (k, def) => def })
}
};

const dependencies = {
vscode,
path,
fs,
'./moods': {
PET_THEMES: { default: { label: 'Default', body: '', bodyAlt: '', accent: '', antennae: '' } }
},
'./pets': {
getPetSvg: () => '__ACCESSORIES__',
getAccessoriesSvg: () => ''
}
};

const sandbox = {
module: { exports: {} },
require: name => dependencies[name] || require(name),
__dirname: path.join(__dirname, '..', 'src')
};

const sidebarCode = fs.readFileSync(path.join(__dirname, '..', 'src', 'sidebar.js'), 'utf8');
vm.runInNewContext(sidebarCode, sandbox);
const SidebarProvider = sandbox.module.exports.SidebarProvider;

const mockContext = {
extensionUri: { toString: () => 'file:///ext' },
subscriptions: []
};

const mockStats = {
getSnapshot: () => ({ level: 1, xpProgress: 0 })
};

const provider = new SidebarProvider(
mockContext,
mockStats,
() => 'Critter',
() => 'happy'
);

let firstListenerDisposed = false;
let secondListenerDisposed = false;
let activeMessageHandler = null;

// First time resolving view
const mockWebviewView1 = {
webview: {
options: {},
html: '',
onDidReceiveMessage: handler => {
activeMessageHandler = handler;
return {
dispose: () => { firstListenerDisposed = true; }
};
}
},
onDidDispose: () => {}
};

provider.resolveWebviewView(mockWebviewView1);
assert.equal(firstListenerDisposed, false, 'first listener must be active initially');

// Trigger message on first view
activeMessageHandler({ command: 'openDashboard' });
assert.equal(executedCommand, 'codecritter.showDashboard');

// Second time resolving view (e.g. view hidden and reopened)
const mockWebviewView2 = {
webview: {
options: {},
html: '',
onDidReceiveMessage: () => {
return {
dispose: () => { secondListenerDisposed = true; }
};
}
},
onDidDispose: () => {}
};

provider.resolveWebviewView(mockWebviewView2);

// The first listener must have been disposed when resolving the second view!
assert.equal(firstListenerDisposed, true, 'previous message listener must be disposed on view reopen');
assert.equal(secondListenerDisposed, false, 'new message listener must remain active');

// Disposing provider cleans up second listener
provider.dispose();
assert.equal(secondListenerDisposed, true, 'provider.dispose() must dispose active listener');
});
Loading