Use whitespace as delimiter in completion composition, handle string/comment state with Lexer

.github/workflows/dotnet.yml

@@ -7,21 +7,18 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: windows-latest
     if: "!contains(github.event.head_commit.message, '-noci')"
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      # Checkout latest with submodules
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-    
+          
+      # Setup tools
       - name: Setup msbuild
         uses: microsoft/setup-msbuild@v1       
         
@@ -32,113 +29,84 @@ jobs:
           nuget-version: '5.x'
           
       # Build Il2CppAssemblyUnhollower
-      - name: Build Il2CppAssemblyUnhollower
-        shell: cmd
-        run: msbuild lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\UnhollowerBaseLib.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
-      
-      # Restore mcs nuget
-      - name: Restore mcs nuget
-        run: nuget restore lib\mcs-unity\mcs.sln
+      - run: msbuild lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\UnhollowerBaseLib.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
       
       # Build mcs
-      - name: Build mcs
-        shell: cmd
-        run: msbuild lib\mcs-unity\mcs\mcs.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
+      - run: nuget restore lib\mcs-unity\mcs.sln
+      - run: msbuild lib\mcs-unity\mcs\mcs.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
         
-      # Restore NuGet packages
-      - name: Restore UnityExplorer nuget
-        run: nuget restore src\UnityExplorer.sln
-        
-      # Build UnityExplorer Releases
+      # Build UnityExplorer releases, and upload artifacts
       
-      - name: Build UnityExplorer BepInEx Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE_Cpp
+      - run: nuget restore src\UnityExplorer.sln      
       
-      - name: Build UnityExplorer BepInEx 5 Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE5_Mono
-      
-      - name: Build UnityExplorer BepInEx 6 Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE6_Mono
-      
-      - name: Build UnityExplorer MelonLoader Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Cpp
-      
-      - name: Build UnityExplorer MelonLoader Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Mono
-      
-      - name: Build UnityExplorer MelonLoader Legacy Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Cpp
-      
-      - name: Build UnityExplorer MelonLoader Legacy Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Mono
-      
-      - name: Build UnityExplorer Standalone Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Cpp
-      
-      - name: Build UnityExplorer Standalone Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Mono
-        
-      # Upload artifacts
+      # BepInEx Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE_Cpp
       
       - uses: actions/upload-artifact@v2
