Merge pull request #233923 from microsoft/tyriar/233797

Fix roundedSelection when line rendering is mixed
microsoft · Nov 15, 2024 · ab41c45 · ab41c45
2 parents 78742c4 + 6df9a97
commit ab41c45
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/vs/editor/browser/view/renderingContext.ts b/src/vs/editor/browser/view/renderingContext.ts
@@ -85,17 +85,13 @@ export class RenderingContext extends RestrictedRenderingContext {
 			return domRanges ?? null;
 		}
 		const gpuRanges = this._viewLinesGpu.linesVisibleRangesForRange(range, includeNewLines);
-		if (!domRanges && !gpuRanges) {
-			return null;
-		}
-		const ranges = [];
-		if (domRanges) {
-			ranges.push(...domRanges);
+		if (!domRanges) {
+			return gpuRanges;
 		}
-		if (gpuRanges) {
-			ranges.push(...gpuRanges);
+		if (!gpuRanges) {
+			return domRanges;
 		}
-		return ranges;
+		return domRanges.concat(gpuRanges).sort((a, b) => a.lineNumber - b.lineNumber);
 	}
 
 	public visibleRangeForPosition(position: Position): HorizontalPosition | null {