Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-07 23:36:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

nes - ensure to read/write setting value from status with text config service (#244881)

Browse Source
This commit is contained in:
Benjamin Pasero
2025-03-27 16:39:39 +01:00
committed by GitHub
parent ab4511fc83
commit 769a49e314
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/common/services/textResourceConfiguration.ts
+1 -1
View File
@@ -72,7 +72,7 @@ export interface ITextResourceConfigurationService {
* @param configurationTarget Optional target into which the configuration has to be updated.
* If not specified, target will be derived by checking where the configuration is defined.
*/
updateValue(resource: URI, key: string, value: any, configurationTarget?: ConfigurationTarget): Promise<void>;
updateValue(resource: URI | undefined, key: string, value: any, configurationTarget?: ConfigurationTarget): Promise<void>;
}
src/vs/editor/common/services/textResourceConfigurationService.ts
+2 -2
View File
@@ -37,8 +37,8 @@ export class TextResourceConfigurationService extends Disposable implements ITex
return this._getValue(resource, null, typeof arg2 === 'string' ? arg2 : undefined);
}
updateValue(resource: URI, key: string, value: any, configurationTarget?: ConfigurationTarget): Promise<void> {
const language = this.getLanguage(resource, null);
updateValue(resource: URI | undefined, key: string, value: any, configurationTarget?: ConfigurationTarget): Promise<void> {
const language = resource ? this.getLanguage(resource, null) : null;
const configurationValue = this.configurationService.inspect(key, { resource, overrideIdentifier: language });
if (configurationTarget === undefined) {
configurationTarget = this.deriveConfigurationTarget(configurationValue, language);
src/vs/workbench/contrib/chat/browser/chatStatus.ts
+6 -9
View File
@@ -35,6 +35,8 @@ import { Link } from '../../../../platform/opener/browser/link.js';
import { IOpenerService } from '../../../../platform/opener/common/opener.js';
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
import { IChatStatusItemService, ChatStatusEntry } from './chatStatusItemService.js';
import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
const gaugeBackground = registerColor('gauge.background', {
dark: inputValidationInfoBorder,
@@ -249,6 +251,7 @@ class ChatStatusDashboard extends Disposable {
@ILanguageService private readonly languageService: ILanguageService,
@IOpenerService private readonly openerService: IOpenerService,
@ITelemetryService private readonly telemetryService: ITelemetryService,
@ITextResourceConfigurationService private readonly textResourceConfigurationService: ITextResourceConfigurationService,
) {
super();
}
@@ -516,17 +519,11 @@ class ChatStatusDashboard extends Disposable {
private createNextEditSuggestionsSetting(container: HTMLElement, label: string, modeId: string | undefined, completionsSettingAccessor: ISettingsAccessor, disposables: DisposableStore): void {
const nesSettingId = defaultChat.nextEditSuggestionsSetting;
const completionsSettingId = defaultChat.completionsEnablementSetting;
const resource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
const checkbox = this.createSetting(container, nesSettingId, label, {
readSetting: () => this.configurationService.getValue<boolean>(nesSettingId, { overrideIdentifier: modeId }),
writeSetting: (value: boolean) => {
const { overrideIdentifiers } = this.configurationService.inspect(nesSettingId, { overrideIdentifier: modeId });
if (modeId && overrideIdentifiers?.includes(modeId)) {
return this.configurationService.updateValue(nesSettingId, value, { overrideIdentifier: modeId });
}
return this.configurationService.updateValue(nesSettingId, value);
}
readSetting: () => this.textResourceConfigurationService.getValue<boolean>(resource, nesSettingId),
writeSetting: (value: boolean) => this.textResourceConfigurationService.updateValue(resource, nesSettingId, value)
}, disposables);
// enablement of NES depends on completions setting