Skip to content

Fl/rl 42 43 44/memory leak cleanup #33

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
merged 3 commits into from
Jan 25, 2024
Merged

Fl/rl 42 43 44/memory leak cleanup #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4f288b
Merge branch 'dev' into FL/RL-42-43-44/Memory-Leak_Cleanup
Ponch49 Jan 24, 2024
071a553
Resolved the bug that was causing no new webview to be opened after i…
Ponch49 Jan 24, 2024
82c284a
Merge branch 'dev' into FL/RL-42-43-44/Memory-Leak_Cleanup
Ponch49 Jan 25, 2024
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
16 changes: 14 additions & 2 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ let panel: vscode.WebviewPanel | undefined = undefined
function activate(context: vscode.ExtensionContext) {

// This is the column where Webview will be revealed to
const columnToShowIn : vscode.ViewColumn | undefined = vscode.window.activeTextEditor
let columnToShowIn : vscode.ViewColumn | undefined = vscode.window.activeTextEditor
? vscode.window.activeTextEditor.viewColumn
: undefined;


// Command that allows for User to select the root file of their React application.
const pickFile: vscode.Disposable = vscode.commands.registerCommand('myExtension.pickFile', async () => {


// Check if there is an existing webview panel, if so display it.
if(panel) {
panel.reveal(columnToShowIn)
Expand Down Expand Up @@ -52,6 +51,19 @@ function activate(context: vscode.ExtensionContext) {
panel.dispose()
panel = createPanel(context, data, columnToShowIn);
}

// Listens for when webview is closed and disposes of webview resources
panel.onDidDispose(
() => {
console.log("Before: ", panel)
panel.dispose()
panel = undefined;
columnToShowIn = undefined;
console.log("After: ", panel)
},
null,
context.subscriptions
);
});


Expand Down
10 changes: 0 additions & 10 deletions src/panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ export function createPanel(context: vscode.ExtensionContext, data: Tree, column
// render html of webview here
panel.webview.html = createWebviewHTML(bundleURI, data);


// Listens for when webview is closed and disposes of webview resources
panel.onDidDispose(
() => {
panel = undefined;
},
null,
context.subscriptions
);


// Sends data to Flow.tsx to be displayed after parsed data is received
panel.webview.onDidReceiveMessage(
Expand Down