From c2ed6138d48149ed01efda5ad4f9b9e085cfaea2 Mon Sep 17 00:00:00 2001 From: marcocarnevali Date: Wed, 23 Mar 2022 09:52:15 +0100 Subject: [PATCH] fix: code editor highlight load --- CodeEditModules/Modules/CodeFile/src/CodeEditor.swift | 10 ++++++++++ .../Modules/CodeFile/src/Model/Language.swift | 1 + 2 files changed, 11 insertions(+) diff --git a/CodeEditModules/Modules/CodeFile/src/CodeEditor.swift b/CodeEditModules/Modules/CodeFile/src/CodeEditor.swift index 2b3a998f2..2241bf290 100644 --- a/CodeEditModules/Modules/CodeFile/src/CodeEditor.swift +++ b/CodeEditModules/Modules/CodeFile/src/CodeEditor.swift @@ -37,6 +37,16 @@ struct CodeEditor: NSViewRepresentable { scrollView: scrollView ) ) + + if let highlightr = highlightr, + let string = highlightr.highlight( + content.wrappedValue, + as: language?.rawValue, + fastRender: true + ) { + textView.textStorage?.append(string) + } + textView.autoresizingMask = .width textView.maxSize = NSSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude) textView.minSize = NSSize(width: 0, height: scrollView.contentSize.height) diff --git a/CodeEditModules/Modules/CodeFile/src/Model/Language.swift b/CodeEditModules/Modules/CodeFile/src/Model/Language.swift index e40839d84..cd939901d 100644 --- a/CodeEditModules/Modules/CodeFile/src/Model/Language.swift +++ b/CodeEditModules/Modules/CodeFile/src/Model/Language.swift @@ -84,6 +84,7 @@ extension CodeEditor { case haxe case hsp case htmlbars + case html case http case hy case inform7