Editor: fixes for showing autocomplete list for array elements

This includes multi-dimensional arrays parsing. Although old compiler does not support multi-dimensional arrays, but it's good to keep autocomplete parsing consistent between editor branches.

Author: ivan-mogilko

Editor/AGS.Editor/Panes/ScintillaWrapper.cs

@@ -1540,6 +1540,21 @@ private ScriptStruct FindGlobalType(string type)
             return null;
         }
 
+        private ScriptVariable FindGlobalVariableWithName(string name)
+        {
+            foreach (IScript script in GetAutoCompleteScriptList())
+            {
+                foreach (ScriptVariable varDef in script.AutoCompleteData.Variables)
+                {
+                    if (varDef.VariableName == name)
+                    {
+                        return varDef;
+                    }
+                }
+            }
+            return null;
+        }
+
         private ScriptStruct FindGlobalVariableOrType(string type, out bool staticAccess)
         {
             // First try search for a type that has this name
@@ -1551,34 +1566,34 @@ private ScriptStruct FindGlobalVariableOrType(string type, out bool staticAccess
             }
 
             // Then, search for a variable that has this name, and try retrieving its type
-            foreach (IScript script in GetAutoCompleteScriptList())
+            staticAccess = false;
+            ScriptVariable var = FindGlobalVariableWithName(type);
+            if (var != null)
             {
-                foreach (ScriptVariable varDef in script.AutoCompleteData.Variables)
-                {
-                    if (varDef.VariableName == type)
-                    {
-                        staticAccess = false;
-                        return FindGlobalType(varDef.Type);
-                    }
-                }
+                return FindGlobalType(var.Type);
             }
-
-            staticAccess = false;
             return null;
         }
 
-        private string ReadNextWord(ref string pathedExpression, out bool indexedAccess)
+        // FIXME: this function basically parses a variable access, idk why it's called ReadNextWord
+        private string ReadNextWord(ref string pathedExpression, out bool indexedAccess, out int dimAccess)
         {
             string thisWord = string.Empty;
             indexedAccess = false;
+            dimAccess = 0;
             while ((pathedExpression.Length > 0) &&
-                ((Char.IsLetterOrDigit(pathedExpression[0])) || (pathedExpression[0] == '_')))
+                pathedExpression[0].IsScriptWordChar())
             {
                 thisWord += pathedExpression[0];
                 pathedExpression = pathedExpression.Substring(1);
             }
-            if ((pathedExpression.Length > 0) && (pathedExpression[0] == '['))
+            pathedExpression = pathedExpression.TrimStart();
+            // TODO: this ugly code parses multi-dimensional array access;
+            // probably could be merged with similar parsing in autocomplete?
+            while (pathedExpression.Length > 0 && (pathedExpression[0] == '['))
             {
+                indexedAccess = true;
+                dimAccess++;
                 int bracketDepth = 1;
                 int cursorPos = 1;
                 while ((bracketDepth > 0) && (cursorPos < pathedExpression.Length))
@@ -1589,7 +1604,7 @@ private string ReadNextWord(ref string pathedExpression, out bool indexedAccess)
                     cursorPos++;
                 }
                 pathedExpression = pathedExpression.Substring(cursorPos);
-                indexedAccess = true;
+                pathedExpression = pathedExpression.TrimStart();
             }
             if ((pathedExpression.Length > 0) && (pathedExpression[0] == '.'))
             {
@@ -1665,8 +1680,9 @@ private ScriptStruct ParsePreviousExpression(int startAtPos, out string characte
             }
 
             bool indexedAccess = false;
+            int dimAccess = 0;
             staticAccess = false;
-            string thisWord = ReadNextWord(ref pathedExpression, out indexedAccess);
+            string thisWord = ReadNextWord(ref pathedExpression, out indexedAccess, out dimAccess);
             ScriptStruct foundType;
 
             if (thisWord == THIS_STRUCT)
@@ -1679,27 +1695,42 @@ private ScriptStruct ParsePreviousExpression(int startAtPos, out string characte
             }
             else
             {
-                foundType = FindGlobalVariableOrType(thisWord, out staticAccess);
-                if (staticAccess && indexedAccess)
-                    return null; // element access of type? bad syntax...
+                // First try search for a type that has this name
+                foundType = FindGlobalType(thisWord);
+                if (foundType != null)
+                {
+                    if (indexedAccess)
+                        return null; // element access of type? bad syntax...
+                    staticAccess = true;
+                }
+                else
+                {
+                    // Then lookup for a global variable of this name
+                    ScriptVariable var = FindGlobalVariableWithName(thisWord);
+                    if (var != null)
+                    {
+                        foundType = ProcessVariableAccess(var, indexedAccess, dimAccess);
+                    }
+                }
 
+                // Not a type or global variable? try if that's a local variable
                 if ((foundType == null) && (thisWord.Length > 0))
                 {
                     ScriptVariable var = FindLocalVariableWithName(startAtPos, thisWord);
                     if (var != null)
                     {
-                        foundType = ProcessVariableAccess(var, indexedAccess);
+                        foundType = ProcessVariableAccess(var, indexedAccess, dimAccess);
                     }
                 }
             }
 
             while ((pathedExpression.Length > 0) && (foundType != null))
             {
-                thisWord = ReadNextWord(ref pathedExpression, out indexedAccess);
+                thisWord = ReadNextWord(ref pathedExpression, out indexedAccess, out dimAccess);
                 ScriptVariable memberVar = foundType.FindMemberVariable(thisWord);
                 if (memberVar != null)
                 {
-                    foundType = ProcessVariableAccess(memberVar, indexedAccess);
+                    foundType = ProcessVariableAccess(memberVar, indexedAccess, dimAccess);
                     if (foundType == null)
                         return null;
                     staticAccess = false;
@@ -1712,7 +1743,7 @@ private ScriptStruct ParsePreviousExpression(int startAtPos, out string characte
             return foundType;
         }
 
-        private ScriptStruct ProcessVariableAccess(ScriptVariable var, bool indexedAccess)
+        private ScriptStruct ProcessVariableAccess(ScriptVariable var, bool indexedAccess, int accessDims = 1)
         {
             if (!var.IsArray && indexedAccess)
                 return null; // accessing element of non-array, bad syntax...
@@ -1724,8 +1755,16 @@ private ScriptStruct ProcessVariableAccess(ScriptVariable var, bool indexedAcces
             if (foundType == null)
                 return null;
 
+            // Dynamic array variable has a type of T[]; and in case of a
+            // indexed access we have to resolve that to the base type,
+            // following a number of dimensions.
             if (var.IsDynamicArray && indexedAccess)
-                foundType = FindGlobalType(foundType.BaseType);
+            {
+                for (int i = 0; i < accessDims; ++i)
+                {
+                    foundType = FindGlobalType(foundType.BaseType);
+                }
+            }
 
             return foundType;
         }