Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-19 22:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #228033 (#243234)

Browse Source
This commit is contained in:
Henning Dieterichs
2025-03-11 19:13:38 +01:00
committed by GitHub
parent ef3d0c75cf
commit 85e7090710
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+8 -4
View File
@@ -243,7 +243,7 @@ export class InlineCompletionsController extends Disposable {
const currentInlineCompletionBySemanticId = derivedObservableWithCache<string | undefined>(this, (reader, last) => {
const model = this.model.read(reader);
const state = model?.inlineCompletionState.read(reader);
const state = model?.state.read(reader);
if (this._suggestWidgetAdapter.selectedItem.get()) {
return last;
}
@@ -256,16 +256,20 @@ export class InlineCompletionsController extends Disposable {
}), async (_value, _, _deltas, store) => {
/** @description InlineCompletionsController.playAccessibilitySignalAndReadSuggestion */
const model = this.model.get();
const state = model?.inlineCompletionState.get();
const state = model?.state.get();
if (!state || !model) { return; }
const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
const lineText = state.kind === 'ghostText' ? model.textModel.getLineContent(state.primaryGhostText.lineNumber) : '';
await timeout(50, cancelOnDispose(store));
await waitForState(this._suggestWidgetAdapter.selectedItem, isUndefined, () => false, cancelOnDispose(store));
await this._accessibilitySignalService.playSignal(AccessibilitySignal.inlineSuggestion);
if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
if (state.kind === 'ghostText') {
this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
} else {
this._provideScreenReaderUpdate(''); // Only announce Alt+F2
}
}
}));
src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
+19 -8
View File
@@ -14,12 +14,16 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
import { Disposable } from '../../../../base/common/lifecycle.js';
import { InlineCompletionsModel } from './model/inlineCompletionsModel.js';
import { TextEdit } from '../../../common/core/textEdit.js';
import { LineEdit } from '../../../common/core/lineEdit.js';
import { TextModelText } from '../../../common/model/textModelText.js';
import { localize } from '../../../../nls.js';
export class InlineCompletionsAccessibleView implements IAccessibleViewImplementation {
readonly type = AccessibleViewType.View;
readonly priority = 95;
readonly name = 'inline-completions';
readonly when = ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible);
readonly when = ContextKeyExpr.or(InlineCompletionContextKeys.inlineSuggestionVisible, InlineCompletionContextKeys.inlineEditVisible);
getProvider(accessor: ServicesAccessor) {
const codeEditorService = accessor.get(ICodeEditorService);
const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
@@ -28,7 +32,7 @@ export class InlineCompletionsAccessibleView implements IAccessibleViewImplement
}
const model = InlineCompletionsController.get(editor)?.model.get();
if (!model?.inlineCompletionState.get()) {
if (!model?.state.get()) {
return;
}
@@ -51,16 +55,23 @@ class InlineCompletionsAccessibleViewContentProvider extends Disposable implemen
public readonly options = { language: this._editor.getModel()?.getLanguageId() ?? undefined, type: AccessibleViewType.View };
public provideContent(): string {
const state = this._model.inlineCompletionState.get();
const state = this._model.state.get();
if (!state) {
throw new Error('Inline completion is visible but state is not available');
}
const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
if (!ghostText) {
throw new Error('Inline completion is visible but ghost text is not available');
if (state.kind === 'ghostText') {
const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
if (!ghostText) {
throw new Error('Inline completion is visible but ghost text is not available');
}
return lineText + ghostText;
} else {
const text = new TextModelText(this._model.textModel);
const lineEdit = LineEdit.fromTextEdit(new TextEdit(state.edits), text);
return localize('inlineEditAvailable', 'There is an inline edit available:') + '\n' + lineEdit.humanReadablePatch(text.getLines());
}
return lineText + ghostText;
}
public provideNextContent(): string | undefined {
// asynchronously update the model and fire the event