Skip to content

Commit b6486d3

Browse files
committed
Revert "fix issues"
This reverts commit 72b72d1.
1 parent 72b72d1 commit b6486d3

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
153153
return this._collectCompletions(providers, shellType, promptValue, cursorPosition, allowFallbackCompletions, capabilities, token, explicitlyInvoked);
154154
}
155155

156-
providers = this.getEnabledProviders(providers);
156+
providers = this._getEnabledProviders(providers);
157157

158158
if (!providers.length) {
159159
return;
@@ -162,7 +162,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
162162
return this._collectCompletions(providers, shellType, promptValue, cursorPosition, allowFallbackCompletions, capabilities, token, explicitlyInvoked);
163163
}
164164

165-
getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
165+
protected _getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
166166
const providerConfig: { [key: string]: boolean } = this._configurationService.getValue(TerminalSuggestSettingId.Providers);
167167
return providers.filter(p => {
168168
const providerId = p.id;

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { URI } from '../../../../../../base/common/uri.js';
77
import { IFileService, IFileStatWithMetadata, IResolveMetadataFileOptions } from '../../../../../../platform/files/common/files.js';
8-
import { ITerminalCompletionProvider, TerminalCompletionService, TerminalResourceRequestConfig } from '../../browser/terminalCompletionService.js';
8+
import { TerminalCompletionService, TerminalResourceRequestConfig } from '../../browser/terminalCompletionService.js';
99
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
1010
import assert, { fail } from 'assert';
1111
import { isWindows, type IProcessEnvironment } from '../../../../../../base/common/platform.js';
@@ -21,7 +21,6 @@ import { count } from '../../../../../../base/common/strings.js';
2121
import { WindowsShellType } from '../../../../../../platform/terminal/common/terminal.js';
2222
import { gitBashToWindowsPath, windowsToGitBashPath } from '../../browser/terminalGitBashHelpers.js';
2323
import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
24-
import { TerminalSuggestSettingId } from '../../common/terminalSuggestConfiguration.js';
2524

2625
const pathSeparator = isWindows ? '\\' : '/';
2726

@@ -775,8 +774,8 @@ suite('TerminalCompletionService', () => {
775774
suite('Provider Configuration', () => {
776775
// Test class that extends TerminalCompletionService to access protected methods
777776
class TestTerminalCompletionService extends TerminalCompletionService {
778-
override getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
779-
return super.getEnabledProviders(providers);
777+
public _getEnabledProviders(providers: ITerminalCompletionProvider[]): ITerminalCompletionProvider[] {
778+
return super._getEnabledProviders(providers);
780779
}
781780
}
782781

@@ -794,8 +793,7 @@ suite('TerminalCompletionService', () => {
794793
label: `completion-from-${id}`,
795794
kind: TerminalCompletionItemKind.Method,
796795
replacementIndex: 0,
797-
replacementLength: 0,
798-
provider: id
796+
replacementLength: 0
799797
}]
800798
};
801799
}
@@ -808,7 +806,7 @@ suite('TerminalCompletionService', () => {
808806
// Set empty configuration (no provider keys)
809807
configurationService.setUserConfiguration(TerminalSuggestSettingId.Providers, {});
810808

811-
const result = testTerminalCompletionService.getEnabledProviders(providers);
809+
const result = testTerminalCompletionService._getEnabledProviders(providers);
812810

813811
// Both providers should be enabled since they're not explicitly disabled
814812
assert.strictEqual(result.length, 2, 'Should enable both providers by default');
@@ -826,7 +824,7 @@ suite('TerminalCompletionService', () => {
826824
'provider1': false
827825
});
828826

829-
const result = testTerminalCompletionService.getEnabledProviders(providers);
827+
const result = testTerminalCompletionService._getEnabledProviders(providers);
830828

831829
// Only provider2 should be enabled
832830
assert.strictEqual(result.length, 1, 'Should enable only one provider');
@@ -844,7 +842,7 @@ suite('TerminalCompletionService', () => {
844842
'provider1': true
845843
});
846844

847-
const result = testTerminalCompletionService.getEnabledProviders(providers);
845+
const result = testTerminalCompletionService._getEnabledProviders(providers);
848846

849847
// Both providers should be enabled
850848
assert.strictEqual(result.length, 2, 'Should enable both providers');
@@ -864,7 +862,7 @@ suite('TerminalCompletionService', () => {
864862
'provider2': false
865863
});
866864

867-
const result = testTerminalCompletionService.getEnabledProviders(providers);
865+
const result = testTerminalCompletionService._getEnabledProviders(providers);
868866

869867
// provider1 and provider3 should be enabled, provider2 should be disabled
870868
assert.strictEqual(result.length, 2, 'Should enable two providers');

0 commit comments

Comments
 (0)