administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix pascalabcnet/pascalabcnetide#73

Browse source
This commit is contained in:
Ivan Bondarev 2021-08-13 16:17:42 +02:00
parent 5c0199afd3
commit d3b3749d2f
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
CodeCompletion/DomConverter.cs
View file

@ -581,6 +581,26 @@ namespace CodeCompletion
{
out_si = elem_si;
//out_si = new SymInfo(elems[i].name,elems[i].kind,elems[i].describe);
if ((si as ElementScope).sc is CompiledScope)
{
Type t = ((si as ElementScope).sc as CompiledScope).ctn;
expression name_expr = new ident(out_si.name);
if (out_si.name.IndexOf("<") != -1)
{
template_param_list tpl = new template_param_list();
int num_params = out_si.name.Split(',').Length;
for (var j=0; j<num_params; j++)
tpl.Add(new named_type_reference("T"));
name_expr = new ident_with_templateparams(new ident(out_si.name.Substring(0, out_si.name.IndexOf("<"))), tpl);
}
ExpressionVisitor ev = new ExpressionVisitor(name_expr, visitor.FindScopeByLocation(line + 1, col + 1), visitor);
if (ev.GetScopeOfExpression() == null)
{
out_si.name = t.Namespace + "." + out_si.name;
}
}
string s = CodeCompletionController.CurrentParser.LanguageInformation.GetSimpleDescriptionWithoutNamespace((si as ElementScope).sc as PascalABCCompiler.Parsers.ITypeScope);
if (s != out_si.name)
out_si.addit_name = s;
@ -594,6 +614,25 @@ namespace CodeCompletion
if (!out_si.name.StartsWith("$") && out_si.kind != SymbolKind.Interface)
{
out_si.name = (si as ElementScope).sc.GetFullName();
if ((si as ElementScope).sc is CompiledScope)
{
Type t = ((si as ElementScope).sc as CompiledScope).ctn;
expression name_expr = new ident(out_si.name);
if (out_si.name.IndexOf("<") != -1)
{
template_param_list tpl = new template_param_list();
int num_params = out_si.name.Split(',').Length;
for (var j = 0; j < num_params; j++)
tpl.Add(new named_type_reference("T"));
name_expr = new ident_with_templateparams(new ident(out_si.name.Substring(0, out_si.name.IndexOf("<"))), tpl);
}
ExpressionVisitor ev = new ExpressionVisitor(name_expr, visitor.FindScopeByLocation(line + 1, col + 1), visitor);
if (ev.GetScopeOfExpression() == null)
{
out_si.name = t.Namespace + "." + out_si.name;
}
}
result_names.Add(out_si);
}
else