Commit `54f83256b5`

54f83256b552959a29ee327f55728a9cc75070ba

parent: a615251f3a

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-14 06:07 UTC

Definitions: one id for each code line; a full-width mark

The file view's rows are scrolled to by the index they are drawn with,
so a line far down a long file is found before it is drawn. The target
line's mark spans the row, and only that row carries an identifier and
the selected trait. A symbol's identity includes its kind, since two
can share a line.

Ref #28

Layout: unified · split

gitbay/Repos/SymbolSearchViewModel.swift +1 −1

	@@ -12,7 +12,7 @@ final class SymbolSearchViewModel {
12	let kind: String	12	let kind: String
13	let path: String	13	let path: String
14	let line: Int	14	let line: Int
15	var id: String { "\(path):\(line):\(name)" }	15	var id: String { "\(path):\(line):\(kind):\(name)" }
16	}	16	}
17		17
18	/// The kinds `--kind` takes, as the command's help lists them.	18	/// The kinds `--kind` takes, as the command's help lists them.

gitbay/Views/Repos/FileView.swift +23 −4

         ScrollViewReader { proxy in
             ScrollView([.horizontal, .vertical]) {
                 LazyVStack(alignment: .leading, spacing: 0) {
+                    // The row's identity is its 0-based index, the one
+                    // scrollTo names: a lazy row not yet drawn has no other.
                     ForEach(lines.indices, id: \.self) { index in
+                        let target = index + 1 == line
                         Text(lines[index].characters.isEmpty ? " " : lines[index])
                             .fixedSize()
-                            .background(index + 1 == line ? Color.gbMark.opacity(0.18) : .clear)
+                            .frame(maxWidth: .infinity, alignment: .leading)
-                            .id(index + 1)
+                            .background(target ? Color.gbMark.opacity(0.18) : .clear)
-                            .accessibilityIdentifier(index + 1 == line ? "file-target-line" : "")
+                            .modifier(TargetLine(on: target))
                     }
                 }
                 .padding(12)
                     // A frame for the highlighted lines to exist before the
                     // jump, or the lazy stack has nothing to scroll to.
                     await Task.yield()
-                    proxy.scrollTo(line, anchor: UnitPoint(x: 0, y: 0.3))
+                    proxy.scrollTo(line - 1, anchor: UnitPoint(x: 0, y: 0.3))
                 }
             }
         }
     }
 }
+/// The line a definition or a match opened at: named for VoiceOver and
+/// for UI tests, and left alone on every other row.
+private struct TargetLine: ViewModifier {
+    let on: Bool
+    func body(content: Content) -> some View {
+        if on {
+            content
+                .accessibilityIdentifier("file-target-line")
+                .accessibilityAddTraits(.isSelected)
+        } else {
+            content
+        }
+    }
+}
 /// A file's lines, each keeping its highlighting. A trailing newline ends
 /// the last line rather than starting an empty one.
 nonisolated func codeLines(_ source: NSAttributedString) -> [AttributedString] {

gitbayTests/SymbolTests.swift +1 −1

	@@ -31,7 +31,7 @@ struct SymbolSearchTests {
31	await model.search(" Dispatch ")	31	await model.search(" Dispatch ")
32		32
33	#expect(argv(try #require(stub.seen.first).url) == ["repo", "symbols", "krz/gitbay", "Dispatch"])	33	#expect(argv(try #require(stub.seen.first).url) == ["repo", "symbols", "krz/gitbay", "Dispatch"])
34	#expect(model.state?.value?.map(\.id) == ["internal/control/control.go:120:Dispatch", "internal/control/test.go:9:DispatchIn"])	34	#expect(model.state?.value?.map(\.id) == ["internal/control/control.go:120:function:Dispatch", "internal/control/test.go:9:function:DispatchIn"])
35	}	35	}
36		36
37	@Test func aKindNarrowsTheSearch() async throws {	37	@Test func aKindNarrowsTheSearch() async throws {

Commit 54f83256b5

Commit `54f83256b5`