From da87ce6c14ac76a5f588ebbdf1095bfcd8e678e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= <ibond84@googlemail.com>
Date: Wed, 4 Oct 2017 21:50:52 +0200
Subject: [PATCH] fix a stack overflow bug in intellisense

---
 CodeCompletion/SymTable.cs                  |  49 ++++++++++++--------
 VisualPascalABCNET/Resources/openclosed.png | Bin 0 -> 3205 bytes
 2 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 VisualPascalABCNET/Resources/openclosed.png

diff --git a/CodeCompletion/SymTable.cs b/CodeCompletion/SymTable.cs
index c6013f683..fa7bd5bc4 100644
--- a/CodeCompletion/SymTable.cs
+++ b/CodeCompletion/SymTable.cs
@@ -384,31 +384,38 @@ namespace CodeCompletion
                         tmp_ts = tmp_ts.baseScope;
                 }
                 if (ts.implemented_interfaces != null && !(ts is ArrayScope && !(ts as ArrayScope).is_dynamic_arr))
-                foreach (TypeScope int_ts in ts.implemented_interfaces)
                 {
-                    TypeScope int_ts2 = int_ts;
-                    if (int_ts is CompiledScope && (int_ts as CompiledScope).CompiledType.IsGenericType && !(int_ts as CompiledScope).CompiledType.IsGenericTypeDefinition)
-                        int_ts2 = TypeTable.get_compiled_type((int_ts as CompiledScope).CompiledType.GetGenericTypeDefinition());
-                    if (extension_methods.TryGetValue(int_ts2, out meths))
+                    List<TypeScope> implemented_interfaces = new List<TypeScope>();
+                    implemented_interfaces.AddRange(ts.implemented_interfaces);
+                    if (ts is ArrayScope)
+                        implemented_interfaces.Add((ts as ArrayScope).ilist);
+                    foreach (TypeScope int_ts in implemented_interfaces)
                     {
-                        lst.AddRange(meths);
-                    }
-                    else
-                    {
-                        foreach (TypeScope t in extension_methods.Keys)
+                        TypeScope int_ts2 = int_ts;
+                        if (int_ts is CompiledScope && (int_ts as CompiledScope).CompiledType.IsGenericType && !(int_ts as CompiledScope).CompiledType.IsGenericTypeDefinition)
+                            int_ts2 = TypeTable.get_compiled_type((int_ts as CompiledScope).CompiledType.GetGenericTypeDefinition());
+                        if (extension_methods.TryGetValue(int_ts2, out meths))
                         {
-                            if (t.GenericTypeDefinition == int_ts2.GenericTypeDefinition || t.IsEqual(int_ts2) || 
-                                    (t is ArrayScope && int_ts2.IsArray && t.Rank == int_ts2.Rank) || 
-                                    (int_ts2 is ArrayScope && t.IsArray && int_ts2.Rank == t.Rank) ||
-                                    t is FileScope && int_ts2 is FileScope)
-                            {
-                                lst.AddRange(extension_methods[t]);
-                                //break;
-                            }
+                            lst.AddRange(meths);
+                        }
+                        else
+                        {
+                            foreach (TypeScope t in extension_methods.Keys)
+                            {
+                                if (t.GenericTypeDefinition == int_ts2.GenericTypeDefinition || t.IsEqual(int_ts2) ||
+                                        (t is ArrayScope && int_ts2.IsArray && t.Rank == int_ts2.Rank) ||
+                                        (int_ts2 is ArrayScope && t.IsArray && int_ts2.Rank == t.Rank) ||
+                                        t is FileScope && int_ts2 is FileScope)
+                                {
+                                    lst.AddRange(extension_methods[t]);
+                                    //break;
+                                }
+                            }
+
                         }
-                        
                     }
                 }
+                
             }
             if (this.used_units != null)
                 for (int i = 0; i < this.used_units.Count; i++)
@@ -443,7 +450,7 @@ namespace CodeCompletion
 
         public void AddUsedUnit(SymScope unit)
         {
-            //if (!hasUsesCycle(unit))
+            if (this.si.name != "PABCSystem")
                 used_units.Add(unit);
         }
 
@@ -2912,6 +2919,7 @@ namespace CodeCompletion
         public TypeScope[] indexes;
         private bool _is_dynamic_arr = false;
         private bool _is_multi_dyn_arr = false;
+        internal TypeScope ilist;
 
         public ArrayScope()
         {
@@ -2945,6 +2953,7 @@ namespace CodeCompletion
                 lst.Add(elementType);
                 this.implemented_interfaces = new List<TypeScope>();
                 this.implemented_interfaces.Add(CompiledScope.get_type_instance(typeof(IEnumerable<>), lst));
+                ilist = CompiledScope.get_type_instance(typeof(IList<>), lst);
                 //this.implemented_interfaces.Add(CompiledScope.get_type_instance(typeof(IList<>), lst));
             }
             this.si = new SymInfo("$" + this.ToString(), SymbolKind.Type, this.ToString());
diff --git a/VisualPascalABCNET/Resources/openclosed.png b/VisualPascalABCNET/Resources/openclosed.png
new file mode 100644
index 0000000000000000000000000000000000000000..9572ae18e2ec7fbeab3aa9be09e5793f1d654cf4
GIT binary patch
literal 3205
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

literal 0
HcmV?d00001