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

bug fix #770

Browse source
This commit is contained in:
Бондарев Иван 2018-04-15 14:08:53 +02:00
parent 3c0b0a84e8
commit 262658e371
2 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
CodeCompletion/FindReferences.cs
View file

@ -434,7 +434,7 @@ namespace CodeCompletion
{
if (with_body)
{
if (cur_scope != null && cur_scope.IsEqual(founded_scope))
if (cur_scope != null && (cur_scope.IsEqual(founded_scope) || founded_scope is IProcScope && (founded_scope as IProcScope).Realization != null && cur_scope.IsEqual((founded_scope as IProcScope).Realization)))
pos_list.Add(get_position(_procedure_header.name.meth_name));
}
else
@ -447,6 +447,7 @@ namespace CodeCompletion
if (_procedure_header.name.class_name != null)
{
sc = cur_scope.FindNameInAnyOrder(_procedure_header.name.class_name.name);
if (sc != null && sc.IsEqual(founded_scope))
pos_list.Add(get_position(_procedure_header.name.class_name));
}
@ -1573,6 +1574,42 @@ namespace CodeCompletion
{
_yield_node.ex.visit(this);
}
public override void visit(slice_expr _slice_expr)
{
_slice_expr.v.visit(this);
if (_slice_expr.from != null)
_slice_expr.from.visit(this);
if (_slice_expr.to != null)
_slice_expr.to.visit(this);
if (_slice_expr.step != null)
_slice_expr.step.visit(this);
}
public override void visit(slice_expr_question _slice_expr_question)
{
_slice_expr_question.v.visit(this);
if (_slice_expr_question.from != null)
_slice_expr_question.from.visit(this);
if (_slice_expr_question.to != null)
_slice_expr_question.to.visit(this);
if (_slice_expr_question.step != null)
_slice_expr_question.step.visit(this);
}
public override void visit(yield_sequence_node _yield_sequence_node)
{
_yield_sequence_node.ex.visit(this);
}
public override void visit(tuple_node _tuple_node)
{
_tuple_node.el.visit(this);
}
public override void visit(assign_var_tuple _assign_var_tuple)
{
for (int i = 0; i < _assign_var_tuple.idents.idents.Count; i++)
{
_assign_var_tuple.idents.idents[i].visit(this);
}
_assign_var_tuple.expr.visit(this);
}
public override void visit(modern_proc_type _modern_proc_type)
{
if (_modern_proc_type.aloneparam != null)

7
VisualPascalABCNET/IB/CodeCompletion/CodeCompletionProvider.cs
View file

@ -257,13 +257,6 @@ namespace VisualPascalABC
}
PascalABCCompiler.Parsers.Position p = fnd_scope.GetPosition();
bool need_add_def = !for_refact; // true
//if (for_refact)
//foreach (PascalABCCompiler.Parsers.Position pos in lst)
// if (p.file_name == pos.file_name && p.line == pos.line && p.column == pos.column && p.end_line == pos.end_line && p.end_column == pos.end_column)
// {
// need_add_def = false;
// break;
// }
if (p.file_name != null && need_add_def)
svs_lst.Add(new SymbolsViewerSymbol(new PascalABCCompiler.SourceLocation(p.file_name, p.line, p.column, p.end_line, p.end_column), ImagesProvider.GetPictureNum(fnd_scope.SymbolInfo)));
foreach (PascalABCCompiler.Parsers.Position pos in lst)