feat: place import command line tool

chenshengzhi · Jun 22, 2024 · 8bf707f · 8bf707f
1 parent e698d43
commit 8bf707f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/SZXcodeEditorExtension/NSArray+SZAddition.m b/SZXcodeEditorExtension/NSArray+SZAddition.m
@@ -235,10 +235,10 @@ - (NSRange)sz_importLinesRange {
     if (tempArray.count) {
         for (NSValue *value in tempArray) {
             NSRange range = [value rangeValue];
-            BOOL allImport = YES;
+            BOOL allImport = range.length > 2;
             NSInteger macroStart = range.location;
             NSInteger macroEnd = range.location + range.length;
-            for (NSInteger idx = macroStart + 1; idx < macroEnd - 1; idx++) {
+            for (NSInteger idx = macroStart + 1; idx < macroEnd; idx++) {
                 NSString *line = self[idx];
                 if (![line sz_isImportLine]) {
                     allImport = NO;
@@ -255,7 +255,7 @@ - (NSRange)sz_importLinesRange {
         }
     }
     NSInteger count = 0;
-    if (start != NSNotFound) {
+    if (start != NSNotFound && end != NSNotFound) {
         count = end + 1 - start;
     }
     return NSMakeRange(start, count);

diff --git a/SZXcodeEditorExtension/SZPlaceImportHelper.m b/SZXcodeEditorExtension/SZPlaceImportHelper.m
@@ -70,9 +70,13 @@ @implementation SZPlaceImportHelper
 + (NSArray<NSString *> *)processLines:(NSArray<NSString *> *)lines
                            selections:(nullable NSArray<SZSourceTextRange *> *)selections
                     commandIdentifier:(nullable NSString *)commandIdentifier {
+    NSRange importRange = [lines sz_importLinesRange];
+    if (importRange.location == NSNotFound) {
+        return lines;
+    }
+
     NSMutableArray *linesMutable = [lines mutableCopy];
     __block NSInteger insertIndex = 0;
-    NSRange importRange = [linesMutable sz_importLinesRange];
     if (importRange.location != NSNotFound) {
         insertIndex = NSMaxRange(importRange);
     }