Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-06-15 13:57:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Home jump when line is entirely whitespace

Browse Source
This commit is contained in:
Sinai 2022-04-25 05:48:13 +10:00
parent 9370c5e0e6
commit 870f82ab26
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/CSConsole/ConsoleController.cs
View File

@ -416,7 +416,7 @@ namespace UnityExplorer.CSConsole
{ {
// Determine the current and next line // Determine the current and next line
UILineInfo thisline = default; UILineInfo thisline = default;
UILineInfo nextLine = default; UILineInfo? nextLine = null;
for (int i = 0; i < Input.Component.cachedInputTextGenerator.lineCount; i++) for (int i = 0; i < Input.Component.cachedInputTextGenerator.lineCount; i++)
{ {
UILineInfo line = Input.Component.cachedInputTextGenerator.lines[i]; UILineInfo line = Input.Component.cachedInputTextGenerator.lines[i];
@ -431,25 +431,26 @@ namespace UnityExplorer.CSConsole
if (toStart) if (toStart)
{ {
// Determine where the non-whitespace text begins // Determine where the indented text begins
int nonWhitespaceStartIdx = thisline.startCharIdx; int endOfLine = nextLine == null ? Input.Text.Length : nextLine.Value.startCharIdx;
while (char.IsWhiteSpace(Input.Text[nonWhitespaceStartIdx])) int indentedStart = thisline.startCharIdx;
nonWhitespaceStartIdx++; while (indentedStart < endOfLine - 1 && char.IsWhiteSpace(Input.Text[indentedStart]))
indentedStart++;
// Jump to either the true start or the non-whitespace position, // Jump to either the true start or the non-whitespace position,
// depending on which one we are not at. // depending on which one we are not at.
if (LastCaretPosition == nonWhitespaceStartIdx) if (LastCaretPosition == indentedStart)
SetCaretPosition(thisline.startCharIdx); SetCaretPosition(thisline.startCharIdx);
else else
SetCaretPosition(nonWhitespaceStartIdx); SetCaretPosition(indentedStart);
} }
else else
{ {
// If there is no next line, jump to the end of this line (+1, to the invisible next character position) // If there is no next line, jump to the end of this line (+1, to the invisible next character position)
if (nextLine.startCharIdx <= 0) if (nextLine == null)
SetCaretPosition(Input.Text.Length); SetCaretPosition(Input.Text.Length);
else // jump to the next line start index - 1, ie. end of this line else // jump to the next line start index - 1, ie. end of this line
SetCaretPosition(nextLine.startCharIdx - 1); SetCaretPosition(nextLine.Value.startCharIdx - 1);
} }
} }