Skip to content

fix: define BEGIN_ATTRIBUTE constant to eliminate string duplication #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sonarqube-agent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: define BEGIN_ATTRIBUTE constant to eliminate string duplication #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions sonar-ruby-plugin/src/main/java/org/sonarsource/ruby/converter/RubyVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@

public class RubyVisitor {

private static final String BEGIN_ATTRIBUTE = "begin";
private static final String KEYWORD_ATTRIBUTE = "keyword";
private static final List<String> EXCEPTION_BLOCK_TYPES = asList("resbody", "rescue", "ensure");
private static final Map<String, Operator> BINARY_OPERATOR_MAP;
Expand Down Expand Up @@ -160,7 +161,7 @@ public Tree visitNode(AstNode node, List<?> children) {
case "arg", "optarg", "restarg", "kwarg", "kwoptarg", "kwrestarg", "blockarg", "procarg0", "shadowarg":
// note obj-c arguments are not supported https://github.com/whitequark/parser/blob/master/doc/AST_FORMAT.md#objective-c-arguments
return createParameterTree(node, children);
case "begin":
case BEGIN_ATTRIBUTE:
return createFromBeginNode(node, children);
case "kwbegin":
return createFromKwBeginNode(node, children);
Expand Down Expand Up @@ -592,7 +593,7 @@ private Tree createStringLiteralTree(AstNode node, List<?> children) {
if (RubyConverter.FILENAME.equals(value)) {
return createNativeTree(node, children);
}
TextRange begin = node.textRangeForAttribute("begin");
TextRange begin = node.textRangeForAttribute(BEGIN_ATTRIBUTE);
TextRange end = node.textRangeForAttribute("end");
TreeMetaData treeMetaData;
if (begin != null && end != null) {
Expand Down Expand Up @@ -649,7 +650,7 @@ private Tree createLogicalOperation(AstNode node, List<?> children, Operator ope
}

private Tree createFromBeginNode(AstNode node, List<?> children) {
Optional<Token> beginToken = lookForTokenByAttribute(node, "begin");
Optional<Token> beginToken = lookForTokenByAttribute(node, BEGIN_ATTRIBUTE);
Optional<Token> endToken = lookForTokenByAttribute(node, "end");
if (beginToken.isPresent() && endToken.isPresent() && children.size() == 1 && beginToken.get().text().equals("(")) {
return new ParenthesizedExpressionTreeImpl(metaData(node), ((Tree) children.get(0)), beginToken.get(), endToken.get());
Expand Down