Fixes microsoft#188388 (microsoft#188495)

Author: hediet

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

@@ -30,12 +30,13 @@ export class InlineCompletionContextKeys extends Disposable {
 
 		this._register(autorun('update context key: inlineCompletionVisible, suppressSuggestions', (reader) => {
 			const model = this.model.read(reader);
-			const suggestion = model?.selectedInlineCompletion.read(reader);
-			const ghostText = model?.ghostText.read(reader);
-			this.inlineCompletionVisible.set(ghostText !== undefined && !ghostText.isEmpty());
+			const state = model?.state.read(reader);
+
+			const isInlineCompletionVisible = !!state?.inlineCompletion && state?.ghostText !== undefined && !state?.ghostText.isEmpty();
+			this.inlineCompletionVisible.set(isInlineCompletionVisible);
 
-			if (ghostText && suggestion) {
-				this.suppressSuggestions.set(suggestion.inlineCompletion.source.inlineCompletions.suppressSuggestions);
+			if (state?.ghostText && state?.inlineCompletion) {
+				this.suppressSuggestions.set(state.inlineCompletion.inlineCompletion.source.inlineCompletions.suppressSuggestions);
 			}
 		}));
 

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

@@ -172,13 +172,13 @@ export class InlineCompletionsController extends Disposable {
 		this._register(autorun('play audio cue & read suggestion', reader => {
 			const model = this.model.read(reader);
 			const state = model?.state.read(reader);
-			if (!model || !state || !state.completion) {
+			if (!model || !state || !state.inlineCompletion) {
 				lastInlineCompletionId = undefined;
 				return;
 			}
 
-			if (state.completion.semanticId !== lastInlineCompletionId) {
-				lastInlineCompletionId = state.completion.semanticId;
+			if (state.inlineCompletion.semanticId !== lastInlineCompletionId) {
+				lastInlineCompletionId = state.inlineCompletion.semanticId;
 				const lineText = model.textModel.getLineContent(state.ghostText.lineNumber);
 				this.audioCueService.playAudioCue(AudioCue.inlineSuggestion).then(() => {
 					if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {

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

@@ -65,7 +65,7 @@ export class InlineCompletionsModel extends Disposable {
 		let lastItem: InlineCompletionWithUpdatedRange | undefined = undefined;
 		this._register(autorun('call handleItemDidShow', reader => {
 			const item = this.state.read(reader);
-			const completion = item?.completion;
+			const completion = item?.inlineCompletion;
 			if (completion?.semanticId !== lastItem?.semanticId) {
 				lastItem = completion;
 				if (completion) {
@@ -191,7 +191,7 @@ export class InlineCompletionsModel extends Disposable {
 
 	public readonly state = derived<{
 		suggestItem: SuggestItemInfo | undefined;
-		completion: InlineCompletionWithUpdatedRange | undefined;
+		inlineCompletion: InlineCompletionWithUpdatedRange | undefined;
 		ghostText: GhostTextOrReplacement;
 	} | undefined>('ghostTextAndCompletion', (reader) => {
 		const model = this.textModel;
@@ -225,7 +225,7 @@ export class InlineCompletionsModel extends Disposable {
 
 			// Show an invisible ghost text to reserve space
 			const ghostText = newGhostText ?? new GhostText(edit.range.endLineNumber, []);
-			return { ghostText, completion: augmentedCompletion?.completion, suggestItem };
+			return { ghostText, inlineCompletion: augmentedCompletion?.completion, suggestItem };
 		} else {
 			if (!this._isActive.read(reader)) { return undefined; }
 			const item = this.selectedInlineCompletion.read(reader);
@@ -235,7 +235,7 @@ export class InlineCompletionsModel extends Disposable {
 			const mode = this._inlineSuggestMode.read(reader);
 			const cursor = this.cursorPosition.read(reader);
 			const ghostText = replacement.computeGhostText(model, mode, cursor);
-			return ghostText ? { ghostText, completion: item, suggestItem: undefined } : undefined;
+			return ghostText ? { ghostText, inlineCompletion: item, suggestItem: undefined } : undefined;
 		}
 	});
 
@@ -271,10 +271,10 @@ export class InlineCompletionsModel extends Disposable {
 		}
 
 		const state = this.state.get();
-		if (!state || state.ghostText.isEmpty() || !state.completion) {
+		if (!state || state.ghostText.isEmpty() || !state.inlineCompletion) {
 			return;
 		}
-		const completion = state.completion.toInlineCompletion(undefined);
+		const completion = state.inlineCompletion.toInlineCompletion(undefined);
 
 		editor.pushUndoStop();
 		if (completion.snippetInfo) {
@@ -363,11 +363,11 @@ export class InlineCompletionsModel extends Disposable {
 		}
 
 		const state = this.state.get();
-		if (!state || state.ghostText.isEmpty() || !state.completion) {
+		if (!state || state.ghostText.isEmpty() || !state.inlineCompletion) {
 			return;
 		}
 		const ghostText = state.ghostText;
-		const completion = state.completion.toInlineCompletion(undefined);
+		const completion = state.inlineCompletion.toInlineCompletion(undefined);
 
 		if (completion.snippetInfo || completion.filterText !== completion.insertText) {
 			// not in WYSIWYG mode, partial commit might change completion, thus it is not supported