fix: 防止匹配冲突

Author: chenxuuu

llcomNext/LLCOM/Models/TerminalCommand.cs

@@ -82,8 +82,8 @@ public static ((TerminalCommand, (int, int)), int) Do(ReadOnlySpan<char> slice)
         //\x1b[{数字}{字母} 数字可能是2个字符也可能不存在
         int code = 0;
         char cmd = '\0';
-        int i = 2; //从第三个字符开始分析，最多分析到第四个字符
-        while (i < slice.Length && i < 5 && char.IsDigit(slice[i]))
+        int i = 2; //从第三个字符开始分析，最多分析到第10个字符
+        while (i < slice.Length && i < 10 && char.IsDigit(slice[i]))
         {
             code = code * 10 + (slice[i] - '0'); //将数字字符转换为数字
             i++;
@@ -160,12 +160,10 @@ public static ((TerminalCommand, (int, int)), int) Do(ReadOnlySpan<char> slice)
                     return ((mr, (code,0)), i);
                 }
                 break;
-            default:
-                return ((TerminalCommand.Unknown, (0,0)), i); //未知命令
         }
         //检查是不是匹配\x1b[{n};{m}H
         if(cmd != ';')
-            return ((TerminalCommand.None,(0,0)), 0);
+            return ((TerminalCommand.Unknown, (0,0)), i); //未知命令
         //如果是分号，说明可能是光标移动到指定位置
         //需要检查后面的数字
         int col = code, row = 0;

llcomNext/llcomTest/TerminalCommandTest.cs

@@ -32,8 +32,6 @@ public void TestMultiple()
             ("\x1b[2J", TerminalCommand.ClearScreen, (2, 0), 4),
             ("\x1b[H", TerminalCommand.ResetCursor, (0, 0), 3),
             ("\x1b[10;20H", TerminalCommand.MoveCursorTo, (10, 20), 8),
-            ("\x1b[A", TerminalCommand.None, (0, 0), 0),
-            ("\x1b[0A", TerminalCommand.None, (0, 0), 0),
             ("\x1b[2A", TerminalCommand.MoveCursorUp, (2, 0), 4),
             ("\x1b[10A", TerminalCommand.MoveCursorUp, (10, 0), 5),
             ("\x1b[m", TerminalCommand.ResetStyle, (0, 0), 3),
@@ -43,6 +41,10 @@ public void TestMultiple()
             ("\x1b[43m", TerminalCommand.BackgroundColor, (43, 0), 5),
             ("\x1b[2004l", TerminalCommand.Unknown, (0, 0), 7),
             ("\x1b[2004h", TerminalCommand.Unknown, (0, 0), 7),
+            ("\x1b[A", TerminalCommand.Unknown, (0, 0), 3),
+            ("\x1bpsafsdf", TerminalCommand.None, (0, 0), 0),
+            ("\x1b666", TerminalCommand.None, (0, 0), 0),
+            ("\x111erwe", TerminalCommand.None, (0, 0), 0),
         };
 
         foreach (var (input, expectedCmd, expectedPos, expectedLength) in testCases)