From 4c2166451b42a37b9d9bc803da36b53ab4d52145 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?= Date: Sun, 10 Apr 2016 11:02:05 +0200 Subject: [PATCH] bug fix #116, #130 --- CodeCompletion/SymTable.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CodeCompletion/SymTable.cs b/CodeCompletion/SymTable.cs index 32bf2660d..c03609eec 100644 --- a/CodeCompletion/SymTable.cs +++ b/CodeCompletion/SymTable.cs @@ -4653,8 +4653,10 @@ namespace CodeCompletion { if (t.GenericParameterPosition < generic_args.Count) return generic_args[t.GenericParameterPosition]; - else + else if (generic_args.Count > 0) return generic_args[0]; + else + return TypeTable.get_compiled_type(null, t); } if (t.IsArray) return new ArrayScope(get_type_instance(t.GetElementType(), generic_args), null); @@ -4806,6 +4808,8 @@ namespace CodeCompletion { List lst = new List(); lst.Add(gen_args[Math.Min(i, gen_args.Count - 1)]); + if (lst[0].instances != null && lst[0].instances.Count > 0) + lst[0] = lst[0].instances[0]; sc.instances.Add(this.instances[i].GetInstance(lst)); } else