Skip to content

Commit 32e015a

Browse files
committed
try something
1 parent 75ddb39 commit 32e015a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ export class InlineCompletionsController extends Disposable {
5757
}
5858
));
5959
private readonly _enabled = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
60-
private readonly _enabledForScreenReader = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => !this._accessibilityService.isScreenReaderOptimized() || this._contextKeyService.getContextKeyValue('voiceChatInProgress') === false);
61-
private readonly _isEnabled = this._enabled.get() && this._enabledForScreenReader.get();
60+
private readonly _isScreenReaderEnabled = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
61+
private readonly _voiceChatInProgress = observableFromEvent(this._contextKeyService.onDidChangeContext, () => this._contextKeyService.getContext(this.editor.getDomNode()).getValue('voiceChatInProgress') === true);
62+
63+
private readonly _isEnabled = this._enabled.get() && (!this._isScreenReaderEnabled.get() || !this._voiceChatInProgress.get());
6264

6365
private readonly _fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).fontFamily);
6466

@@ -125,7 +127,8 @@ export class InlineCompletionsController extends Disposable {
125127
observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.suggest).previewMode),
126128
observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.inlineSuggest).mode),
127129
this._enabled,
128-
this._enabledForScreenReader
130+
this._isScreenReaderEnabled,
131+
this._voiceChatInProgress
129132
);
130133
this.model.set(model, tx);
131134
}
@@ -165,6 +168,7 @@ export class InlineCompletionsController extends Disposable {
165168
this._register(editor.onDidType(() => transaction(tx => {
166169
/** @description InlineCompletionsController.onDidType */
167170
this.updateObservables(tx, VersionIdChangeReason.Other);
171+
console.log('enabled', this._isEnabled);
168172
if (this._isEnabled) {
169173
this.model.get()?.trigger(tx);
170174
}

src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ export class InlineCompletionsModel extends Disposable {
6060
private readonly _suggestPreviewMode: IObservable<'prefix' | 'subword' | 'subwordSmart'>,
6161
private readonly _inlineSuggestMode: IObservable<'prefix' | 'subword' | 'subwordSmart'>,
6262
private readonly _enabled: IObservable<boolean>,
63-
private readonly _enabledForScreenReader: IObservable<boolean>,
63+
private readonly _isScreenReaderEnabled: IObservable<boolean>,
64+
private readonly _voiceChatInProgress: IObservable<boolean>,
6465
@IInstantiationService private readonly _instantiationService: IInstantiationService,
6566
@ICommandService private readonly _commandService: ICommandService,
6667
@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
@@ -108,7 +109,7 @@ export class InlineCompletionsModel extends Disposable {
108109
},
109110
}, (reader, changeSummary) => {
110111
this._forceUpdateExplicitlySignal.read(reader);
111-
const shouldUpdate = (this._enabled.read(reader) && this._enabledForScreenReader.read(reader) && this.selectedSuggestItem.read(reader)) || this._isActive.read(reader);
112+
const shouldUpdate = (this._enabled.read(reader) && (!this._isScreenReaderEnabled.read(reader) || !this._voiceChatInProgress.read(reader)) && this.selectedSuggestItem.read(reader)) || this._isActive.read(reader);
112113
if (!shouldUpdate) {
113114
this._source.cancelUpdate();
114115
return undefined;

0 commit comments

Comments
 (0)