Backups/UnityExplorer_Fix
1
0
Fork 0
mirror of https://github.com/GrahamKracker/UnityExplorer.git synced 2025-07-17 08:37:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix null-coalescing operators in the C# console crashing the game

Browse Source
This commit is contained in:
sinaioutlander
2020-10-28 07:14:00 +11:00
parent ff684d4d4b
commit b61ac481b9
16 changed files with 126 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/UI/Main/Console/AutoCompleter.cs
View File

@ -159,7 +159,7 @@ namespace ExplorerBeta.UI.Main.Console
}
}
private static readonly char[] splitChars = new[] { '{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&' };
private static readonly char[] splitChars = new[] { '{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&', '?' };
public static void CheckAutocomplete()
{

4
src/UI/Main/Console/CSharpLexer.cs
View File

@ -28,7 +28,7 @@ namespace ExplorerBeta.UI.Main.Console
if in int into is join let lock long new null object on orderby out
ref remove return sbyte select short sizeof stackalloc string
switch throw true try typeof uint ulong ushort
value var where while yield"
var where while yield"
};
public static KeywordMatch invalidKeywordMatcher = new KeywordMatch()
@ -36,7 +36,7 @@ namespace ExplorerBeta.UI.Main.Console
highlightColor = new Color(0.95f, 0.10f, 0.10f, 1.0f),
keywords = @"abstract async base class delegate enum explicit extern fixed get
implicit interface internal namespace operator override params private protected public
using partial readonly sealed set static struct this unchecked unsafe virtual volatile void"
using partial readonly sealed set static struct this unchecked unsafe value virtual volatile void"
};
private static char[] delimiterSymbolCache = null;

58
src/UI/Main/Console/ScriptInteraction.cs
View File

@ -27,66 +27,28 @@ namespace ExplorerBeta.UI.Main.Console
public static object CurrentTarget()
{
throw new NotImplementedException("TODO");
return InspectorManager.Instance?.m_activeInspector?.Target;
}
public static object[] AllTargets()
{
throw new NotImplementedException("TODO");
int count = InspectorManager.Instance?.m_currentInspectors.Count ?? 0;
object[] ret = new object[count];
for (int i = 0; i < count; i++)
{
ret[i] = InspectorManager.Instance?.m_currentInspectors[i].Target;
}
return ret;
}
public static void Inspect(object obj)
{
throw new NotImplementedException("TODO");
InspectorManager.Instance.Inspect(obj);
}
public static void Inspect(Type type)
{
throw new NotImplementedException("TODO");
InspectorManager.Instance.Inspect(type);
}
// public static void Help()
// {
// ExplorerCore.Log(@"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// C# Console Help
//The following helper methods are available:
//void Log(object message)
// prints a message to the console window and debug log
// usage: Log(""hello world"");
//void AddUsing(string directive)
// adds a using directive to the console.
// usage: AddUsing(""UnityEngine.UI"");
//void GetUsing()
// logs the current using directives to the debug console
// usage: GetUsing();
//void Reset()
// resets the C# console, clearing all variables and using directives.
// usage: Reset();
//");
//TODO:
//ExplorerCore.Log("object CurrentTarget()");
//ExplorerCore.Log(" returns the target object of the current tab (in tab view mode only)");
//ExplorerCore.Log(" usage: var target = CurrentTarget();");
//ExplorerCore.Log("");
//ExplorerCore.Log("object[] AllTargets()");
//ExplorerCore.Log(" returns an object[] array containing all currently inspected objects");
//ExplorerCore.Log(" usage: var targets = AllTargets();");
//ExplorerCore.Log("");
//ExplorerCore.Log("void Inspect(object obj)");
//ExplorerCore.Log(" inspects the provided object in a new window.");
//ExplorerCore.Log(" usage: Inspect(Camera.main);");
//ExplorerCore.Log("");
//ExplorerCore.Log("void Inspect(Type type)");
//ExplorerCore.Log(" attempts to inspect the provided type with static-only reflection.");
//ExplorerCore.Log(" usage: Inspect(typeof(Camera));");
//}
}
}