Remove LineIsMultiline in favor of multi-line agnostic algorithms (#1125) (#2047)

springcomp · web-flow · commit 0de63689c401 · 2021-02-11T15:57:37.000-08:00
diff --git a/PSReadLine/BasicEditing.cs b/PSReadLine/BasicEditing.cs
@@ -522,25 +522,17 @@ public static void InsertLineAbove(ConsoleKeyInfo? key = null, object arg = null
         /// </summary>
         public static void InsertLineBelow(ConsoleKeyInfo? key = null, object arg = null)
         {
-            // Move the current position to the end of the current line and only the current line.
-            if (_singleton.LineIsMultiLine())
+            int i = _singleton._current;
+            for (; i < _singleton._buffer.Length; i++)
             {
-                int i = _singleton._current;
-                for (; i < _singleton._buffer.Length; i++)
+                if (_singleton._buffer[i] == '\n')
                 {
-                    if (_singleton._buffer[i] == '\n')
-                    {
-                        break;
-                    }
+                    break;
                 }
-
-                _singleton._current = i;
-            }
-            else
-            {
-                _singleton._current = _singleton._buffer.Length;
             }
 
+            _singleton._current = i;
+
             Insert('\n');
         }
     }
diff --git a/PSReadLine/Movement.cs b/PSReadLine/Movement.cs
@@ -21,23 +21,16 @@ public partial class PSConsoleReadLine
         /// </summary>
         public static void EndOfLine(ConsoleKeyInfo? key = null, object arg = null)
         {
-            if (_singleton.LineIsMultiLine())
+            int i = _singleton._current;
+            for (; i < _singleton._buffer.Length; i++)
             {
-                int i = _singleton._current;
-                for (; i < _singleton._buffer.Length; i++)
+                if (_singleton._buffer[i] == '\n')
                 {
-                    if (_singleton._buffer[i] == '\n')
-                    {
-                        break;
-                    }
+                    break;
                 }
-
-                _singleton.MoveCursor((i == _singleton._current) ? _singleton._buffer.Length : i);
-            }
-            else
-            {
-                _singleton.MoveCursor(_singleton._buffer.Length);
             }
+
+            _singleton.MoveCursor((i == _singleton._current) ? _singleton._buffer.Length : i);
         }
 
         /// <summary>
@@ -97,7 +90,7 @@ public static void ViForwardChar(ConsoleKeyInfo? key = null, object arg = null)
                 }
                 else
                 {
-                    ViOffsetCursorPosition(+ numericArg);
+                    ViOffsetCursorPosition(+numericArg);
                 }
             }
         }
@@ -109,7 +102,7 @@ public static void ViBackwardChar(ConsoleKeyInfo? key = null, object arg = null)
         {
             if (TryGetArgAsInt(arg, out var numericArg, 1))
             {
-                ViOffsetCursorPosition(- numericArg);
+                ViOffsetCursorPosition(-numericArg);
             }
         }
 
@@ -225,7 +218,8 @@ private void MoveToLineImpl(int lineOffset)
                 point = point ?? ConvertOffsetToPoint(_current);
                 int newY = point.Value.Y + lineOffset;
 
