From 6df9a9798cfc6ca6561f3d1e8f79b537e5d1fcdd Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:58:01 -0800
Subject: [PATCH] Fix roundedSelection when line rendering is mixed

Fixes #233797
---
 src/vs/editor/browser/view/renderingContext.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/browser/view/renderingContext.ts b/src/vs/editor/browser/view/renderingContext.ts
index f0d5b5357c14c..e5ec4b30eca6e 100644
--- 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 {