Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-30 04:06:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow single line decorations that are not at the end of the line

Browse Source
This commit is contained in:
Alex Dima
2021-05-21 22:21:56 +02:00
parent 84f5040b3d
commit 51aa5402d6
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/inlineCompletions/ghostTextWidget.ts
+11 -13
View File
@@ -59,12 +59,10 @@ export abstract class BaseGhostTextWidgetModel extends Disposable implements Gho
}
export class GhostTextWidget extends Disposable {
private static instanceCount = 0;
private static decorationTypeCount = 0;
// We add 0 to bring it before any other decoration.
private readonly _codeEditorDecorationTypeKey = `0-ghost-text-${++GhostTextWidget.instanceCount}`;
private codeEditorDecorationTypeKey: string | null = null;
private readonly modelRef = this._register(new MutableDisposable<IReference<GhostTextWidgetModel>>());
private hasDecoration = false;
private decorationIds: string[] = [];
private viewZoneId: string | null = null;
private viewMoreContentWidget: ViewMoreLinesContentWidget | null = null;
@@ -118,8 +116,7 @@ export class GhostTextWidget extends Disposable {
const maxColumn = textModel.getLineMaxColumn(position.lineNumber);
const { tabSize } = textModel.getOptions();
// TODO enable single line decorations that are not at the end of the line
if (/*lines.length > 1 &&*/ position.column !== maxColumn) {
if (lines.length > 1 && position.column !== maxColumn) {
console.warn('Can only show multiline ghost text at the end of a line');
lines = [];
position = new Position(position.lineNumber, maxColumn);
@@ -131,9 +128,9 @@ export class GhostTextWidget extends Disposable {
private render(): void {
const renderData = this.getRenderData();
if (this.hasDecoration) {
this.hasDecoration = false;
this._codeEditorService.removeDecorationType(this._codeEditorDecorationTypeKey);
if (this.codeEditorDecorationTypeKey) {
this._codeEditorService.removeDecorationType(this.codeEditorDecorationTypeKey);
this.codeEditorDecorationTypeKey = null;
}
if (renderData) {
@@ -142,21 +139,22 @@ export class GhostTextWidget extends Disposable {
if (suggestPreviewForeground) {
opacity = String(suggestPreviewForeground.rgba.a);
}
this._codeEditorService.registerDecorationType(this._codeEditorDecorationTypeKey, {
// We add 0 to bring it before any other decoration.
this.codeEditorDecorationTypeKey = `0-ghost-text-${++GhostTextWidget.decorationTypeCount}`;
this._codeEditorService.registerDecorationType(this.codeEditorDecorationTypeKey, {
after: {
// TODO: escape?
contentText: renderData.lines[0],
opacity,
}
});
this.hasDecoration = true;
}
const newDecorations = new Array<IModelDeltaDecoration>();
if (renderData) {
if (renderData && this.codeEditorDecorationTypeKey) {
newDecorations.push({
range: Range.fromPositions(renderData.position, renderData.position),
options: this._codeEditorService.resolveDecorationOptions(this._codeEditorDecorationTypeKey, true)
options: this._codeEditorService.resolveDecorationOptions(this.codeEditorDecorationTypeKey, true)
});
}
this.decorationIds = this.editor.deltaDecorations(this.decorationIds, newDecorations);