Merge branch 'OptimizeSrotCommand'

Author: 蔡士林

.DS_Store

@@ -1 +1,2 @@
 .DS_Store
+*.xcuserstate

.gitignore

@@ -30,6 +30,8 @@ public struct SortCodeCommand: Command {
                 range = sortIndex(one: ROW(Int(params[0].value as! Double)), two: context.commandCode.row)
             } else if params ~= [.number, .number] {
                 range = sortIndex(one: ROW(Int(params[0].value as! Double)), two: ROW(Int(params[1].value as! Double)))
+            } else if params ~= [.number] {
+                range = sortIndex(one: context.commandCode.row - Int(params[0].value as! Double), two: context.commandCode.row)
             } else {
                 return .error(.noneMatch)
             }

BZCodeX/Command/SortCodeCommand.swift

@@ -930,13 +930,13 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 7467638S34;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = FlyCoding/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = 2.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ssbun.www.FlyCoding;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -953,13 +953,13 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 7467638S34;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = FlyCoding/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = 2.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ssbun.www.FlyCoding;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1014,7 +1014,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 17;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 7467638S34;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1026,7 +1026,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = 2.2.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "-fprofile-instr-generate";
@@ -1048,7 +1048,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 17;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 7467638S34;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1060,7 +1060,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = 2.2.2;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "-fprofile-instr-generate";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ssbun.www.BZCodeX;

FlyCoding.xcodeproj/project.pbxproj

@@ -68,11 +68,12 @@ FlyCoding 是一个 Xcode 插件，使用苹果提供的插件机制编写，可
 将范围内的代码根据每行的长度，按照从少到多排列
 
 * **sort/st**
-    * **`@do st 10 . to 30`**
+    * **`@do st 10 .**
     * **arg1 `[arg2]`**
-        * `arg1` 表示起始行数
+        * `arg1` 表示起始行数, 如果 `arg2` 为空则表示结束行为命令当前行，而开始行表示命令当前行减去 `arg1` 行
         * `arg2` 表示结束行数，此时 `arg1` 表示结束行
-        * 除了可以使用 `数字` 表示行数外，也可以通过 `.` 来代表命令的当前行
+        * `arg2` 除了可以使用 `数字` 表示行数外，也可以通过 `.` 来代表命令的当前行
+        
 
 ### 属性生成
 #### Swift属性生成