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

fix #863

Browse source
This commit is contained in:
Бондарев Иван 2018-05-27 14:35:53 +02:00
parent 3617df8e19
commit 67344feb91
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -578,7 +578,18 @@ namespace CodeCompletion
}
public document doc;
public location get_location(SourceContext sc)
{
if (sc == null)
{
return null;
}
return new location(sc.begin_position.line_num, sc.begin_position.column_num,
sc.end_position.line_num, sc.end_position.column_num, doc);
}
public location get_location(syntax_tree_node tn)
{
if (tn.source_context==null)
@ -2021,7 +2032,7 @@ namespace CodeCompletion
SymScope tmp = cur_scope;
SymScope stmt_scope = new BlockScope(cur_scope);
cur_scope.AddName("$block_scope",stmt_scope);
stmt_scope.loc = get_location(_unit_module.initialization_part);
stmt_scope.loc = get_location(_unit_module.initialization_part.left_logical_bracket.source_context.Merge(_unit_module.initialization_part.right_logical_bracket.source_context));
cur_scope = stmt_scope;
_unit_module.initialization_part.visit(this);
cur_scope = tmp;
@ -2031,8 +2042,8 @@ namespace CodeCompletion
SymScope tmp = cur_scope;
SymScope stmt_scope = new BlockScope(cur_scope);
cur_scope.AddName("$block_scope",stmt_scope);
stmt_scope.loc = get_location(_unit_module.finalization_part);
cur_scope = stmt_scope;
stmt_scope.loc = get_location(_unit_module.finalization_part.left_logical_bracket.source_context.Merge(_unit_module.finalization_part.right_logical_bracket.source_context));
cur_scope = stmt_scope;
_unit_module.finalization_part.visit(this);
cur_scope = tmp;
}

2
CodeCompletion/SymTable.cs
View file

@ -478,7 +478,7 @@ namespace CodeCompletion
public void AddUsedUnit(SymScope unit)
{
if (this.si.name != "PABCSystem")
if (this.si.name != "PABCSystem" || unit is NamespaceScope)
used_units.Add(unit);
}