-        name: Upload BepInEx Il2Cpp zip
         with:
           name: UnityExplorer.BepInEx.Il2Cpp
           path: ./Release/UnityExplorer.BepInEx.Il2Cpp/*
+     
+      # BepInEx 5 Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE5_Mono
       
       - uses: actions/upload-artifact@v2
-        name: Upload BepInEx 5 Mono zip
         with:
           name: UnityExplorer.BepInEx5.Mono
           path: ./Release/UnityExplorer.BepInEx5.Mono/*
       
+      # BepInEx 6 Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE6_Mono
+      
       - uses: actions/upload-artifact@v2
-        name: Upload BepInEx 6 Mono zip
         with:
           name: UnityExplorer.BepInEx6.Mono
           path: ./Release/UnityExplorer.BepInEx6.Mono/*
       
+      # MelonLoader Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Cpp
+      
       - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Il2Cpp zip
         with:
           name: UnityExplorer.MelonLoader.Il2Cpp
           path: ./Release/UnityExplorer.MelonLoader.Il2Cpp/*
       
+      # MelonLoader Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Mono
+      
       - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Mono zip
         with:
           name: UnityExplorer.MelonLoader.Mono
           path: ./Release/UnityExplorer.MelonLoader.Mono/*
       
+      # MelonLoader 0.3.0 Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Cpp
+      
       - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Legacy Il2Cpp zip
         with:
           name: UnityExplorer.MelonLoader_Legacy.Il2Cpp
           path: ./Release/UnityExplorer.MelonLoader_Legacy.Il2Cpp/*
       
+      # MelonLoader 0.3.0 Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Mono
+      
       - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Legacy Mono zip
         with:
           name: UnityExplorer.MelonLoader_Legacy.Mono
           path: ./Release/UnityExplorer.MelonLoader_Legacy.Mono/*
       
+      # Standalone Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Cpp
+      
       - uses: actions/upload-artifact@v2
-        name: Upload Standalone Il2Cpp zip
         with:
           name: UnityExplorer.Standalone.Il2Cpp
           path: ./Release/UnityExplorer.Standalone.Il2Cpp/*
       
+      # Standalone Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Mono
+      
       - uses: actions/upload-artifact@v2
-        name: Upload Standalone Mono zip
         with:
           name: UnityExplorer.Standalone.Mono
           path: ./Release/UnityExplorer.Standalone.Mono/*

src/Core/Reflection/Il2CppReflection.cs

@@ -16,6 +16,7 @@ using CppType = Il2CppSystem.Type;
 using BF = System.Reflection.BindingFlags;
 using UnityExplorer.Core.Config;
 using UnhollowerBaseLib.Attributes;
+using UnityEngine;
 
 namespace UnityExplorer
 {
@@ -25,10 +26,15 @@ namespace UnityExplorer
         {
             base.Initialize();
 
+            float start = Time.realtimeSinceStartup;
             TryLoadGameModules();
+            ExplorerCore.Log($"Loaded Unhollowed modules in {Time.realtimeSinceStartup - start} seconds");
 
+            start = Time.realtimeSinceStartup;
             BuildDeobfuscationCache();
             OnTypeLoaded += TryCacheDeobfuscatedType;
+            ExplorerCore.Log($"Setup IL2CPP reflection in {Time.realtimeSinceStartup - start} seconds, " +
+                $"deobfuscated types count: {DeobfuscatedTypes.Count}");
         }
 
         #region IL2CPP Extern and pointers
@@ -67,19 +73,11 @@ namespace UnityExplorer
 
         private static void BuildDeobfuscationCache()
         {
-            float start = UnityEngine.Time.realtimeSinceStartup;
-
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
             {
                 foreach (var type in asm.TryGetTypes())
                     TryCacheDeobfuscatedType(type);
             }
-
-            if (DeobfuscatedTypes.Count > 0)
-            {
-                ExplorerCore.Log($"Built deobfuscation cache in {UnityEngine.Time.realtimeSinceStartup - start} seconds, " +
-                    $"initial count: {DeobfuscatedTypes.Count} ");
-            }
         }
 
         private static void TryCacheDeobfuscatedType(Type type)

src/Core/Reflection/ReflectionUtility.cs

@@ -65,10 +65,14 @@ namespace UnityExplorer
 
         private static void SetupTypeCache()
         {
+            float start = Time.realtimeSinceStartup;
+
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
                 CacheTypes(asm);
 
             AppDomain.CurrentDomain.AssemblyLoad += AssemblyLoaded;
+
+            ExplorerCore.Log($"Cached AppDomain assemblies in {Time.realtimeSinceStartup - start} seconds");
         }
 
         private static void AssemblyLoaded(object sender, AssemblyLoadEventArgs args)

src/ExplorerCore.cs

@@ -20,7 +20,7 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.1.0";
+        public const string VERSION = "4.1.2";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 

src/UI/CSConsole/CSAutoCompleter.cs

@@ -41,7 +41,7 @@ namespace UnityExplorer.UI.CSConsole
             suggestions.Clear();
 
             int caret = Math.Max(0, Math.Min(InputField.Text.Length - 1, InputField.Component.caretPosition - 1));
-            int start = caret;
+            int startIdx = caret;
 
             // If the character at the caret index is whitespace or delimiter,
             // or if the next character (if it exists) is not whitespace,
@@ -55,17 +55,18 @@ namespace UnityExplorer.UI.CSConsole
             }
 
             // get the current composition string (from caret back to last delimiter)
-            while (start > 0)
+            while (startIdx > 0)
             {
-                start--;
-                char c = InputField.Text[start];
-                if (delimiters.Contains(c))
+                startIdx--;
+                char c = InputField.Text[startIdx];
+                if (delimiters.Contains(c) || char.IsWhiteSpace(c))
                 {
-                    start++;
+                    startIdx++;
                     break;
                 }
             }
-            string input = InputField.Text.Substring(start, caret - start + 1);
+            string input = InputField.Text.Substring(startIdx, caret - startIdx + 1);
+
 
             // Get MCS completions
 

src/UI/CSConsole/ConsoleController.cs

@@ -231,20 +231,24 @@ namespace UnityExplorer.UI.CSConsole
             previousInput = value;
 
             if (EnableSuggestions && AutoCompleteModal.CheckEnter(Completer))
-            {
                 OnAutocompleteEnter();
-            }
-            else if (!settingCaretCoroutine)
+
+            var inStringOrComment = HighlightVisibleInput();
+            
+            if (!settingCaretCoroutine)
             {
                 if (EnableSuggestions)
-                    Completer.CheckAutocompletes();
+                {
+                    if (inStringOrComment)
+                        AutoCompleteModal.Instance.ReleaseOwnership(Completer);
+                    else
+                        Completer.CheckAutocompletes();
+                }
 
                 if (EnableAutoIndent)
                     DoAutoIndent();
             }
 
-            HighlightVisibleInput();
-
             UpdateCaret(out _);
         }
 
@@ -372,7 +376,10 @@ namespace UnityExplorer.UI.CSConsole
 
         #region Lexer Highlighting
 
-        private static void HighlightVisibleInput()
+        /// <summary>
+        /// Returns true if caret is inside string or comment, false otherwise
+        /// </summary>
+        private static bool HighlightVisibleInput()
         {
             int startIdx = 0;
             int endIdx = Input.Text.Length - 1;
@@ -410,7 +417,8 @@ namespace UnityExplorer.UI.CSConsole
             }
 
             // Highlight the visible text with the LexerBuilder
-            Panel.HighlightText.text = Lexer.BuildHighlightedString(Input.Text, startIdx, endIdx, topLine);
+            Panel.HighlightText.text = Lexer.BuildHighlightedString(Input.Text, startIdx, endIdx, topLine, LastCaretPosition, out bool ret);
+            return ret;
         }
 
         #endregion

src/UI/CSConsole/LexerBuilder.cs

@@ -14,6 +14,7 @@ namespace UnityExplorer.UI.CSConsole
         public int startIndex;
         public int endIndex;
         public string htmlColorTag;
+        public bool isStringOrComment;
     }
 
     public class LexerBuilder
@@ -82,8 +83,10 @@ namespace UnityExplorer.UI.CSConsole
         /// <param name="endIdx">The last character you want to highlight</param>
         /// <param name="leadingLines">The amount of leading empty lines you want before the first character in the return string.</param>
         /// <returns>A string which contains the amount of leading lines specified, as well as the rich-text highlighted section.</returns>
-        public string BuildHighlightedString(string input, int startIdx, int endIdx, int leadingLines)
+        public string BuildHighlightedString(string input, int startIdx, int endIdx, int leadingLines, int caretIdx, out bool caretInStringOrComment)
         {
+            caretInStringOrComment = false;
+
             if (string.IsNullOrEmpty(input) || endIdx <= startIdx)
                 return input;
 
@@ -105,12 +108,14 @@ namespace UnityExplorer.UI.CSConsole
 
                 // append the highlighted match
                 sb.Append(match.htmlColorTag);
-
                 for (int i = match.startIndex; i <= match.endIndex && i <= currentEndIdx; i++)
                     sb.Append(input[i]);
-
                 sb.Append(SignatureHighlighter.CLOSE_COLOR);
 
+                // check caretIdx to determine inStringOrComment state
+                if (caretIdx >= match.startIndex && caretIdx <= match.endIndex)
+                    caretInStringOrComment = match.isStringOrComment;
+
                 // update the last unhighlighted start index
                 lastUnhighlighted = match.endIndex + 1;
             }
@@ -150,6 +155,7 @@ namespace UnityExplorer.UI.CSConsole
                             startIndex = startIndex,
                             endIndex = CommittedIndex,
                             htmlColorTag = lexer.ColorTag,
+                            isStringOrComment = lexer is StringLexer || lexer is CommentLexer,
                         };
                         break;
                     }

src/UI/CSConsole/Lexers/KeywordLexer.cs

@@ -41,6 +41,10 @@ namespace UnityExplorer.UI.CSConsole.Lexers
                 while (!lexer.EndOfInput && char.IsLetter(lexer.PeekNext()))
                     sb.Append(lexer.Current);
 
+                // next must be whitespace or delimiter
+                if (!lexer.EndOfInput && !(char.IsWhiteSpace(lexer.Current) || lexer.IsDelimiter(lexer.Current)))
+                    return false;
+
                 if (keywords.Contains(sb.ToString()))
                 {
                     if (!lexer.EndOfInput)

src/UI/CSConsole/Lexers/SymbolLexer.cs

@@ -11,7 +11,7 @@ namespace UnityExplorer.UI.CSConsole.Lexers
         protected override Color HighlightColor => new Color(0.6f, 0.6f, 0.6f);
 
         // all symbols are delimiters
-        public override IEnumerable<char> Delimiters => symbols;
+        public override IEnumerable<char> Delimiters => symbols.Where(it => it != '.'); // '.' is not a delimiter, only a separator.
 
         public static bool IsSymbol(char c) => symbols.Contains(c);
 

src/UI/Inspectors/ReflectionInspector.cs

@@ -617,12 +617,15 @@ namespace UnityExplorer.UI.Inspectors
 
             // Actual texture viewer
 
-            var imageObj = UIFactory.CreateUIObject("TextureViewerImage", textureViewer);
-            textureImage = imageObj.AddComponent<Image>();
-            textureImageLayout = textureImage.gameObject.AddComponent<LayoutElement>();
+            var imageViewport = UIFactory.CreateVerticalGroup(textureViewer, "Viewport", false, false, true, true);
+            imageViewport.GetComponent<Image>().color = Color.white;
+            imageViewport.AddComponent<Mask>().showMaskGraphic = false;
 
+            var imageObj = UIFactory.CreateUIObject("Image", imageViewport);
             var fitter = imageObj.AddComponent<ContentSizeFitter>();
             fitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            textureImage = imageObj.AddComponent<Image>();
+            textureImageLayout = UIFactory.SetLayoutElement(imageObj, flexibleWidth: 9999, flexibleHeight: 9999);
 
             textureViewer.SetActive(false);
         }