Commit `7aa3869f79`

7aa3869f79c7664c3fef5d2a798f98fc014aa158

parent: 9b8ed56d54

Verified · cmc

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

Jump to a definition: link per drawn row; prose is not linked

Linking runs as a row is drawn rather than over the whole file when the
definitions arrive. Markdown, org and text files are not linked: a word
in a sentence that names a section would link everywhere it appears. A
one-letter name defined more than once opens its first definition,
since repo symbols takes two characters at least.

Ref #29

Layout: unified · split

gitbay/Repos/FileViewModel.swift +4

             state = .from(error)
             return
         }
+        // Prose is not code: a word in it that names a section or a
+        // function would link from every sentence it appears in.
+        guard MarkupPreview.format(forFile: fileName) == nil,
+              !["txt", "text"].contains((fileName as NSString).pathExtension.lowercased()) else { return }
         // After the file, which draws first; the links follow.
         let found = (try? await client.readList(defs, of: Definition.self)) ?? []
         definitions = Dictionary(found.map { ($0.name, $0) }, uniquingKeysWith: { a, _ in a })

gitbay/Views/Repos/FileView.swift +8 −11

                         }
                         // Defined once: that line, at the ref on screen, as the
                         // web links it. More often: the search, to choose.
-                        if def.count == 1 {
+                        // repo symbols takes two characters at least, so a
+                        // one-letter name defined more often opens its first.
+                        if def.count == 1 || name.count < 2 {
                             pushRoute(RepoRoute.file(repo: model.repoPath, path: def.path, ref: model.ref, line: def.line))
                         } else {
                             pushRoute(RepoRoute.symbols(repo: model.repoPath, query: name))
     var line: Int?
     var definitions: [String: Definition] = [:]
-    @State private var highlighted: [AttributedString] = []
     @State private var lines: [AttributedString] = []
     var body: some View {
                     // 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])
+                        // Linked as the row is drawn, so a long file costs
+                        // only the rows on screen.
+                        let shown = definitions.isEmpty ? lines[index] : Definition.link(lines[index], definitions: definitions)
+                        Text(shown.characters.isEmpty ? " " : shown)
                             .fixedSize()
                             .frame(maxWidth: .infinity, alignment: .leading)
                             .background(target ? Color.gbMark.opacity(0.18) : .clear)
             .defaultScrollAnchor(.topLeading)
             .font(.gbMono(.caption))
             .task(id: colorScheme) {
-                highlighted = highlightedLines()
+                lines = highlightedLines()
-                lines = linked(highlighted)
                 if let line, line <= lines.count {
                     // A frame for the highlighted lines to exist before the
                     // jump, or the lazy stack has nothing to scroll to.
                     proxy.scrollTo(line - 1, anchor: UnitPoint(x: 0, y: 0.3))
                 }
             }
-            // The definitions arrive after the file; link what is drawn.
-            .onChange(of: definitions) { lines = linked(highlighted) }
         }
     }
-    private func linked(_ lines: [AttributedString]) -> [AttributedString] {
-        definitions.isEmpty ? lines : lines.map { Definition.link($0, definitions: definitions) }
-    }
     private func highlightedLines() -> [AttributedString] {
         let size = UIFont.preferredFont(forTextStyle: .caption1).pointSize
         let font = UIFont(name: "Atkinson Hyperlegible Mono", size: size)

gitbayTests/DefinitionLinkTests.swift +14

	@@ -82,4 +82,18 @@ struct FileDefinitionsTests {
82	#expect(model.state.value?.content == "Parse()\n")	82	#expect(model.state.value?.content == "Parse()\n")
83	#expect(model.definitions.isEmpty)	83	#expect(model.definitions.isEmpty)
84	}	84	}
		85
		86	@Test func proseFilesAreNotLinked() async throws {
		87	let (client, stub) = try makeClient()
		88	stub.enqueue(.init(status: 200, json: """
		89	{"protocol_version":1,"data":{"path":"krz/app","ref":"main","file":"README.md","size":10,\
		90	"binary":false,"content":"# Parse\\n"},"exit_code":0}
		91	""", match: "argv=cat"))
		92	let model = FileViewModel(client: client, repoPath: "krz/app", filePath: "README.md", ref: "main")
		93
		94	await model.load()
		95
		96	#expect(model.state.value != nil)
		97	#expect(!stub.seen.contains { $0.url.absoluteString.contains("argv=definitions") })
		98	}
85	}	99	}

Commit 7aa3869f79

Commit `7aa3869f79`