Add reference properties to WKSourceEditorSelectionState, rename to h…

…orizontal
codemagic-ci-cd · Dec 15, 2023 · be8be15 · be8be15
1 parent eaac9a7
commit be8be15
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/...ces/Components/Components/Editors/Source Editor/WKSourceEditorTextFrameworkMediator.swift b/...ces/Components/Components/Editors/Source Editor/WKSourceEditorTextFrameworkMediator.swift
@@ -17,11 +17,13 @@ fileprivate var needsTextKit2: Bool {
     let isBold: Bool
     let isItalics: Bool
     let isHorizontalTemplate: Bool
+    let isHorizontalReference: Bool
 
-    init(isBold: Bool, isItalics: Bool, isHorizontalTemplate: Bool) {
+    init(isBold: Bool, isItalics: Bool, isHorizontalTemplate: Bool, isHorizontalReference: Bool) {
         self.isBold = isBold
         self.isItalics = isItalics
         self.isHorizontalTemplate = isHorizontalTemplate
+        self.isHorizontalReference = isHorizontalReference
     }
 }
 
@@ -151,24 +153,26 @@ final class WKSourceEditorTextFrameworkMediator: NSObject {
 
         if needsTextKit2 {
             guard let textKit2Data = textkit2SelectionData(selectedDocumentRange: selectedDocumentRange) else {
-                return WKSourceEditorSelectionState(isBold: false, isItalics: false, isHorizontalTemplate: false)
+                return WKSourceEditorSelectionState(isBold: false, isItalics: false, isHorizontalTemplate: false, isHorizontalReference: false)
             }
 
             let isBold = boldItalicsFormatter?.attributedString(textKit2Data.paragraphAttributedString, isBoldIn: textKit2Data.paragraphSelectedRange) ?? false
             let isItalics = boldItalicsFormatter?.attributedString(textKit2Data.paragraphAttributedString, isItalicsIn: textKit2Data.paragraphSelectedRange) ?? false
             let isHorizontalTemplate = templateFormatter?.attributedString(textKit2Data.paragraphAttributedString, isHorizontalTemplateIn: textKit2Data.paragraphSelectedRange) ?? false
+            let isHorizontalReference = referenceFormatter?.attributedString(textKit2Data.paragraphAttributedString, isHorizontalReferenceIn: textKit2Data.paragraphSelectedRange) ?? false
 
-            return WKSourceEditorSelectionState(isBold: isBold, isItalics: isItalics, isHorizontalTemplate: isHorizontalTemplate)
+            return WKSourceEditorSelectionState(isBold: isBold, isItalics: isItalics, isHorizontalTemplate: isHorizontalTemplate, isHorizontalReference: isHorizontalReference)
         } else {
             guard let textKit1Storage else {
-                return WKSourceEditorSelectionState(isBold: false, isItalics: false, isHorizontalTemplate: false)
+                return WKSourceEditorSelectionState(isBold: false, isItalics: false, isHorizontalTemplate: false, isHorizontalReference: false)
             }
 
             let isBold = boldItalicsFormatter?.attributedString(textKit1Storage, isBoldIn: selectedDocumentRange) ?? false
             let isItalics = boldItalicsFormatter?.attributedString(textKit1Storage, isItalicsIn: selectedDocumentRange) ?? false
             let isHorizontalTemplate = templateFormatter?.attributedString(textKit1Storage, isHorizontalTemplateIn: selectedDocumentRange) ?? false
+            let isHorizontalReference = referenceFormatter?.attributedString(textKit1Storage, isHorizontalReferenceIn: selectedDocumentRange) ?? false
 
-            return WKSourceEditorSelectionState(isBold: isBold, isItalics: isItalics, isHorizontalTemplate: isHorizontalTemplate)
+            return WKSourceEditorSelectionState(isBold: isBold, isItalics: isItalics, isHorizontalTemplate: isHorizontalTemplate, isHorizontalReference: isHorizontalReference)
         }
     }
 

diff --git a/Components/Sources/ComponentsObjC/WKSourceEditorFormatterReference.h b/Components/Sources/ComponentsObjC/WKSourceEditorFormatterReference.h
@@ -3,7 +3,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface WKSourceEditorFormatterReference : WKSourceEditorFormatter
-- (BOOL)attributedString:(NSMutableAttributedString *)attributedString isReferenceInRange:(NSRange)range;
+- (BOOL)attributedString:(NSMutableAttributedString *)attributedString isHorizontalReferenceInRange:(NSRange)range;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Components/Sources/ComponentsObjC/WKSourceEditorFormatterReference.m b/Components/Sources/ComponentsObjC/WKSourceEditorFormatterReference.m
@@ -6,7 +6,7 @@ @interface WKSourceEditorFormatterReference ()
 @property (nonatomic, strong) NSDictionary *refEmptyAttributes;
 @property (nonatomic, strong) NSDictionary *refContentAttributes;
 
-@property (nonatomic, strong) NSRegularExpression *refOpenAndCloseRegex;
+@property (nonatomic, strong) NSRegularExpression *refHorizontalRegex;
 @property (nonatomic, strong) NSRegularExpression *refOpenRegex;
 @property (nonatomic, strong) NSRegularExpression *refCloseRegex;
 @property (nonatomic, strong) NSRegularExpression *refEmptyRegex;
@@ -37,7 +37,7 @@ - (instancetype)initWithColors:(WKSourceEditorColors *)colors fonts:(WKSourceEdi
             WKSourceEditorCustomKeyContentReference: [NSNumber numberWithBool:YES]
         };
 
-        _refOpenAndCloseRegex = [[NSRegularExpression alloc] initWithPattern:@"(<ref(?:[^\\/>]+?)?>)(.*?)(<\\/ref>)" options:0 error:nil];
+        _refHorizontalRegex = [[NSRegularExpression alloc] initWithPattern:@"(<ref(?:[^\\/>]+?)?>)(.*?)(<\\/ref>)" options:0 error:nil];
         _refOpenRegex = [[NSRegularExpression alloc] initWithPattern:@"<ref(?:[^\\/>]+?)?>" options:0 error:nil];
         _refCloseRegex = [[NSRegularExpression alloc] initWithPattern:@"<\\/ref>" options:0 error:nil];
         _refEmptyRegex = [[NSRegularExpression alloc] initWithPattern:@"<ref[^>]+?\\/>" options:0 error:nil];
@@ -51,7 +51,7 @@ - (void)addSyntaxHighlightingToAttributedString:(nonnull NSMutableAttributedStri
     // Reset
     [attributedString removeAttribute:WKSourceEditorCustomKeyContentReference range:range];
 
-    [self.refOpenAndCloseRegex enumerateMatchesInString:attributedString.string
+    [self.refHorizontalRegex enumerateMatchesInString:attributedString.string
                                     options:0
                                       range:range
                                  usingBlock:^(NSTextCheckingResult *_Nullable result, NSMatchingFlags flags, BOOL *_Nonnull stop) {
@@ -134,7 +134,7 @@ - (void)updateFonts:(WKSourceEditorFonts *)fonts inAttributedString:(NSMutableAt
 
 #pragma mark - Public
 
-- (BOOL)attributedString:(NSMutableAttributedString *)attributedString isReferenceInRange:(NSRange)range {
+- (BOOL)attributedString:(NSMutableAttributedString *)attributedString isHorizontalReferenceInRange:(NSRange)range {
     __block BOOL isContentKey = NO;
 
    if (range.length == 0) {