Styling updates

Author: FastestMolasses

CodeEdit/Features/NavigatorArea/IssueNavigator/OutlineView/IssueNavigatorViewController+NSOutlineViewDelegate.swift

@@ -24,13 +24,13 @@ extension IssueNavigatorViewController: NSOutlineViewDelegate {
         guard let tableColumn else { return nil }
 
         let frameRect = NSRect(x: 0, y: 0, width: tableColumn.width, height: rowHeight)
-        let cell = StandardTableViewCell(frame: frameRect)
+
         if let node = item as? (any IssueNode) {
-            cell.configLabel(
-                    label: NSTextField(string: node.name),
-                    isEditable: false
-                )
+            let cell = IssueTableViewCell(frame: frameRect, node: node)
+            return cell
         }
+
+        let cell = TextTableViewCell(frame: frameRect, startingText: "Unknown item")
         return cell
     }
 

CodeEdit/Features/NavigatorArea/OutlineView/IssueTableViewCell.swift

@@ -5,4 +5,94 @@
 //  Created by Abe Malla on 3/16/25.
 //
 
+import SwiftUI
+import AppKit
 
+class IssueTableViewCell: StandardTableViewCell {
+
+    private var nodeIconView: NSImageView?
+    private var detailLabel: NSTextField?
+
+    var issueNode: (any IssueNode)?
+
+    /// Initializes the `IssueTableViewCell` with the issue node item
+    /// - Parameters:
+    ///   - frameRect: The frame of the cell.
+    ///   - node: The issue node the cell represents.
+    ///   - isEditable: Set to true if the user should be able to edit the name (rarely used for issues).
+    init(frame frameRect: NSRect, node: (any IssueNode)?, isEditable: Bool = false) {
+        super.init(frame: frameRect, isEditable: isEditable)
+        self.issueNode = node
+
+        secondaryLabelRightAligned = false
+        configureForNode(node)
+    }
+
+    override func configLabel(label: NSTextField, isEditable: Bool) {
+        super.configLabel(label: label, isEditable: isEditable)
+        label.lineBreakMode = .byTruncatingTail
+    }
+
+    override func createIcon() -> NSImageView {
+        let icon = super.createIcon()
+        if let diagnosticNode = issueNode as? DiagnosticIssueNode {
+            icon.contentTintColor = diagnosticNode.severityColor
+        }
+        return icon
+    }
+
+    func configureForNode(_ node: (any IssueNode)?) {
+        guard let node = node else { return }
+
+        textField?.stringValue = node.name
+
+        if let fileIssueNode = node as? FileIssueNode {
+            imageView?.image = fileIssueNode.nsIcon
+        } else if let diagnosticNode = node as? DiagnosticIssueNode {
+            imageView?.image = diagnosticNode.icon
+            imageView?.contentTintColor = diagnosticNode.severityColor
+        }
+
+        if let diagnosticNode = node as? DiagnosticIssueNode {
+            setupDetailLabel(with: diagnosticNode.locationString)
+        } else if let projectNode = node as? ProjectIssueNode {
+            let issuesCount = projectNode.errorCount + projectNode.warningCount
+
+            if issuesCount > 0 {
+                secondaryLabel?.stringValue = "\(issuesCount) issues"
+            }
+        }
+    }
+
+    private func setupDetailLabel(with text: String) {
+        detailLabel?.removeFromSuperview()
+
+        let detail = NSTextField(labelWithString: text)
+        detail.translatesAutoresizingMaskIntoConstraints = false
+        detail.drawsBackground = false
+        detail.isBordered = false
+        detail.font = .systemFont(ofSize: fontSize-2)
+        detail.textColor = .secondaryLabelColor
+
+        addSubview(detail)
+        detailLabel = detail
+    }
+
+    /// Returns the font size for the current row height. Defaults to `13.0`
+    private var fontSize: Double {
+        switch self.frame.height {
+        case 20: return 11
+        case 22: return 13
+        case 24: return 14
+        default: return 13
+        }
+    }
+
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init?(coder: NSCoder) isn't implemented on `IssueTableViewCell`.")
+    }
+}

