Bug fixes from merge

codemagic-ci-cd · Jan 8, 2024 · 742404d · 742404d
1 parent 8813839
commit 742404d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...ces/Components/Components/Editors/Source Editor/WKSourceEditorTextFrameworkMediator.swift b/...ces/Components/Components/Editors/Source Editor/WKSourceEditorTextFrameworkMediator.swift
@@ -123,6 +123,11 @@ final class WKSourceEditorTextFrameworkMediator: NSObject {
                 listFormatter,
                 strikethroughFormatter]
 
+        self.boldItalicsFormatter = boldItalicsFormatter
+        self.templateFormatter = templateFormatter
+        self.listFormatter = listFormatter
+        self.strikethroughFormatter = strikethroughFormatter
+
         if needsTextKit2 {
             if #available(iOS 16.0, *) {
                 let textContentManager = textView.textLayoutManager?.textContentManager

diff --git a/Components/Sources/ComponentsObjC/WKSourceEditorFormatterBase.m b/Components/Sources/ComponentsObjC/WKSourceEditorFormatterBase.m
@@ -35,6 +35,7 @@ - (void)addSyntaxHighlightingToAttributedString:(NSMutableAttributedString *)att
 
     // reset shared custom attributes
     [attributedString removeAttribute:WKSourceEditorCustomKeyColorGreen range:range];
+    [attributedString removeAttribute:WKSourceEditorCustomKeyColorOrange range:range];
 
     [attributedString addAttributes:self.attributes range:range];
 }