Merge pull request microsoft#187083 from SvanT/main

Dispose `TerminalWordLinkDetector` listeners

Author: Tyriar

src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts

@@ -54,7 +54,7 @@ class TerminalLinkContribution extends DisposableStore implements ITerminalContr
 		this._processManager.onProcessReady(() => {
 			linkManager.setWidgetManager(this._widgetManager);
 		});
-		this._linkManager = linkManager;
+		this._linkManager = this.add(linkManager);
 
 		// Attach the link provider(s) to the instance and listen for changes
 		for (const linkProvider of this._terminalLinkProviderService.linkProviders) {

src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts

@@ -77,7 +77,7 @@ export class TerminalLinkManager extends DisposableStore {
 			this._setupLinkDetector(TerminalMultiLineLinkDetector.id, this._instantiationService.createInstance(TerminalMultiLineLinkDetector, this._xterm, this._processManager, this._linkResolver));
 			this._setupLinkDetector(TerminalLocalLinkDetector.id, this._instantiationService.createInstance(TerminalLocalLinkDetector, this._xterm, capabilities, this._processManager, this._linkResolver));
 		}
-		this._setupLinkDetector(TerminalWordLinkDetector.id, this._instantiationService.createInstance(TerminalWordLinkDetector, this._xterm));
+		this._setupLinkDetector(TerminalWordLinkDetector.id, this.add(this._instantiationService.createInstance(TerminalWordLinkDetector, this._xterm)));
 
 		// Setup link openers
 		const localFileOpener = this._instantiationService.createInstance(TerminalLocalFileLinkOpener);

src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Disposable } from 'vs/base/common/lifecycle';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -27,7 +28,7 @@ interface Word {
 	text: string;
 }
 
-export class TerminalWordLinkDetector implements ITerminalLinkDetector {
+export class TerminalWordLinkDetector extends Disposable implements ITerminalLinkDetector {
 	static id = 'word';
 
 	// Word links typically search the workspace so it makes sense that their maximum link length is
@@ -41,12 +42,14 @@ export class TerminalWordLinkDetector implements ITerminalLinkDetector {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IProductService private readonly _productService: IProductService,
 	) {
+		super();
+
 		this._refreshSeparatorCodes();
-		this._configurationService.onDidChangeConfiguration(e => {
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(TerminalSettingId.WordSeparators)) {
 				this._refreshSeparatorCodes();
 			}
-		});
+		}));
 	}
 
 	detect(lines: IBufferLine[], startLine: number, endLine: number): ITerminalSimpleLink[] {