Merge branch release/2.3.3

Author: rakuyoMo

Demo/JSONPreviewDemo.xcodeproj/project.pbxproj

@@ -572,7 +572,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 0;
-				DEVELOPMENT_TEAM = 5C9JW4S9DE;
+				DEVELOPMENT_TEAM = NDHX69DQ5R;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JSONPreviewDemo/Other/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -585,7 +585,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rakuyo.JSONPreviewDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
@@ -606,7 +606,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 0;
-				DEVELOPMENT_TEAM = 5C9JW4S9DE;
+				DEVELOPMENT_TEAM = NDHX69DQ5R;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JSONPreviewDemo/Other/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -619,7 +619,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rakuyo.JSONPreviewDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";

JSONPreview.podspec

@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
 
   s.name             = 'JSONPreview'
 
-  s.version          = '2.3.2'
+  s.version          = '2.3.3'
 
   s.summary          = '🎨 A view that can be highlighted after formatting JSON.'
 

Package.resolved

@@ -20,7 +20,7 @@ let package = Package(
             path: "Sources",
             resources: [
                 .copy("PrivacyInfo.xcprivacy"),
-                .process("./Resources/Assets.xcassets")
+                .process("./Resources/Assets.xcassets"),
             ]
         ),
         .testTarget(
@@ -32,6 +32,6 @@ let package = Package(
 )
 
 #if swift(>=5.6)
-// Add the Rakuyo Swift formatting plugin if possible
-package.dependencies.append(.package(url: "https://github.com/RakuyoKit/swift.git", from: "1.3.1"))
+// Add the Swift formatting plugin if possible
+package.dependencies.append(.package(url: "https://github.com/RakuyoKit/swift.git", branch: "release/1.4.0"))
 #endif

Package.swift

@@ -28,9 +28,9 @@ let package = Package(
             name: "JSONPreviewTests",
             dependencies: ["JSONPreview"],
             path: "Tests"
-        )
+        ),
     ]
 )
 
-// Add the Rakuyo Swift formatting plugin
-package.dependencies.append(.package(url: "https://github.com/RakuyoKit/swift.git", from: "1.3.1"))
+// Add the Swift formatting plugin
+package.dependencies.append(.package(url: "https://github.com/RakuyoKit/swift.git", branch: "release/1.4.0"))

Package@swift-5.9.swift

@@ -32,13 +32,13 @@ pod 'JSONPreview'
 
 - Select File > Swift Packages > Add Package Dependency
 - Add https://github.com/RakuyoKit/JSONPreview.git
-- Select "Up to Next Major" with "2.3.2"
+- Select "Up to Next Major" with "2.3.3"
 
 Or add the following content to your `Package.swift` file:
 
 ```swift
 dependencies: [
-  .package(url: "https://github.com/RakuyoKit/JSONPreview.git", from: "2.3.2")
+  .package(url: "https://github.com/RakuyoKit/JSONPreview.git", from: "2.3.3")
 ]
 ```
 

README.md

@@ -32,13 +32,13 @@ pod 'JSONPreview'
 
 - 依次选择 File > Swift Packages > Add Package Dependency
 - 输入 https://github.com/RakuyoKit/JSONPreview.git
-- 选择 "Up to Next Major" 并填入 "2.3.2"
+- 选择 "Up to Next Major" 并填入 "2.3.3"
 
 或者将下面的内容添加到 `Package.swift` 文件中：
 
 ```swift
 dependencies: [
-  .package(url: "https://github.com/RakuyoKit/JSONPreview.git", from: "2.3.2")
+  .package(url: "https://github.com/RakuyoKit/JSONPreview.git", from: "2.3.3")
 ]
 ```
 

README_CN.md

@@ -5,7 +5,7 @@ import Foundation
 /// Used to enrich the information of the key of the object in json.
 public struct JSONObjectKey {
     /// Used to mark an incorrect key.
-    public static let wrong: Self = .init(key: "", isWrong: true)
+    public static let wrong = Self(key: "", isWrong: true)
 
     /// The object key.
     ///

Sources/Entity/JSONObjectKey.swift

@@ -14,7 +14,7 @@ import Foundation
 public struct JSONSlice {
     /// The current display state of the slice
     public enum State: Hashable {
-        public static let `default`: Self = .expand
+        public static let `default` = Self.expand
 
         case expand, folded
     }

Sources/Entity/JSONSlice.swift

@@ -36,22 +36,6 @@ extension String {
         return results
     }
 
-    private func findAllRanges(of searchString: Self) -> [Range<Self.Index>] {
-        var ranges: [Range<Self.Index>] = []
-        var searchStartIndex = startIndex
-        while
-            let range = range(
-                of: searchString,
-                options: .literal,
-                range: searchStartIndex ..< endIndex
-            )
-        {
-            ranges.append(range)
-            searchStartIndex = range.upperBound
-        }
-        return ranges
-    }
-    
     private func nsRange(from range: Range<Self.Index>) -> NSRange? {
         guard
             let utf16LowerBound = range.lowerBound.samePosition(in: utf16),