Minor performance improvement

Author: benzonico

java-squid/src/main/java/org/sonar/java/ast/visitors/SubscriptionVisitor.java

@@ -74,8 +74,8 @@ protected void scanTree(Tree tree) {
 
   private void visit(Tree tree) {
     boolean isSubscribed = isSubscribed(tree);
-    boolean isSyntaxToken = tree.is(Tree.Kind.TOKEN);
-    if (isSyntaxToken) {
+    boolean shouldVisitSyntaxToken = (visitToken || visitTrivia) && tree.is(Tree.Kind.TOKEN);
+    if (shouldVisitSyntaxToken) {
       SyntaxToken syntaxToken = (SyntaxToken) tree;
       if (visitToken) {
         visitToken(syntaxToken);
@@ -89,7 +89,7 @@ private void visit(Tree tree) {
       visitNode(tree);
     }
     visitChildren(tree);
-    if (!isSyntaxToken && isSubscribed) {
+    if (!shouldVisitSyntaxToken && isSubscribed) {
       leaveNode(tree);
     }
   }

java-squid/src/main/java/org/sonar/java/model/JavaTree.java

@@ -48,7 +48,6 @@
 import org.sonar.sslr.grammar.GrammarRuleKey;
 
 import javax.annotation.Nullable;
-
 import java.util.Collections;
 import java.util.Deque;
 import java.util.Iterator;
@@ -75,11 +74,10 @@ public int getLine() {
 
   @Override
   public final boolean is(Kind... kind) {
-    if (kind() != null) {
-      for (Kind kindIter : kind) {
-        if (kind() == kindIter) {
-          return true;
-        }
+    Kind treeKind = kind();
+    for (Kind kindIter : kind) {
+      if (treeKind == kindIter) {
+        return true;
       }
     }
     return false;

java-squid/src/main/java/org/sonar/java/se/checks/NullDereferenceCheck.java

@@ -95,7 +95,7 @@ private ProgramState checkMemberSelect(CheckerContext context, MemberSelectExpre
 
   @Override
   public ProgramState checkPostStatement(CheckerContext context, Tree syntaxNode) {
-    if (context.isNull(context.getState().peekValue()) && syntaxNode.is(Tree.Kind.SWITCH_STATEMENT)) {
+    if (syntaxNode.is(Tree.Kind.SWITCH_STATEMENT) && context.isNull(context.getState().peekValue())) {
       context.reportIssue(syntaxNode, this, "NullPointerException might be thrown as '" + SyntaxTreeNameFinder.getName(syntaxNode) + "' is nullable here");
       context.createSink();
       return context.getState();