Styling updates

Author: FastestMolasses

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

@@ -36,6 +36,7 @@ extension IssueNavigatorViewController: NSOutlineViewDelegate {
 
     func outlineView(_ outlineView: NSOutlineView, heightOfRowByItem item: Any) -> CGFloat {
         if item is DiagnosticIssueNode {
+            // TODO: DIAGNOSTIC CELLS SHOULD MIGHT SPAN MULTIPLE ROWS, SO SHOW MULTIPLE LINES
             let lines = Double(Settings.shared.preferences.general.issueNavigatorDetail.rawValue)
             return rowHeight * lines
         }

CodeEdit/Features/NavigatorArea/OutlineView/IssueTableViewCell.swift

@@ -5,13 +5,11 @@
 //  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)?
 
@@ -24,60 +22,62 @@ class IssueTableViewCell: StandardTableViewCell {
         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
+        if issueNode is DiagnosticIssueNode {
+            label.maximumNumberOfLines = 4
+            label.lineBreakMode = .byTruncatingTail
+            label.cell?.wraps = true
+            label.cell?.isScrollable = false
+            label.preferredMaxLayoutWidth = frame.width - iconWidth - 20
+        } else {
+            label.lineBreakMode = .byTruncatingTail
         }
-        return icon
+    }
+
+    override func configSecondaryLabel(secondaryLabel: NSTextField) {
+        super.configSecondaryLabel(secondaryLabel: secondaryLabel)
+        secondaryLabel.font = .systemFont(ofSize: fontSize-2, weight: .medium)
     }
 
     func configureForNode(_ node: (any IssueNode)?) {
         guard let node = node else { return }
 
+        secondaryLabelRightAligned = true
         textField?.stringValue = node.name
 
-        if let fileIssueNode = node as? FileIssueNode {
+        if let projectIssueNode = node as? ProjectIssueNode {
+            imageView?.image = projectIssueNode.nsIcon
+            imageView?.contentTintColor = NSColor.folderBlue
+        } else if let fileIssueNode = node as? FileIssueNode {
             imageView?.image = fileIssueNode.nsIcon
+            if Settings.shared.preferences.general.fileIconStyle == .color {
+                imageView?.contentTintColor = NSColor(fileIssueNode.iconColor)
+            } else {
+                imageView?.contentTintColor = NSColor.coolGray
+            }
         } else if let diagnosticNode = node as? DiagnosticIssueNode {
-            imageView?.image = diagnosticNode.icon
+            imageView?.image = diagnosticNode.nsIcon
+                .withSymbolConfiguration(
+                    NSImage.SymbolConfiguration(paletteColors: [.white, diagnosticNode.severityColor])
+                )
             imageView?.contentTintColor = diagnosticNode.severityColor
         }
 
-        if let diagnosticNode = node as? DiagnosticIssueNode {
-            setupDetailLabel(with: diagnosticNode.locationString)
-        } else if let projectNode = node as? ProjectIssueNode {
+        if let projectNode = node as? ProjectIssueNode {
             let issuesCount = projectNode.errorCount + projectNode.warningCount
 
             if issuesCount > 0 {
+                secondaryLabelRightAligned = false
                 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 {

CodeEdit/Features/NavigatorArea/ViewModels/IssueNavigatorViewModel.swift

@@ -163,17 +163,19 @@ protocol IssueNode: Identifiable, Hashable {
     var id: UUID { get }
     var name: String { get }
     var isExpandable: Bool { get }
+    var nsIcon: NSImage { get }
 }
 
 /// Represents the project (root) node in the issue navigator
 class ProjectIssueNode: IssueNode, ObservableObject {
     let id: UUID = UUID()
     let name: String
+
     @Published var files: [FileIssueNode]
     @Published var isExpanded: Bool
 
-    var icon: Image {
-        Image(systemName: "folder")
+    var nsIcon: NSImage {
+        return NSImage(systemSymbolName: "folder.fill.badge.gearshape", accessibilityDescription: "Root folder")!
     }
 
     var isExpandable: Bool {
@@ -212,35 +214,37 @@ class FileIssueNode: IssueNode, ObservableObject {
     let id: UUID = UUID()
     let uri: DocumentUri
     let name: String
+
     @Published var diagnostics: [DiagnosticIssueNode]
     @Published var isExpanded: Bool
 
     /// 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()
-
+        let fileExtension = (uri 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))
+    /// Returns a `Color` for a specific `fileType`
+    ///
+    /// If not specified otherwise this will return `Color.accentColor`
+    var iconColor: SwiftUI.Color {
+        FileIcon.iconColor(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")!
+        if let customImage = NSImage.symbol(named: systemImage) {
+            return customImage
+        } else {
+            return NSImage(systemSymbolName: systemImage, accessibilityDescription: systemImage)
+                ?? NSImage(systemSymbolName: "doc", accessibilityDescription: "doc")!
+        }
     }
 
     var isExpandable: Bool {
@@ -285,7 +289,7 @@ class DiagnosticIssueNode: IssueNode, ObservableObject {
         false
     }
 
-    var icon: NSImage {
+    var nsIcon: NSImage {
         switch diagnostic.severity {
         case .error:
             return NSImage(systemSymbolName: "exclamationmark.octagon.fill", accessibilityDescription: "")!