Skip to content

Commit 1864dfd

Browse files
authored
* Fixes microsoft#186675 * Don't show screen reader hover when the text is read automatically.
1 parent 6bad769 commit 1864dfd

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export class InlineCompletionsHoverParticipant implements IEditorHoverParticipan
103103
comment: 'This event tracks whenever an inline completion hover is shown.';
104104
}>('inlineCompletionHover.shown');
105105

106-
if (this.accessibilityService.isScreenReaderOptimized()) {
106+
if (this.accessibilityService.isScreenReaderOptimized() && !this._editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
107107
this.renderScreenReaderText(context, part, disposableStore);
108108
}
109109

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@ export class InlineCompletionsController extends Disposable {
179179

180180
if (state.completion.semanticId !== lastInlineCompletionId) {
181181
lastInlineCompletionId = state.completion.semanticId;
182-
if (model.isNavigatingCurrentInlineCompletion) {
183-
return;
184-
}
185-
186182
this.audioCueService.playAudioCue(AudioCue.inlineSuggestion).then(() => {
187183
if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
188184
const lineText = model.textModel.getLineContent(state.ghostText.lineNumber);

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ export class InlineCompletionsModel extends Disposable {
4444
private _isAcceptingPartially = false;
4545
public get isAcceptingPartially() { return this._isAcceptingPartially; }
4646

47-
private _isNavigatingCurrentInlineCompletion = false;
48-
public get isNavigatingCurrentInlineCompletion() { return this._isNavigatingCurrentInlineCompletion; }
49-
5047
constructor(
5148
public readonly textModel: ITextModel,
5249
public readonly selectedSuggestItem: IObservable<SuggestItemInfo | undefined>,
@@ -251,17 +248,12 @@ export class InlineCompletionsModel extends Disposable {
251248
private async _deltaSelectedInlineCompletionIndex(delta: 1 | -1): Promise<void> {
252249
await this.triggerExplicitly();
253250

254-
this._isNavigatingCurrentInlineCompletion = true;
255-
try {
256-
const completions = this._filteredInlineCompletionItems.get() || [];
257-
if (completions.length > 0) {
258-
const newIdx = (this.selectedInlineCompletionIndex.get() + delta + completions.length) % completions.length;
259-
this._selectedInlineCompletionId.set(completions[newIdx].semanticId, undefined);
260-
} else {
261-
this._selectedInlineCompletionId.set(undefined, undefined);
262-
}
263-
} finally {
264-
this._isNavigatingCurrentInlineCompletion = false;
251+
const completions = this._filteredInlineCompletionItems.get() || [];
252+
if (completions.length > 0) {
253+
const newIdx = (this.selectedInlineCompletionIndex.get() + delta + completions.length) % completions.length;
254+
this._selectedInlineCompletionId.set(completions[newIdx].semanticId, undefined);
255+
} else {
256+
this._selectedInlineCompletionId.set(undefined, undefined);
265257
}
266258
}
267259

0 commit comments

Comments
 (0)