-                Point newPoint = new Point() {
+                Point newPoint = new Point()
+                {
                     X = _moveToLineDesiredColumn,
                     Y = Math.Max(newY, _initialY)
                 };
@@ -470,18 +464,18 @@ public static void GotoBrace(ConsoleKeyInfo? key = null, object arg = null)
             int direction;
             switch (token.Kind)
             {
-            case TokenKind.LParen:   toMatch = TokenKind.RParen; direction = 1; break;
-            case TokenKind.LCurly:   toMatch = TokenKind.RCurly; direction = 1; break;
-            case TokenKind.LBracket: toMatch = TokenKind.RBracket; direction = 1; break;
+                case TokenKind.LParen: toMatch = TokenKind.RParen; direction = 1; break;
+                case TokenKind.LCurly: toMatch = TokenKind.RCurly; direction = 1; break;
+                case TokenKind.LBracket: toMatch = TokenKind.RBracket; direction = 1; break;
 
-            case TokenKind.RParen:   toMatch = TokenKind.LParen; direction = -1; break;
-            case TokenKind.RCurly:   toMatch = TokenKind.LCurly; direction = -1; break;
-            case TokenKind.RBracket: toMatch = TokenKind.LBracket; direction = -1; break;
+                case TokenKind.RParen: toMatch = TokenKind.LParen; direction = -1; break;
+                case TokenKind.RCurly: toMatch = TokenKind.LCurly; direction = -1; break;
+                case TokenKind.RBracket: toMatch = TokenKind.LBracket; direction = -1; break;
 
-            default:
-                // Nothing to match (don't match inside strings/comments)
-                Ding();
-                return;
+                default:
+                    // Nothing to match (don't match inside strings/comments)
+                    Ding();
+                    return;
             }
 
             var matchCount = 0;
diff --git a/PSReadLine/Movement.vi.cs b/PSReadLine/Movement.vi.cs
@@ -159,21 +159,14 @@ public static void ViEndOfPreviousGlob(ConsoleKeyInfo? key = null, object arg =
         /// Move the cursor to the end of the current logical line.
         /// </summary>
         public static void MoveToEndOfLine(ConsoleKeyInfo? key = null, object arg = null)
-        {
-            if (_singleton.LineIsMultiLine())
-            {
-                var eol = GetEndOfLogicalLinePos(_singleton._current);
-                if (eol != _singleton._current)
-                {
-                    _singleton.MoveCursor(eol);
-                }
-                _singleton._moveToEndOfLineCommandCount++;
-                _singleton._moveToLineDesiredColumn = int.MaxValue;
-            }
-            else
+        {
+            var eol = GetEndOfLogicalLinePos(_singleton._current);
+            if (eol != _singleton._current)
             {
-                _singleton.MoveCursor(Math.Max(0, _singleton._buffer.Length + ViEndOfLineFactor));
-            }
+                _singleton.MoveCursor(eol);
+            }
+            _singleton._moveToEndOfLineCommandCount++;
+            _singleton._moveToLineDesiredColumn = int.MaxValue;
         }
 
         /// <summary>
diff --git a/PSReadLine/Movement.vi.multiline.cs b/PSReadLine/Movement.vi.multiline.cs
@@ -38,13 +38,13 @@ public void MoveToFirstLine(ConsoleKeyInfo? key = null, object arg = null)
         /// <param name="arg" />
         public void MoveToLastLine(ConsoleKeyInfo? key = null, object arg = null)
         {
-            if (!LineIsMultiLine())
+            var count = GetLogicalLineCount();
+            if (count == 1)
             {
                 Ding(key, arg);
                 return;
             }
 
-            var count = GetLogicalLineCount();
             var currentLine = GetLogicalLineNumber();
 
             var pos = ConvertOffsetToPoint(_singleton._current);
diff --git a/PSReadLine/ReadLine.cs b/PSReadLine/ReadLine.cs
@@ -555,6 +555,7 @@ private string InputLoop()
                         // nor a "move to line" command. In that case, the desired column
                         // number will be computed from the current position on the logical line.
 
+                        _moveToEndOfLineCommandCount = 0;
                         _moveToLineDesiredColumn = -1;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -522,25 +522,17 @@ public static void InsertLineAbove(ConsoleKeyInfo? key = null, object arg = null`
`522`	`522`	`/// </summary>`
`523`	`523`	`public static void InsertLineBelow(ConsoleKeyInfo? key = null, object arg = null)`
`524`	`524`	`{`
`525`		`- // Move the current position to the end of the current line and only the current line.`
`526`		`- if (_singleton.LineIsMultiLine())`
	`525`	`+ int i = _singleton._current;`
	`526`	`+ for (; i < _singleton._buffer.Length; i++)`
`527`	`527`	`{`
`528`		`- int i = _singleton._current;`
`529`		`- for (; i < _singleton._buffer.Length; i++)`
	`528`	`+ if (_singleton._buffer[i] == '\n')`
`530`	`529`	`{`
`531`		`- if (_singleton._buffer[i] == '\n')`
`532`		`- {`
`533`		`- break;`
`534`		`- }`
	`530`	`+ break;`
`535`	`531`	`}`
`536`		`-`
`537`		`- _singleton._current = i;`
`538`		`- }`
`539`		`- else`
`540`		`- {`
`541`		`- _singleton._current = _singleton._buffer.Length;`
`542`	`532`	`}`
`543`	`533`
	`534`	`+ _singleton._current = i;`
	`535`	`+`
`544`	`536`	`Insert('\n');`
`545`	`537`	`}`
`546`	`538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,16 @@ public partial class PSConsoleReadLine`
`21`	`21`	`/// </summary>`
`22`	`22`	`public static void EndOfLine(ConsoleKeyInfo? key = null, object arg = null)`
`23`	`23`	`{`
`24`		`- if (_singleton.LineIsMultiLine())`
	`24`	`+ int i = _singleton._current;`
	`25`	`+ for (; i < _singleton._buffer.Length; i++)`
`25`	`26`	`{`
`26`		`- int i = _singleton._current;`
`27`		`- for (; i < _singleton._buffer.Length; i++)`
	`27`	`+ if (_singleton._buffer[i] == '\n')`
`28`	`28`	`{`
`29`		`- if (_singleton._buffer[i] == '\n')`
`30`		`- {`
`31`		`- break;`
`32`		`- }`
	`29`	`+ break;`
`33`	`30`	`}`
`34`		`-`
`35`		`- _singleton.MoveCursor((i == _singleton._current) ? _singleton._buffer.Length : i);`
`36`		`- }`
`37`		`- else`
`38`		`- {`
`39`		`- _singleton.MoveCursor(_singleton._buffer.Length);`
`40`	`31`	`}`
	`32`	`+`
	`33`	`+ _singleton.MoveCursor((i == _singleton._current) ? _singleton._buffer.Length : i);`
`41`	`34`	`}`
`42`	`35`
`43`	`36`	`/// <summary>`
`@@ -97,7 +90,7 @@ public static void ViForwardChar(ConsoleKeyInfo? key = null, object arg = null)`
`97`	`90`	`}`
`98`	`91`	`else`
`99`	`92`	`{`
`100`		`- ViOffsetCursorPosition(+ numericArg);`
	`93`	`+ ViOffsetCursorPosition(+numericArg);`
`101`	`94`	`}`
`102`	`95`	`}`
`103`	`96`	`}`
`@@ -109,7 +102,7 @@ public static void ViBackwardChar(ConsoleKeyInfo? key = null, object arg = null)`
`109`	`102`	`{`
`110`	`103`	`if (TryGetArgAsInt(arg, out var numericArg, 1))`
`111`	`104`	`{`
`112`		`- ViOffsetCursorPosition(- numericArg);`
	`105`	`+ ViOffsetCursorPosition(-numericArg);`
`113`	`106`	`}`
`114`	`107`	`}`
`115`	`108`
`@@ -225,7 +218,8 @@ private void MoveToLineImpl(int lineOffset)`
`225`	`218`	`point = point ?? ConvertOffsetToPoint(_current);`
`226`	`219`	`int newY = point.Value.Y + lineOffset;`
`227`	`220`
`228`		`- Point newPoint = new Point() {`
	`221`	`+ Point newPoint = new Point()`
	`222`	`+ {`
`229`	`223`	`X = _moveToLineDesiredColumn,`
`230`	`224`	`Y = Math.Max(newY, _initialY)`
`231`	`225`	`};`
`@@ -470,18 +464,18 @@ public static void GotoBrace(ConsoleKeyInfo? key = null, object arg = null)`
`470`	`464`	`int direction;`
`471`	`465`	`switch (token.Kind)`
`472`	`466`	`{`
`473`		`- case TokenKind.LParen: toMatch = TokenKind.RParen; direction = 1; break;`
`474`		`- case TokenKind.LCurly: toMatch = TokenKind.RCurly; direction = 1; break;`
`475`		`- case TokenKind.LBracket: toMatch = TokenKind.RBracket; direction = 1; break;`
	`467`	`+ case TokenKind.LParen: toMatch = TokenKind.RParen; direction = 1; break;`
	`468`	`+ case TokenKind.LCurly: toMatch = TokenKind.RCurly; direction = 1; break;`
	`469`	`+ case TokenKind.LBracket: toMatch = TokenKind.RBracket; direction = 1; break;`
`476`	`470`
`477`		`- case TokenKind.RParen: toMatch = TokenKind.LParen; direction = -1; break;`
`478`		`- case TokenKind.RCurly: toMatch = TokenKind.LCurly; direction = -1; break;`
`479`		`- case TokenKind.RBracket: toMatch = TokenKind.LBracket; direction = -1; break;`
	`471`	`+ case TokenKind.RParen: toMatch = TokenKind.LParen; direction = -1; break;`
	`472`	`+ case TokenKind.RCurly: toMatch = TokenKind.LCurly; direction = -1; break;`
	`473`	`+ case TokenKind.RBracket: toMatch = TokenKind.LBracket; direction = -1; break;`
`480`	`474`
`481`		`- default:`
`482`		`- // Nothing to match (don't match inside strings/comments)`
`483`		`- Ding();`
`484`		`- return;`
	`475`	`+ default:`
	`476`	`+ // Nothing to match (don't match inside strings/comments)`
	`477`	`+ Ding();`
	`478`	`+ return;`
`485`	`479`	`}`
`486`	`480`
`487`	`481`	`var matchCount = 0;`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,13 @@ public void MoveToFirstLine(ConsoleKeyInfo? key = null, object arg = null)`
`38`	`38`	`/// <param name="arg" />`
`39`	`39`	`public void MoveToLastLine(ConsoleKeyInfo? key = null, object arg = null)`
`40`	`40`	`{`
`41`		`- if (!LineIsMultiLine())`
	`41`	`+ var count = GetLogicalLineCount();`
	`42`	`+ if (count == 1)`
`42`	`43`	`{`
`43`	`44`	`Ding(key, arg);`
`44`	`45`	`return;`
`45`	`46`	`}`
`46`	`47`
`47`		`- var count = GetLogicalLineCount();`
`48`	`48`	`var currentLine = GetLogicalLineNumber();`
`49`	`49`
`50`	`50`	`var pos = ConvertOffsetToPoint(_singleton._current);`
Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,7 @@ private string InputLoop()`
`555`	`555`	`// nor a "move to line" command. In that case, the desired column`
`556`	`556`	`// number will be computed from the current position on the logical line.`
`557`	`557`
	`558`	`+ _moveToEndOfLineCommandCount = 0;`
`558`	`559`	`_moveToLineDesiredColumn = -1;`
`559`	`560`	`}`
`560`	`561`	`}`