This revision was automatically updated to reflect the committed changes. Closed by commit rL370218: [clangd][vscode] Don't leak the resources (authored by hokein, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D66881?vs=217657&id=217659#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D66881/new/ https://reviews.llvm.org/D66881 Files: clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts Index: clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts =================================================================== --- clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts +++ clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts @@ -111,6 +111,8 @@ serverOptions, clientOptions); const semanticHighlightingFeature = new semanticHighlighting.SemanticHighlightingFeature(); + context.subscriptions.push( + vscode.Disposable.from(semanticHighlightingFeature)); clangdClient.registerFeature(semanticHighlightingFeature); console.log('Clang Language Server is now active!'); context.subscriptions.push(clangdClient.start()); @@ -133,9 +135,10 @@ vscode.window.showTextDocument(doc); })); const status = new FileStatus(); + context.subscriptions.push(vscode.Disposable.from(status)); context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor( () => { status.updateStatus(); })); - clangdClient.onDidChangeState(({newState}) => { + context.subscriptions.push(clangdClient.onDidChangeState(({newState}) => { if (newState == vscodelc.State.Running) { // clangd starts or restarts after crash. clangdClient.onNotification( @@ -150,7 +153,7 @@ status.clear(); semanticHighlightingFeature.dispose(); } - }) + })); // An empty place holder for the activate command, otherwise we'll get an // "command is not registered" error. context.subscriptions.push(vscode.commands.registerCommand(
Index: clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts =================================================================== --- clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts +++ clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts @@ -111,6 +111,8 @@ serverOptions, clientOptions); const semanticHighlightingFeature = new semanticHighlighting.SemanticHighlightingFeature(); + context.subscriptions.push( + vscode.Disposable.from(semanticHighlightingFeature)); clangdClient.registerFeature(semanticHighlightingFeature); console.log('Clang Language Server is now active!'); context.subscriptions.push(clangdClient.start()); @@ -133,9 +135,10 @@ vscode.window.showTextDocument(doc); })); const status = new FileStatus(); + context.subscriptions.push(vscode.Disposable.from(status)); context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor( () => { status.updateStatus(); })); - clangdClient.onDidChangeState(({newState}) => { + context.subscriptions.push(clangdClient.onDidChangeState(({newState}) => { if (newState == vscodelc.State.Running) { // clangd starts or restarts after crash. clangdClient.onNotification( @@ -150,7 +153,7 @@ status.clear(); semanticHighlightingFeature.dispose(); } - }) + })); // An empty place holder for the activate command, otherwise we'll get an // "command is not registered" error. context.subscriptions.push(vscode.commands.registerCommand(
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits