Pass scenario to highlighter

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -544,6 +544,7 @@ struct ChatCodeSyntaxHighlighter: CodeSyntaxHighlighter {
         let content = highlightedCodeBlock(
             code: content,
             language: language ?? "",
+            scenario: "chat",
             brightMode: brightMode,
             fontSize: fontSize
         )

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift

@@ -100,7 +100,8 @@ struct CodeBlockSuggestionPanel: View {
                 CodeBlock(
                     code: suggestion.code,
                     language: suggestion.language,
-                    startLineIndex: suggestion.startLineIndex,
+                    startLineIndex: suggestion.startLineIndex, 
+                    scenario: "suggestion",
                     colorScheme: colorScheme,
                     fontSize: fontSize, 
                     droppingLeadingSpaces: hideCommonPrecedingSpaces

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -275,7 +275,8 @@ extension PromptToCodePanel {
                             CodeBlock(
                                 code: viewStore.state.code,
                                 language: viewStore.state.language,
-                                startLineIndex: viewStore.state.startLineIndex,
+                                startLineIndex: viewStore.state.startLineIndex, 
+                                scenario: "promptToCode",
                                 colorScheme: colorScheme,
                                 firstLinePrecedingSpaceCount: viewStore.state
                                     .firstLinePrecedingSpaceCount,

Pro

@@ -57,7 +57,7 @@ let package = Package(
         .package(url: "https://github.com/ChimeHQ/JSONRPC", exact: "0.6.0"),
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.6.0"),
         .package(url: "https://github.com/unum-cloud/usearch", from: "0.19.1"),
-        .package(url: "https://github.com/intitni/Highlightr", branch: "bump-highlight-js-version"),
+        .package(url: "https://github.com/intitni/Highlightr", branch: "master"),
         .package(
             url: "https://github.com/pointfreeco/swift-composable-architecture",
             from: "0.55.0"

Tool/Package.swift

@@ -4,6 +4,7 @@ public struct CodeBlock: View {
     public let code: String
     public let language: String
     public let startLineIndex: Int
+    public let scenario: String
     public let colorScheme: ColorScheme
     public let commonPrecedingSpaceCount: Int
     public let highlightedCode: [NSAttributedString]
@@ -15,6 +16,7 @@ public struct CodeBlock: View {
         code: String,
         language: String,
         startLineIndex: Int,
+        scenario: String,
         colorScheme: ColorScheme,
         firstLinePrecedingSpaceCount: Int = 0,
         fontSize: Double,
@@ -23,6 +25,7 @@ public struct CodeBlock: View {
         self.code = code
         self.language = language
         self.startLineIndex = startLineIndex
+        self.scenario = scenario
         self.colorScheme = colorScheme
         self.droppingLeadingSpaces = droppingLeadingSpaces
         self.firstLinePrecedingSpaceCount = firstLinePrecedingSpaceCount
@@ -33,6 +36,7 @@ public struct CodeBlock: View {
         let result = Self.highlight(
             code: padding + code,
             language: language,
+            scenario: scenario,
             colorScheme: colorScheme,
             fontSize: fontSize,
             droppingLeadingSpaces: droppingLeadingSpaces
@@ -75,13 +79,15 @@ public struct CodeBlock: View {
     static func highlight(
         code: String,
         language: String,
+        scenario: String,
         colorScheme: ColorScheme,
         fontSize: Double,
         droppingLeadingSpaces: Bool
     ) -> (code: [NSAttributedString], commonLeadingSpaceCount: Int) {
         return highlighted(
             code: code,
             language: language,
+            scenario: scenario,
             brightMode: colorScheme != .dark,
             droppingLeadingSpaces: droppingLeadingSpaces,
             fontSize: fontSize
@@ -100,6 +106,7 @@ struct CodeBlock_Previews: PreviewProvider {
             """,
             language: "swift",
             startLineIndex: 0,
+            scenario: "",
             colorScheme: .dark,
             firstLinePrecedingSpaceCount: 0,
             fontSize: 12,

Tool/Sources/SharedUIComponents/CodeBlock.swift

@@ -13,6 +13,7 @@ struct _CodeBlock: View {
     let highlightedCode: AttributedString
     let colorScheme: ColorScheme
     let droppingLeadingSpaces: Bool
+    let scenario: String
 
     /// Create a text edit view with a certain text that uses a certain options.
     /// - Parameters:
@@ -23,6 +24,7 @@ struct _CodeBlock: View {
         code: String,
         language: String,
         firstLinePrecedingSpaceCount: Int,
+        scenario: String,
         colorScheme: ColorScheme,
         fontSize: Double,
         droppingLeadingSpaces: Bool,
@@ -32,13 +34,15 @@ struct _CodeBlock: View {
         self.fontSize = fontSize
         self.colorScheme = colorScheme
         self.droppingLeadingSpaces = droppingLeadingSpaces
+        self.scenario = scenario
 
         let padding = firstLinePrecedingSpaceCount > 0
             ? String(repeating: " ", count: firstLinePrecedingSpaceCount)
             : ""
         let result = Self.highlight(
             code: padding + code,
             language: language,
+            scenario: scenario,
             colorScheme: colorScheme,
             fontSize: fontSize,
             droppingLeadingSpaces: droppingLeadingSpaces
@@ -68,13 +72,15 @@ struct _CodeBlock: View {
     static func highlight(
         code: String,
         language: String,
+        scenario: String,
         colorScheme: ColorScheme,
         fontSize: Double,
         droppingLeadingSpaces: Bool
     ) -> (code: AttributedString, commonLeadingSpaceCount: Int) {
         let (lines, commonLeadingSpaceCount) = highlighted(
             code: code,
-            language: language,
+            language: language, 
+            scenario: scenario,
             brightMode: colorScheme != .dark,
             droppingLeadingSpaces: droppingLeadingSpaces,
             fontSize: fontSize,

Tool/Sources/SharedUIComponents/Experiment/NewCodeBlock.swift

@@ -7,6 +7,7 @@ import SwiftUI
 public func highlightedCodeBlock(
     code: String,
     language: String,
+    scenario: String,
     brightMode: Bool,
     fontSize: Double
 ) -> NSAttributedString {
@@ -27,7 +28,13 @@ public func highlightedCodeBlock(
     guard let highlighter = Highlightr() else {
         return unhighlightedCode()
     }
-    highlighter.setTheme(to: brightMode ? "xcode" : "atom-one-dark")
+    highlighter.setTheme(to: {
+        let mode = brightMode ? "light" : "dark"
+        if scenario.isEmpty {
+            return mode
+        }
+        return "\(scenario)-\(mode)"
+    }())
     highlighter.theme.setCodeFont(.monospacedSystemFont(ofSize: fontSize, weight: .regular))
     guard let formatted = highlighter.highlight(code, as: language) else {
         return unhighlightedCode()
@@ -41,14 +48,16 @@ public func highlightedCodeBlock(
 public func highlighted(
     code: String,
     language: String,
+    scenario: String,
     brightMode: Bool,
     droppingLeadingSpaces: Bool,
     fontSize: Double,
     replaceSpacesWithMiddleDots: Bool = true
 ) -> (code: [NSAttributedString], commonLeadingSpaceCount: Int) {
     let formatted = highlightedCodeBlock(
         code: code,
-        language: language,
+        language: language, 
+        scenario: scenario,
         brightMode: brightMode,
         fontSize: fontSize
     )