Skip to content

Commit e43d276

Browse files
committed
уточнил имя метода в Trees
1 parent c003986 commit e43d276

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/RewriteMethodParameterDiagnostic.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private Optional<Reference> isOverwrited(List<Reference> references) {
148148
}
149149

150150
private Optional<RuleNode> getRefContextInsideDefAssign(Reference defRef, Reference nextRef) {
151-
final var defNode = Trees.findNodeContainsPosition(documentContext.getAst(),
151+
final var defNode = Trees.findTerminalNodeContainsPosition(documentContext.getAst(),
152152
defRef.getSelectionRange().getStart());
153153
final var assignment = defNode
154154
.map(TerminalNode::getParent)
@@ -158,7 +158,7 @@ private Optional<RuleNode> getRefContextInsideDefAssign(Reference defRef, Refere
158158
.map(BSLParser.AssignmentContext.class::cast);
159159

160160
return assignment.flatMap(assignContext ->
161-
Trees.findNodeContainsPosition(assignContext, nextRef.getSelectionRange().getStart()))
161+
Trees.findTerminalNodeContainsPosition(assignContext, nextRef.getSelectionRange().getStart()))
162162
.map(TerminalNode::getParent);
163163
}
164164

src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/SelectionRangeProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public List<SelectionRange> getSelectionRange(DocumentContext documentContext, S
8686

8787
// Result must contains all elements from input
8888
return positions.stream()
89-
.map(position -> Trees.findNodeContainsPosition(ast, position))
89+
.map(position -> Trees.findTerminalNodeContainsPosition(ast, position))
9090
.map(terminalNode -> terminalNode.orElse(null))
9191
.map(SelectionRangeProvider::toSelectionRange)
9292
.collect(Collectors.toList());

src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public static boolean nodeContains(ParseTree t, ParseTree exclude, Integer... in
417417
* @param position - искомая позиция
418418
* @return терминальная нода на указанной позиции, если есть
419419
*/
420-
public static Optional<TerminalNode> findNodeContainsPosition(BSLParserRuleContext tree, Position position) {
420+
public static Optional<TerminalNode> findTerminalNodeContainsPosition(BSLParserRuleContext tree, Position position) {
421421

422422
if (tree.getTokens().isEmpty()) {
423423
return Optional.empty();
@@ -440,7 +440,7 @@ public static Optional<TerminalNode> findNodeContainsPosition(BSLParserRuleConte
440440
return Optional.of(terminalNode);
441441
}
442442
} else {
443-
Optional<TerminalNode> node = findNodeContainsPosition((BSLParserRuleContext) child, position);
443+
Optional<TerminalNode> node = findTerminalNodeContainsPosition((BSLParserRuleContext) child, position);
444444
if (node.isPresent()) {
445445
return node;
446446
}

0 commit comments

Comments
 (0)