Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/vs/editor/common/model/textModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3267,13 +3267,13 @@ class DecorationsTrees {
public getInjectedTextInInterval(host: IDecorationsTreesHost, start: number, end: number, filterOwnerId: number): model.IModelDecoration[] {
const versionId = host.getVersionId();
const result = this._injectedTextDecorationsTree.intervalSearch(start, end, filterOwnerId, false, versionId);
return this._ensureNodesHaveRanges(host, result);
return this._ensureNodesHaveRanges(host, result).filter((i) => i.options.showIfCollapsed || !i.range.isEmpty());
}

public getAllInjectedText(host: IDecorationsTreesHost, filterOwnerId: number): model.IModelDecoration[] {
const versionId = host.getVersionId();
const result = this._injectedTextDecorationsTree.search(filterOwnerId, false, versionId);
return this._ensureNodesHaveRanges(host, result);
return this._ensureNodesHaveRanges(host, result).filter((i) => i.options.showIfCollapsed || !i.range.isEmpty());
}

public getAll(host: IDecorationsTreesHost, filterOwnerId: number, filterOutValidation: boolean, overviewRulerOnly: boolean): model.IModelDecoration[] {
Expand Down
3 changes: 2 additions & 1 deletion src/vs/editor/contrib/inlineCompletions/ghostTextWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ class DecorationsWidget implements IDisposable {
range: Range.fromPositions(new Position(lineNumber, p.column)),
options: shouldUseInjectedText ? {
description: 'ghost-text',
after: { content: contentText, inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration' }
after: { content: contentText, inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration' },
showIfCollapsed: true,
} : {
...decorationType.resolve()
}
Expand Down
3 changes: 3 additions & 0 deletions src/vs/editor/test/common/model/modelInjectedText.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ suite('Editor Model - Injected Text Events', () => {
options: {
after: { content: 'injected1' },
description: 'test1',
showIfCollapsed: true
},
range: new Range(1, 1, 1, 1),
}]);
Expand All @@ -51,12 +52,14 @@ suite('Editor Model - Injected Text Events', () => {
options: {
after: { content: 'injected1' },
description: 'test1',
showIfCollapsed: true
},
range: new Range(2, 1, 2, 1),
}, {
options: {
after: { content: 'injected2' },
description: 'test2',
showIfCollapsed: true
},
range: new Range(2, 2, 2, 2),
}]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,8 @@ suite('SplitLinesCollection', () => {
description: 'example',
after: {
content: 'very very long injected text that causes a line break'
}
},
showIfCollapsed: true,
}
}]);

Expand Down
6 changes: 4 additions & 2 deletions src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ suite('ViewModel', () => {
description: 'test',
before: {
content: 'bar'
}
},
showIfCollapsed: true
}
},
{
Expand All @@ -319,7 +320,8 @@ suite('ViewModel', () => {
description: 'test',
before: {
content: 'bz'
}
},
showIfCollapsed: true
}
},
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@ class TestMessageDecoration implements ITestDecoration {
content: renderStringAsPlaintext(message),
inlineClassName: `test-message-inline-content test-message-inline-content-s${severity} ${this.contentIdClass}`
};
options.showIfCollapsed = true;

const rulerColor = severity === TestMessageType.Error
? overviewRulerError
Expand Down