Skip to content

chore: dispose correctly in lineage panel #4740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benfdking merged 1 commit into from
Jun 15, 2025
Merged

chore: dispose correctly in lineage panel #4740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 36 additions & 26 deletions vscode/extension/src/webviews/lineagePanel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,42 @@ export class LineagePanel implements WebviewViewProvider, Disposable {

private panel: WebviewView | undefined
private lsp: LSPClient
private _extensionUri: Uri
private readonly extensionUri: Uri

private disposables: Disposable[] = []

public constructor(extensionUri: Uri, lsp: LSPClient) {
this._extensionUri = extensionUri
this.extensionUri = extensionUri
this.lsp = lsp

if (this.panel) {
this.panel.webview.html = this.getHTML(this.panel.webview)
}

workspace.onDidSaveTextDocument(document => {
this.panel?.webview.postMessage({
key: 'vscode_send',
payload: {
key: 'savedFile',
payload: { fileUri: document.uri.toString() },
},
})
})

window.onDidChangeActiveTextEditor(editor => {
if (editor) {
this.disposables.push(
workspace.onDidSaveTextDocument(document => {
this.panel?.webview.postMessage({
key: 'vscode_send',
payload: {
key: 'changeFocusOnFile',
payload: { path: editor.document.uri.toString() },
key: 'savedFile',
payload: { fileUri: document.uri.toString() },
},
})
}
})
}),
)
this.disposables.push(
window.onDidChangeActiveTextEditor(editor => {
if (editor) {
this.panel?.webview.postMessage({
key: 'vscode_send',
payload: {
key: 'changeFocusOnFile',
payload: { path: editor.document.uri.toString() },
},
})
}
}),
)
}

public resolveWebviewView(webviewView: WebviewView) {
Expand All @@ -58,12 +63,12 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
webviewView.webview.options = {
// Allow scripts in the webview
enableScripts: true,
localResourceRoots: [this._extensionUri],
localResourceRoots: [this.extensionUri],
}

// Set content options for external URL access
// Set up message listener for events from the iframe
webviewView.webview.onDidReceiveMessage(
const disposable = webviewView.webview.onDidReceiveMessage(
async request => {
if (!request) {
return
Expand Down Expand Up @@ -99,7 +104,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
result: response,
},
}
webviewView.webview.postMessage(responseCallback)
await webviewView.webview.postMessage(responseCallback)
break
}
case 'get_active_file': {
Expand All @@ -113,7 +118,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
},
},
}
webviewView.webview.postMessage(responseCallback)
await webviewView.webview.postMessage(responseCallback)
break
}
default: {
Expand All @@ -132,21 +137,22 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
undefined,
[],
)
this.disposables.push(disposable)
webviewView.webview.html = this.getHTML(webviewView.webview)
}

private getHTML(panel: Webview) {
const cssUri = panel.asWebviewUri(
Uri.joinPath(this._extensionUri, 'src_react', 'assets', 'index.css'),
Uri.joinPath(this.extensionUri, 'src_react', 'assets', 'index.css'),
)
const jsUri = panel.asWebviewUri(
Uri.joinPath(this._extensionUri, 'src_react', 'assets', 'index.js'),
Uri.joinPath(this.extensionUri, 'src_react', 'assets', 'index.js'),
)
const faviconUri = panel.asWebviewUri(
Uri.joinPath(this._extensionUri, 'src_react', 'favicon.ico'),
Uri.joinPath(this.extensionUri, 'src_react', 'favicon.ico'),
)
const logoUri = panel.asWebviewUri(
Uri.joinPath(this._extensionUri, 'src_react', 'logo192.png'),
Uri.joinPath(this.extensionUri, 'src_react', 'logo192.png'),
)

// Handle query requests from the React app
Expand Down Expand Up @@ -179,5 +185,9 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
// WebviewView doesn't have a dispose method
// We can clear references
this.panel = undefined
this.disposables.forEach(disposable => {
disposable.dispose()
})
this.disposables = []
}
}