Progress.

Azure · Dec 10, 2024 · 818d841 · 818d841
1 parent ac0581b
commit 818d841
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/swift/SwiftAPIViewCore/Sources/APIViewManager.swift b/src/swift/SwiftAPIViewCore/Sources/APIViewManager.swift
@@ -232,8 +232,7 @@ public class APIViewManager: SyntaxVisitor {
         }
         config.packageName = packageName!
         config.packageVersion = packageVersion!
-        let apiViewName = "\(packageName!) (version \(packageVersion!))"
-        let apiView = APIViewModel(name: apiViewName, packageName: packageName!, versionString: packageVersion!, statements: Array(statements.values))
+        let apiView = APIViewModel(packageName: packageName!, packageVersion: packageVersion!, statements: Array(statements.values))
         return apiView
     }
 

diff --git a/src/swift/SwiftAPIViewCore/Sources/Models/APIViewModel.swift b/src/swift/SwiftAPIViewCore/Sources/Models/APIViewModel.swift
@@ -105,7 +105,6 @@ class APIViewModel: Tokenizable, Encodable {
         // FIXME: Actually wire this up!
         self.crossLanguagePackageId = nil
         self.tokenize(apiview: self, parent: nil)
-        model.navigationTokenize(apiview: self, parent: nil)
     }
 
     // MARK: Codable

diff --git a/src/swift/SwiftAPIViewCore/Sources/Models/PackageModel.swift b/src/swift/SwiftAPIViewCore/Sources/Models/PackageModel.swift
@@ -180,9 +180,10 @@ class PackageModel: Tokenizable, Linkable {
     func resolveTypeReferences(apiview a: APIViewModel) {
         for line in a.reviewLines {
             for (idx, token) in line.tokens.enumerated() {
-                guard token.navigateToId == APIViewModel.unresolved else { continue }
-                line.tokens[idx].navigateToId = a.definitionId(for: token.value!, withParent: nil)
-                assert (line.tokens[idx].navigateToId != APIViewModel.unresolved)
+                // FIXME: Fix this up.
+//                guard token.navigateToId == APIViewModel.unresolved else { continue }
+//                line.tokens[idx].navigateToId = a.definitionId(for: token.value!, withParent: nil)
+//                assert (line.tokens[idx].navigateToId != APIViewModel.unresolved)
             }
         }
     }

diff --git a/src/swift/SwiftAPIViewCore/Sources/Models/ReviewLine.swift b/src/swift/SwiftAPIViewCore/Sources/Models/ReviewLine.swift
@@ -54,7 +54,9 @@ class ReviewLine: Tokenizable, Encodable {
 
     /// Returns the text-based representation of all tokens
     var text: String {
-        return tokens.map { $0.text }.joined()
+        var tokenText = tokens.map { $0.text }
+        tokenText.append("\n")
+        return tokenText.joined()
     }
 
     // MARK: Codable