fixes crashes

slavara · slavara · commit 531aa645d5fa · 2016-04-18T23:12:22.000+03:00
diff --git a/PostfixCodeCompletion/Helpers/Reflector.cs b/PostfixCodeCompletion/Helpers/Reflector.cs
@@ -1,15 +1,17 @@
 ﻿using System.Collections.Generic;
+using System.Diagnostics;
 using System.Reflection;
 using System.Windows.Forms;
 using ASCompletion.Completion;
 using ASCompletion.Context;
+using ASCompletion.Model;
 using PluginCore;
 using PluginCore.Controls;
 using ScintillaNet;
 
 namespace PostfixCodeCompletion.Helpers
 {
-    static class Reflector
+    internal static class Reflector
     {
         internal static readonly CompletionListReflector CompletionList = new CompletionListReflector();
         internal static readonly ASCompleteReflector ASComplete = new ASCompleteReflector();
@@ -18,21 +20,23 @@ static class Reflector
 
     internal class CompletionListReflector
     {
-        internal ListBox completionList
+        internal ListBox CompletionList
         {
             get
             {
-                var member = typeof(CompletionList).GetField("completionList", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-                return (ListBox)member.GetValue(typeof(ListBox));
+                var fieldInfo = typeof(CompletionList).GetField("completionList", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
+                Debug.Assert(fieldInfo != null, "fieldInfo != null");
+                return (ListBox) fieldInfo.GetValue(typeof(ListBox));
             }
         }
 
-        internal List<ICompletionListItem> allItems
+        internal List<ICompletionListItem> AllItems
         {
             get
             {
-                var member = typeof(CompletionList).GetField("allItems", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-                return (List<ICompletionListItem>)member.GetValue(typeof(List<ICompletionListItem>));
+                var fieldInfo = typeof(CompletionList).GetField("allItems", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
+                Debug.Assert(fieldInfo != null, "fieldInfo != null");
+                return (List<ICompletionListItem>) fieldInfo.GetValue(typeof(List<ICompletionListItem>));
             }
         }
     }
@@ -42,7 +46,8 @@ internal class ASCompleteReflector
         internal bool HandleDotCompletion(ScintillaControl sci, bool autoHide)
         {
             var methodInfo = typeof(ASComplete).GetMethod("HandleDotCompletion", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-            return (bool)methodInfo.Invoke(null, new object[] { sci, autoHide });
+            Debug.Assert(methodInfo != null, "methodInfo != null");
+            return (bool) methodInfo.Invoke(null, new object[] {sci, autoHide});
         }
     }
 
@@ -51,31 +56,43 @@ internal class ASGeneratorReflector
         internal string CleanType(string type)
         {
             var methodInfo = typeof(ASGenerator).GetMethod("CleanType", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-            return (string)methodInfo.Invoke(null, new object[] { type });
+            Debug.Assert(methodInfo != null, "methodInfo != null");
+            return (string) methodInfo.Invoke(null, new object[] {type});
         }
 
         internal string GuessVarName(string name, string type)
         {
             var methodInfo = typeof(ASGenerator).GetMethod("GuessVarName", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-            return (string)methodInfo.Invoke(null, new object[] { name, type });
+            Debug.Assert(methodInfo != null, "methodInfo != null");
+            return (string) methodInfo.Invoke(null, new object[] {name, type});
         }
 
         internal string GetShortType(string type)
         {
             var methodInfo = typeof(ASGenerator).GetMethod("GetShortType", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-            return (string)methodInfo.Invoke(null, new object[] { type });
+            Debug.Assert(methodInfo != null, "methodInfo != null");
+            return (string) methodInfo.Invoke(null, new object[] {type});
         }
 
         internal StatementReturnType GetStatementReturnType(ScintillaControl sci, string line, int positionFromLine)
         {
+            var currentClass = ASContext.Context.CurrentClass;
+            if (currentClass.InFile.Context == null)
+            {
+                currentClass = (ClassModel) currentClass.Clone();
+                var language = PluginBase.MainForm.SciConfig.GetLanguageFromFile(currentClass.InFile.BasePath);
+                currentClass.InFile.Context = ASContext.GetLanguageContext(language) ?? ASContext.Context;
+            }
             var methodInfo = typeof(ASGenerator).GetMethod("GetStatementReturnType", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-            var returnType = methodInfo.Invoke(null, new object[] { sci, ASContext.Context.CurrentClass, line, positionFromLine });
+            Debug.Assert(methodInfo != null, "methodInfo != null");
+            var returnType = methodInfo.Invoke(null, new object[] {sci, currentClass, line, positionFromLine});
             if (returnType == null) return null;
+            var type = returnType.GetType();
             var result = new StatementReturnType
             {
-                Resolve = (ASResult) returnType.GetType().GetField("resolve").GetValue(returnType),
-                Position = (int) returnType.GetType().GetField("position").GetValue(returnType),
-                Word = (string) returnType.GetType().GetField("word").GetValue(returnType)
+                Resolve = (ASResult) type.GetField("resolve").GetValue(returnType),
+                Position = (int) type.GetField("position").GetValue(returnType),
+                Word = (string) type.GetField("word").GetValue(returnType)
             };
             return result;
         }
diff --git a/PostfixCodeCompletion/PluginMain.cs b/PostfixCodeCompletion/PluginMain.cs
@@ -74,7 +74,7 @@ public void Dispose()
         /// </summary>
         public void HandleEvent(object sender, NotifyEvent e, HandlingPriority priority)
         {
-            var completionList = Reflector.CompletionList.completionList;
+            var completionList = Reflector.CompletionList.CompletionList;
             switch (e.Type)
             {
                 case EventType.UIStarted:
@@ -175,7 +175,7 @@ static void UpdateCompletionList(MemberModel target, ASResult expr)
         {
             if (target == null || !TemplateUtils.GetHasTemplates()) return;
             var items = GetPostfixCompletionItems(target, expr);
-            var allItems = Reflector.CompletionList.allItems;
+            var allItems = Reflector.CompletionList.AllItems;
             if (allItems != null)
             {
                 var labels = new HashSet<string>();
@@ -200,7 +200,7 @@ static void UpdateCompletionList(MemberModel target, ASResult expr)
                 });
             }
             CompletionList.Show(items, false, word);
-            var list = Reflector.CompletionList.completionList;
+            var list = Reflector.CompletionList.CompletionList;
             completionListItemCount = list.Items.Count;
             list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
             list.SelectedValueChanged += OnCompletionListSelectedValueChanged;
@@ -435,15 +435,15 @@ static void OnCharAdded(ScintillaControl sender, int value)
                 if (sci.PositionIsOnComment(sci.CurrentPos)) return;
                 if (ASComplete.OnChar(sci, value, false))
                 {
-                    if (Reflector.CompletionList.completionList.Visible) UpdateCompletionList();
+                    if (Reflector.CompletionList.CompletionList.Visible) UpdateCompletionList();
                     return;
                 }
                 if (!Reflector.ASComplete.HandleDotCompletion(sci, true) || CompletionList.Active) return;
                 var expr = GetPostfixCompletionExpr();
                 if (expr == null || expr.IsNull()) return;
-                Reflector.CompletionList.completionList.VisibleChanged -= OnCompletionListVisibleChanged;
+                Reflector.CompletionList.CompletionList.VisibleChanged -= OnCompletionListVisibleChanged;
                 UpdateCompletionList(expr);
-                Reflector.CompletionList.completionList.VisibleChanged += OnCompletionListVisibleChanged;
+                Reflector.CompletionList.CompletionList.VisibleChanged += OnCompletionListVisibleChanged;
             }
             catch (Exception e)
             {
@@ -453,14 +453,14 @@ static void OnCharAdded(ScintillaControl sender, int value)
 
         static void OnCompletionListVisibleChanged(object o, EventArgs args)
         {
-            var list = Reflector.CompletionList.completionList;
+            var list = Reflector.CompletionList.CompletionList;
             if (list.Visible) UpdateCompletionList();
             else list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
         }
 
         static void OnCompletionListSelectedValueChanged(object sender, EventArgs args)
         {
-            var list = Reflector.CompletionList.completionList;
+            var list = Reflector.CompletionList.CompletionList;
             list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
             if (completionListItemCount != list.Items.Count) UpdateCompletionList();
         }
@@ -526,7 +526,7 @@ static void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, Hax
                     if (hc.AutoHide) CompletionList.Hide();
                     break;
                 case HaxeCompleteStatus.Type:
-                    var list = Reflector.CompletionList.completionList;
+                    var list = Reflector.CompletionList.CompletionList;
                     list.VisibleChanged -= OnCompletionListVisibleChanged;
                     var expr = hc.Expr;
                     if (result.Type is ClassModel)

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,17 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using System.Diagnostics;`
`2`	`3`	`using System.Reflection;`
`3`	`4`	`using System.Windows.Forms;`
`4`	`5`	`using ASCompletion.Completion;`
`5`	`6`	`using ASCompletion.Context;`
	`7`	`+using ASCompletion.Model;`
`6`	`8`	`using PluginCore;`
`7`	`9`	`using PluginCore.Controls;`
`8`	`10`	`using ScintillaNet;`
`9`	`11`
`10`	`12`	`namespace PostfixCodeCompletion.Helpers`
`11`	`13`	`{`
`12`		`- static class Reflector`
	`14`	`+ internal static class Reflector`
`13`	`15`	`{`
`14`	`16`	`internal static readonly CompletionListReflector CompletionList = new CompletionListReflector();`
`15`	`17`	`internal static readonly ASCompleteReflector ASComplete = new ASCompleteReflector();`
`@@ -18,21 +20,23 @@ static class Reflector`
`18`	`20`
`19`	`21`	`internal class CompletionListReflector`
`20`	`22`	`{`
`21`		`- internal ListBox completionList`
	`23`	`+ internal ListBox CompletionList`
`22`	`24`	`{`
`23`	`25`	`get`
`24`	`26`	`{`
`25`		`- var member = typeof(CompletionList).GetField("completionList", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`26`		`- return (ListBox)member.GetValue(typeof(ListBox));`
	`27`	`+ var fieldInfo = typeof(CompletionList).GetField("completionList", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
	`28`	`+ Debug.Assert(fieldInfo != null, "fieldInfo != null");`
	`29`	`+ return (ListBox) fieldInfo.GetValue(typeof(ListBox));`
`27`	`30`	`}`
`28`	`31`	`}`
`29`	`32`
`30`		`- internal List<ICompletionListItem> allItems`
	`33`	`+ internal List<ICompletionListItem> AllItems`
`31`	`34`	`{`
`32`	`35`	`get`
`33`	`36`	`{`
`34`		`- var member = typeof(CompletionList).GetField("allItems", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`35`		`- return (List<ICompletionListItem>)member.GetValue(typeof(List<ICompletionListItem>));`
	`37`	`+ var fieldInfo = typeof(CompletionList).GetField("allItems", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
	`38`	`+ Debug.Assert(fieldInfo != null, "fieldInfo != null");`
	`39`	`+ return (List<ICompletionListItem>) fieldInfo.GetValue(typeof(List<ICompletionListItem>));`
`36`	`40`	`}`
`37`	`41`	`}`
`38`	`42`	`}`
`@@ -42,7 +46,8 @@ internal class ASCompleteReflector`
`42`	`46`	`internal bool HandleDotCompletion(ScintillaControl sci, bool autoHide)`
`43`	`47`	`{`
`44`	`48`	`var methodInfo = typeof(ASComplete).GetMethod("HandleDotCompletion", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`45`		`- return (bool)methodInfo.Invoke(null, new object[] { sci, autoHide });`
	`49`	`+ Debug.Assert(methodInfo != null, "methodInfo != null");`
	`50`	`+ return (bool) methodInfo.Invoke(null, new object[] {sci, autoHide});`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`
`@@ -51,31 +56,43 @@ internal class ASGeneratorReflector`
`51`	`56`	`internal string CleanType(string type)`
`52`	`57`	`{`
`53`	`58`	`var methodInfo = typeof(ASGenerator).GetMethod("CleanType", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`54`		`- return (string)methodInfo.Invoke(null, new object[] { type });`
	`59`	`+ Debug.Assert(methodInfo != null, "methodInfo != null");`
	`60`	`+ return (string) methodInfo.Invoke(null, new object[] {type});`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`internal string GuessVarName(string name, string type)`
`58`	`64`	`{`
`59`	`65`	`var methodInfo = typeof(ASGenerator).GetMethod("GuessVarName", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`60`		`- return (string)methodInfo.Invoke(null, new object[] { name, type });`
	`66`	`+ Debug.Assert(methodInfo != null, "methodInfo != null");`
	`67`	`+ return (string) methodInfo.Invoke(null, new object[] {name, type});`
`61`	`68`	`}`
`62`	`69`
`63`	`70`	`internal string GetShortType(string type)`
`64`	`71`	`{`
`65`	`72`	`var methodInfo = typeof(ASGenerator).GetMethod("GetShortType", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`66`		`- return (string)methodInfo.Invoke(null, new object[] { type });`
	`73`	`+ Debug.Assert(methodInfo != null, "methodInfo != null");`
	`74`	`+ return (string) methodInfo.Invoke(null, new object[] {type});`
`67`	`75`	`}`
`68`	`76`
`69`	`77`	`internal StatementReturnType GetStatementReturnType(ScintillaControl sci, string line, int positionFromLine)`
`70`	`78`	`{`
	`79`	`+ var currentClass = ASContext.Context.CurrentClass;`
	`80`	`+ if (currentClass.InFile.Context == null)`
	`81`	`+ {`
	`82`	`+ currentClass = (ClassModel) currentClass.Clone();`
	`83`	`+ var language = PluginBase.MainForm.SciConfig.GetLanguageFromFile(currentClass.InFile.BasePath);`
	`84`	`+ currentClass.InFile.Context = ASContext.GetLanguageContext(language) ?? ASContext.Context;`
	`85`	`+ }`
`71`	`86`	`var methodInfo = typeof(ASGenerator).GetMethod("GetStatementReturnType", BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Static);`
`72`		`- var returnType = methodInfo.Invoke(null, new object[] { sci, ASContext.Context.CurrentClass, line, positionFromLine });`
	`87`	`+ Debug.Assert(methodInfo != null, "methodInfo != null");`
	`88`	`+ var returnType = methodInfo.Invoke(null, new object[] {sci, currentClass, line, positionFromLine});`
`73`	`89`	`if (returnType == null) return null;`
	`90`	`+ var type = returnType.GetType();`
`74`	`91`	`var result = new StatementReturnType`
`75`	`92`	`{`
`76`		`- Resolve = (ASResult) returnType.GetType().GetField("resolve").GetValue(returnType),`
`77`		`- Position = (int) returnType.GetType().GetField("position").GetValue(returnType),`
`78`		`- Word = (string) returnType.GetType().GetField("word").GetValue(returnType)`
	`93`	`+ Resolve = (ASResult) type.GetField("resolve").GetValue(returnType),`
	`94`	`+ Position = (int) type.GetField("position").GetValue(returnType),`
	`95`	`+ Word = (string) type.GetField("word").GetValue(returnType)`
`79`	`96`	`};`
`80`	`97`	`return result;`
`81`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void Dispose()`
`74`	`74`	`/// </summary>`
`75`	`75`	`public void HandleEvent(object sender, NotifyEvent e, HandlingPriority priority)`
`76`	`76`	`{`
`77`		`- var completionList = Reflector.CompletionList.completionList;`
	`77`	`+ var completionList = Reflector.CompletionList.CompletionList;`
`78`	`78`	`switch (e.Type)`
`79`	`79`	`{`
`80`	`80`	`case EventType.UIStarted:`
`@@ -175,7 +175,7 @@ static void UpdateCompletionList(MemberModel target, ASResult expr)`
`175`	`175`	`{`
`176`	`176`	`if (target == null \|\| !TemplateUtils.GetHasTemplates()) return;`
`177`	`177`	`var items = GetPostfixCompletionItems(target, expr);`
`178`		`- var allItems = Reflector.CompletionList.allItems;`
	`178`	`+ var allItems = Reflector.CompletionList.AllItems;`
`179`	`179`	`if (allItems != null)`
`180`	`180`	`{`
`181`	`181`	`var labels = new HashSet<string>();`
`@@ -200,7 +200,7 @@ static void UpdateCompletionList(MemberModel target, ASResult expr)`
`200`	`200`	`});`
`201`	`201`	`}`
`202`	`202`	`CompletionList.Show(items, false, word);`
`203`		`- var list = Reflector.CompletionList.completionList;`
	`203`	`+ var list = Reflector.CompletionList.CompletionList;`
`204`	`204`	`completionListItemCount = list.Items.Count;`
`205`	`205`	`list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;`
`206`	`206`	`list.SelectedValueChanged += OnCompletionListSelectedValueChanged;`
`@@ -435,15 +435,15 @@ static void OnCharAdded(ScintillaControl sender, int value)`
`435`	`435`	`if (sci.PositionIsOnComment(sci.CurrentPos)) return;`
`436`	`436`	`if (ASComplete.OnChar(sci, value, false))`
`437`	`437`	`{`
`438`		`- if (Reflector.CompletionList.completionList.Visible) UpdateCompletionList();`
	`438`	`+ if (Reflector.CompletionList.CompletionList.Visible) UpdateCompletionList();`
`439`	`439`	`return;`
`440`	`440`	`}`
`441`	`441`	`if (!Reflector.ASComplete.HandleDotCompletion(sci, true) \|\| CompletionList.Active) return;`
`442`	`442`	`var expr = GetPostfixCompletionExpr();`
`443`	`443`	`if (expr == null \|\| expr.IsNull()) return;`
`444`		`- Reflector.CompletionList.completionList.VisibleChanged -= OnCompletionListVisibleChanged;`
	`444`	`+ Reflector.CompletionList.CompletionList.VisibleChanged -= OnCompletionListVisibleChanged;`
`445`	`445`	`UpdateCompletionList(expr);`
`446`		`- Reflector.CompletionList.completionList.VisibleChanged += OnCompletionListVisibleChanged;`
	`446`	`+ Reflector.CompletionList.CompletionList.VisibleChanged += OnCompletionListVisibleChanged;`
`447`	`447`	`}`
`448`	`448`	`catch (Exception e)`
`449`	`449`	`{`
`@@ -453,14 +453,14 @@ static void OnCharAdded(ScintillaControl sender, int value)`
`453`	`453`
`454`	`454`	`static void OnCompletionListVisibleChanged(object o, EventArgs args)`
`455`	`455`	`{`
`456`		`- var list = Reflector.CompletionList.completionList;`
	`456`	`+ var list = Reflector.CompletionList.CompletionList;`
`457`	`457`	`if (list.Visible) UpdateCompletionList();`
`458`	`458`	`else list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`static void OnCompletionListSelectedValueChanged(object sender, EventArgs args)`
`462`	`462`	`{`
`463`		`- var list = Reflector.CompletionList.completionList;`
	`463`	`+ var list = Reflector.CompletionList.CompletionList;`
`464`	`464`	`list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;`
`465`	`465`	`if (completionListItemCount != list.Items.Count) UpdateCompletionList();`
`466`	`466`	`}`
`@@ -526,7 +526,7 @@ static void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, Hax`
`526`	`526`	`if (hc.AutoHide) CompletionList.Hide();`
`527`	`527`	`break;`
`528`	`528`	`case HaxeCompleteStatus.Type:`
`529`		`- var list = Reflector.CompletionList.completionList;`
	`529`	`+ var list = Reflector.CompletionList.CompletionList;`
`530`	`530`	`list.VisibleChanged -= OnCompletionListVisibleChanged;`
`531`	`531`	`var expr = hc.Expr;`
`532`	`532`	`if (result.Type is ClassModel)`