Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-01-08 10:33:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do auto-indent before highlighting so the characters are in the correct position

Browse Source
This commit is contained in:
Sinai 2021-06-03 17:18:11 +10:00
parent d7008db22e
commit aaab10a0a0
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/UI/CSConsole/ConsoleController.cs
View File

@ -12,6 +12,7 @@ using UnityExplorer.Core.Input;
using UnityExplorer.UI.Panels; using UnityExplorer.UI.Panels;
using UnityExplorer.UI.Widgets.AutoComplete; using UnityExplorer.UI.Widgets.AutoComplete;
using System.Reflection; using System.Reflection;
using Mono.CSharp;
namespace UnityExplorer.UI.CSConsole namespace UnityExplorer.UI.CSConsole
{ {
@ -150,15 +151,16 @@ namespace UnityExplorer.UI.CSConsole
try try
{ {
// Try to "Compile" the code (tries to interpret it as REPL) // Compile the code. If it returned a CompiledMethod, it is REPL.
var evaluation = Evaluator.Compile(input); CompiledMethod repl = Evaluator.Compile(input);
if (evaluation != null)
if (repl != null)
{ {
// Valid REPL, we have a delegate to the evaluation. // Valid REPL, we have a delegate to the evaluation.
try try
{ {
object ret = null; object ret = null;
evaluation.Invoke(ref ret); repl.Invoke(ref ret);
var result = ret?.ToString(); var result = ret?.ToString();
if (!string.IsNullOrEmpty(result)) if (!string.IsNullOrEmpty(result))
ExplorerCore.Log($"Invoked REPL, result: {ret}"); ExplorerCore.Log($"Invoked REPL, result: {ret}");
@ -172,9 +174,7 @@ namespace UnityExplorer.UI.CSConsole
} }
else else
{ {
// The input was not recognized as an evaluation. Compile the code. // The compiled code was not REPL, so it was a using directive or it defined classes.
Evaluator.Run(input);
string output = ScriptEvaluator._textWriter.ToString(); string output = ScriptEvaluator._textWriter.ToString();
var outputSplit = output.Split('\n'); var outputSplit = output.Split('\n');
@ -233,6 +233,12 @@ namespace UnityExplorer.UI.CSConsole
if (EnableSuggestions && AutoCompleteModal.CheckEnter(Completer)) if (EnableSuggestions && AutoCompleteModal.CheckEnter(Completer))
OnAutocompleteEnter(); OnAutocompleteEnter();
if (!settingCaretCoroutine)
{
if (EnableAutoIndent)
DoAutoIndent();
}
var inStringOrComment = HighlightVisibleInput(); var inStringOrComment = HighlightVisibleInput();
if (!settingCaretCoroutine) if (!settingCaretCoroutine)
@ -244,9 +250,6 @@ namespace UnityExplorer.UI.CSConsole
else else
Completer.CheckAutocompletes(); Completer.CheckAutocompletes();
} }
if (EnableAutoIndent)
DoAutoIndent();
} }
UpdateCaret(out _); UpdateCaret(out _);
@ -261,16 +264,16 @@ namespace UnityExplorer.UI.CSConsole
UpdateCaret(out bool caretMoved); UpdateCaret(out bool caretMoved);
if (!settingCaretCoroutine && EnableSuggestions && AutoCompleteModal.CheckEscape(Completer)) if (!settingCaretCoroutine && EnableSuggestions)
{ {
OnAutocompleteEscaped(); if (AutoCompleteModal.CheckEscape(Completer))
return; {
} OnAutocompleteEscaped();
return;
}
if (!settingCaretCoroutine && EnableSuggestions && caretMoved) if (caretMoved)
{ AutoCompleteModal.Instance.ReleaseOwnership(Completer);
AutoCompleteModal.Instance.ReleaseOwnership(Completer);
//Completer.CheckAutocompletes();
} }
if (EnableCtrlRShortcut if (EnableCtrlRShortcut