Update to latest Neon

ChimeHQ · Feb 20, 2024 · 3307809 · 3307809
1 parent 9d65be9
commit 3307809
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Edit.xcodeproj/project.pbxproj b/Edit.xcodeproj/project.pbxproj
@@ -4363,7 +4363,7 @@
 			repositoryURL = "https://github.com/ChimeHQ/Neon.git";
 			requirement = {
 				kind = revision;
-				revision = e49e0c2595be56d28d82ed711b2dcac1fc60379a;
+				revision = 7b6651b781e7079c31c107fc8f75a0be935dbbba;
 			};
 		};
 		C9409C642A98CC9800B5D898 /* XCRemoteSwiftPackageReference "Outline" */ = {

diff --git a/Edit/Modules/Highlighting/TextViewSystemNeonInterface.swift b/Edit/Modules/Highlighting/TextViewSystemNeonInterface.swift
@@ -44,8 +44,8 @@ extension TextViewSystemNeonInterface: TextSystemInterface {
 		}
 	}
 
-	public var visibleRange: NSRange {
-		textSystem.textLayout.visibleRange()
+	public var visibleSet: IndexSet {
+		textSystem.textLayout.visibleSet()
 	}
 
 	public var content: some VersionedContent {

diff --git a/Edit/Modules/TextSystem/TextLayout.swift b/Edit/Modules/TextSystem/TextLayout.swift
@@ -10,7 +10,7 @@ public struct TextLayout {
 	}
 
 	public let visibleRect: () -> NSRect
-	public let visibleRange: () -> NSRange
+	public let visibleSet: () -> IndexSet
 	public let lineFragmentsInRect: (NSRect) -> [LineFragment]
 	public let lineFragmentsInRange: (NSRange) -> [LineFragment]
 }
@@ -108,15 +108,15 @@ extension TextLayout {
 			visibleRect: {
 				textLayoutManager.textViewportLayoutController.viewportBounds
 			},
-			visibleRange: {
+			visibleSet: {
 				guard
 					let contentManager = textLayoutManager.textContentManager,
 					let textRange = textLayoutManager.textViewportLayoutController.viewportRange
 				else {
-					return .zero
+					return IndexSet()
 				}
 
-				return NSRange(textRange, provider: contentManager)
+				return IndexSet(NSRange(textRange, provider: contentManager))
 			},
 			lineFragmentsInRect: { rect in
 				guard let contentManager = textLayoutManager.textContentManager else { return [] }
@@ -166,16 +166,17 @@ extension TextLayout {
 			visibleRect: {
 				container.textView!.visibleRect
 			},
-			visibleRange: {
+			visibleSet: {
 				let view = container.textView!
 
 				let origin = view.textContainerOrigin
 				let offsetRect = view.visibleRect.offsetBy(dx: -origin.x, dy: -origin.y)
 
 				let glyphRange = layoutManager.glyphRange(forBoundingRect: offsetRect, in: container)
 
-				return layoutManager.characterRange(forGlyphRange: glyphRange, actualGlyphRange: nil)
+				let range = layoutManager.characterRange(forGlyphRange: glyphRange, actualGlyphRange: nil)
 
+				return IndexSet(range)
 			},
 			lineFragmentsInRect: { rect in
 				return []