Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: don't show inline chat hint with ghost text #192642

Merged
merged 1 commit into from
Sep 8, 2023
Merged

fix: don't show inline chat hint with ghost text #192642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { InlineDecorationType } from 'vs/editor/common/viewModel';
import { GhostText, GhostTextReplacement } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
import { ColumnRange, applyObservableDecorations } from 'vs/editor/contrib/inlineCompletions/browser/utils';

export const GHOST_TEXT_DESCRIPTION = 'ghost-text';
export interface IGhostTextWidgetModel {
readonly targetTextModel: IObservable<ITextModel | undefined>;
readonly ghostText: IObservable<GhostText | GhostTextReplacement | undefined>;
Expand Down Expand Up @@ -100,7 +101,7 @@ export class GhostTextWidget extends Disposable {
}

if (lines.length > 0) {
addToAdditionalLines(lines, 'ghost-text');
addToAdditionalLines(lines, GHOST_TEXT_DESCRIPTION);
if (hiddenTextStartColumn === undefined && part.column <= textBufferLine.length) {
hiddenTextStartColumn = part.column;
}
Expand Down Expand Up @@ -151,7 +152,7 @@ export class GhostTextWidget extends Disposable {
decorations.push({
range: Range.fromPositions(new Position(uiState.lineNumber, p.column)),
options: {
description: 'ghost-text',
description: GHOST_TEXT_DESCRIPTION,
after: { content: p.text, inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration', cursorStops: InjectedTextCursorStops.Left },
showIfCollapsed: true,
}
Expand Down
35 changes: 30 additions & 5 deletions src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { Extensions, IConfigurationMigrationRegistry } from 'vs/workbench/common/configuration';
import { LOG_MODE_ID, OUTPUT_MODE_ID } from 'vs/workbench/services/output/common/output';
import { SEARCH_RESULT_LANGUAGE_ID } from 'vs/workbench/services/search/common/search';
import { GHOST_TEXT_DESCRIPTION } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextWidget';

const $ = dom.$;

Expand Down Expand Up @@ -91,17 +92,41 @@ export class EmptyTextEditorHintContribution implements IEditorContribution {
}));
}

private update(): void {
this.textHintContentWidget?.dispose();
private _shouldRenderHint() {
const configValue = this.configurationService.getValue(emptyTextEditorHintSetting);
if (configValue === 'hidden') {
return false;
}

if (this.editor.getOption(EditorOption.readOnly)) {
return false;
}

const hasGhostText = this.editor.getLineDecorations(0)?.find((d) => d.options.description === GHOST_TEXT_DESCRIPTION);
if (hasGhostText) {
return false;
}

const model = this.editor.getModel();
const languageId = model?.getLanguageId();
if (languageId === OUTPUT_MODE_ID || languageId === LOG_MODE_ID || languageId === SEARCH_RESULT_LANGUAGE_ID) {
return false;
}

const isNotebookCell = model?.uri.scheme === Schemas.vscodeNotebookCell;
if (isNotebookCell) {
return false;
}

const inlineChatProviders = [...this.inlineChatService.getAllProvider()];
const languageId = model?.getLanguageId();
const shouldRenderInlineChatHint = !this.editor.getOption(EditorOption.readOnly) && languageId !== OUTPUT_MODE_ID && languageId !== LOG_MODE_ID && languageId !== SEARCH_RESULT_LANGUAGE_ID && inlineChatProviders.length > 0;
const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID && !inlineChatProviders.length;
return inlineChatProviders.length > 0 || shouldRenderDefaultHint;
}

private update(): void {
this.textHintContentWidget?.dispose();

if ((shouldRenderDefaultHint || shouldRenderInlineChatHint) && configValue !== 'hidden') {
if (this._shouldRenderHint()) {
this.textHintContentWidget = new EmptyTextEditorHintContentWidget(
this.editor,
this.editorGroupsService,
Expand Down