fix issues

Author: meganrogge

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts

@@ -153,7 +153,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			return this._collectCompletions(providers, shellType, promptValue, cursorPosition, allowFallbackCompletions, capabilities, token, explicitlyInvoked);
 		}
 
-		providers = this._getEnabledProviders(providers);
+		providers = this.getEnabledProviders(providers);
 
 		if (!providers.length) {
 			return;
@@ -162,7 +162,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		return this._collectCompletions(providers, shellType, promptValue, cursorPosition, allowFallbackCompletions, capabilities, token, explicitlyInvoked);
 	}
 
-	protected _getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
+	getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
 		const providerConfig: { [key: string]: boolean } = this._configurationService.getValue(TerminalSuggestSettingId.Providers);
 		return providers.filter(p => {
 			const providerId = p.id;

src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts

@@ -5,7 +5,7 @@
 
 import { URI } from '../../../../../../base/common/uri.js';
 import { IFileService, IFileStatWithMetadata, IResolveMetadataFileOptions } from '../../../../../../platform/files/common/files.js';
-import { TerminalCompletionService, TerminalResourceRequestConfig } from '../../browser/terminalCompletionService.js';
+import { ITerminalCompletionProvider, TerminalCompletionService, TerminalResourceRequestConfig } from '../../browser/terminalCompletionService.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import assert, { fail } from 'assert';
 import { isWindows, type IProcessEnvironment } from '../../../../../../base/common/platform.js';
@@ -21,6 +21,7 @@ import { count } from '../../../../../../base/common/strings.js';
 import { WindowsShellType } from '../../../../../../platform/terminal/common/terminal.js';
 import { gitBashToWindowsPath, windowsToGitBashPath } from '../../browser/terminalGitBashHelpers.js';
 import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { TerminalSuggestSettingId } from '../../common/terminalSuggestConfiguration.js';
 
 const pathSeparator = isWindows ? '\\' : '/';
 
@@ -774,8 +775,8 @@ suite('TerminalCompletionService', () => {
 	suite('Provider Configuration', () => {
 		// Test class that extends TerminalCompletionService to access protected methods
 		class TestTerminalCompletionService extends TerminalCompletionService {
-			public _getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
-				return super._getEnabledProviders(providers);
+			override getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
+				return super.getEnabledProviders(providers);
 			}
 		}
 
@@ -793,7 +794,8 @@ suite('TerminalCompletionService', () => {
 					label: `completion-from-${id}`,
 					kind: TerminalCompletionItemKind.Method,
 					replacementIndex: 0,
-					replacementLength: 0
+					replacementLength: 0,
+					provider: id
 				}]
 			};
 		}
@@ -806,7 +808,7 @@ suite('TerminalCompletionService', () => {
 			// Set empty configuration (no provider keys)
 			configurationService.setUserConfiguration(TerminalSuggestSettingId.Providers, {});
 
-			const result = testTerminalCompletionService._getEnabledProviders(providers);
+			const result = testTerminalCompletionService.getEnabledProviders(providers);
 
 			// Both providers should be enabled since they're not explicitly disabled
 			assert.strictEqual(result.length, 2, 'Should enable both providers by default');
@@ -824,7 +826,7 @@ suite('TerminalCompletionService', () => {
 				'provider1': false
 			});
 
-			const result = testTerminalCompletionService._getEnabledProviders(providers);
+			const result = testTerminalCompletionService.getEnabledProviders(providers);
 
 			// Only provider2 should be enabled
 			assert.strictEqual(result.length, 1, 'Should enable only one provider');
@@ -842,7 +844,7 @@ suite('TerminalCompletionService', () => {
 				'provider1': true
 			});
 
-			const result = testTerminalCompletionService._getEnabledProviders(providers);
+			const result = testTerminalCompletionService.getEnabledProviders(providers);
 
 			// Both providers should be enabled
 			assert.strictEqual(result.length, 2, 'Should enable both providers');
@@ -862,7 +864,7 @@ suite('TerminalCompletionService', () => {
 				'provider2': false
 			});
 
-			const result = testTerminalCompletionService._getEnabledProviders(providers);
+			const result = testTerminalCompletionService.getEnabledProviders(providers);
 
 			// provider1 and provider3 should be enabled, provider2 should be disabled
 			assert.strictEqual(result.length, 2, 'Should enable two providers');