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

bug fix #175

Browse source
This commit is contained in:
Бондарев Иван 2016-05-30 20:46:09 +02:00
parent 902c11efba
commit a12aca7533
2 changed files with 54 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -387,7 +387,7 @@ namespace CodeCompletion
for (int i = 0; i < _named_type_reference.names.Count; i++)
{
if (i == _named_type_reference.names.Count - 1 && converted_template_type != null)
suffix = "`" + _named_type_reference.names.Count;
suffix = "`" + converted_template_type.params_list.params_list.Count;
if (i > 0)
returned_scope = returned_scope.FindNameOnlyInType(_named_type_reference.names[i].name+suffix);
else
@ -1081,10 +1081,27 @@ namespace CodeCompletion
ps.declaringUnit = entry_scope;
if (_procedure_header.template_args != null && !ps.IsGeneric())
{
Dictionary<string, TypeScope> where_types = new Dictionary<string, TypeScope>();
if (_procedure_header.where_defs != null)
{
foreach (where_definition wd in _procedure_header.where_defs.defs)
{
for (int i = 0; i < wd.names.idents.Count; i++)
{
string name = wd.names.idents[i].name;
wd.types.defs[i].visit(this);
where_types[name] = returned_scope as TypeScope;
}
}
}
foreach (ident s in _procedure_header.template_args.idents)
{
ps.AddTemplateParameter(s.name);
TemplateParameterScope tps = new TemplateParameterScope(s.name, TypeTable.obj_type, ps);
TypeScope where_ts = null;
where_types.TryGetValue(s.name, out where_ts);
if (where_ts == null)
where_ts = TypeTable.obj_type;
TemplateParameterScope tps = new TemplateParameterScope(s.name, where_ts, ps);
tps.loc = get_location(s);
ps.AddName(s.name, tps);
}
@ -1393,10 +1410,28 @@ namespace CodeCompletion
SymScope tmp = cur_scope;
if (_function_header.template_args != null && !ps.IsGeneric())
{
Dictionary<string, TypeScope> where_types = new Dictionary<string, TypeScope>();
if (_function_header.where_defs != null)
{
foreach (where_definition wd in _function_header.where_defs.defs)
{
for (int i = 0; i < wd.names.idents.Count; i++)
{
string name = wd.names.idents[i].name;
wd.types.defs[i].visit(this);
where_types[name] = returned_scope as TypeScope;
}
}
}
foreach (ident s in _function_header.template_args.idents)
{
ps.AddTemplateParameter(s.name);
TemplateParameterScope tps = new TemplateParameterScope(s.name, TypeTable.obj_type, ps);
TypeScope where_ts = null;
where_types.TryGetValue(s.name, out where_ts);
if (where_ts == null)
where_ts = TypeTable.obj_type;
TemplateParameterScope tps = new TemplateParameterScope(s.name, where_ts, ps);
tps.loc = get_location(s);
ps.AddName(s.name, tps);
}

15
TestSuite/intellisense_tests/where1.pas Normal file
View file

@ -0,0 +1,15 @@
//ä
function Test<T>(a, b: T): integer; where T:System.IComparable<T>;
begin
var x: T;
x.CompareTo{@function IComparable<>.CompareTo(other: T): integer; virtual;@}(a);
end;
procedure Test2<T>(a, b: T); where T:System.IComparable<real>;
begin
var x: T;
x.CompareTo{@function IComparable<>.CompareTo(other: real): integer; virtual;@}(a);
end;
begin
end.