CodeEdit/Features/NavigatorArea/OutlineView/StandardTableViewCell.swift

@@ -27,7 +27,6 @@ class StandardTableViewCell: NSTableCellView {
     init(frame frameRect: NSRect, isEditable: Bool = true) {
         super.init(frame: frameRect)
         setupViews(frame: frameRect, isEditable: isEditable)
-
     }
 
     // Default init, assumes isEditable to be false

CodeEdit/Features/NavigatorArea/ViewModels/IssueNavigatorViewModel.swift

@@ -162,7 +162,6 @@ class IssueNavigatorViewModel: ObservableObject {
 protocol IssueNode: Identifiable, Hashable {
     var id: UUID { get }
     var name: String { get }
-    var icon: Image { get }
     var isExpandable: Bool { get }
 }
 
@@ -216,29 +215,32 @@ class FileIssueNode: IssueNode, ObservableObject {
     @Published var diagnostics: [DiagnosticIssueNode]
     @Published var isExpanded: Bool
 
-    // TODO: REPLACE WITH EXISTING CODE
-    var icon: Image {
-        // Determine icon based on file extension
-        let fileExtension = (name as NSString).pathExtension.lowercased()
-
-        switch fileExtension {
-        case "swift":
-            return Image(systemName: "swift")
-        case "js", "javascript":
-            return Image(systemName: "j.square")
-        case "html":
-            return Image(systemName: "h.square")
-        case "css":
-            return Image(systemName: "c.square")
-        case "md", "markdown":
-            return Image(systemName: "doc.text")
-        case "json":
-            return Image(systemName: "curlybraces")
-        case "txt":
-            return Image(systemName: "doc.text")
-        default:
-            return Image(systemName: "doc")
+    /// Returns the extension of the file or an empty string if no extension is present.
+    var type: FileIcon.FileType {
+        let filename = (uri as NSString).pathExtension
+        let fileExtension = (filename as NSString).pathExtension.lowercased()
+
+        if !fileExtension.isEmpty {
+            if let type = FileIcon.FileType(rawValue: fileExtension) {
+                return type
+            }
         }
+        if let type = FileIcon.FileType(rawValue: filename.lowercased()) {
+            return type
+        }
+        return .txt
+    }
+
+    /// Return the icon of the file as `Image`
+    var icon: Image {
+        return Image(systemName: FileIcon.fileIcon(fileType: type))
+    }
+
+    /// Return the icon of the file as `NSImage`
+    var nsIcon: NSImage {
+        let systemImage = FileIcon.fileIcon(fileType: type)
+        return NSImage(systemSymbolName: systemImage, accessibilityDescription: systemImage)
+        ?? NSImage(systemSymbolName: "doc", accessibilityDescription: "doc")!
     }
 
     var isExpandable: Bool {
@@ -283,18 +285,18 @@ class DiagnosticIssueNode: IssueNode, ObservableObject {
         false
     }
 
-    var icon: Image {
+    var icon: NSImage {
         switch diagnostic.severity {
         case .error:
-            return Image(systemName: "exclamationmark.circle.fill")
+            return NSImage(systemSymbolName: "exclamationmark.octagon.fill", accessibilityDescription: "")!
         case .warning:
-            return Image(systemName: "exclamationmark.triangle.fill")
+            return NSImage(systemSymbolName: "exclamationmark.triangle.fill", accessibilityDescription: "")!
         case .information:
-            return Image(systemName: "info.circle.fill")
+            return NSImage(systemSymbolName: "exclamationmark.triangle.fill", accessibilityDescription: "")!
         case .hint:
-            return Image(systemName: "lightbulb.fill")
+            return NSImage(systemSymbolName: "lightbulb.fill", accessibilityDescription: "")!
         case nil:
-            return Image(systemName: "circle.fill")
+            return NSImage(systemSymbolName: "circle.fill", accessibilityDescription: "")!
         }
     }