SONARJAVA-3049 Compute type for switch-expressions

SonarSource · Jul 16, 2020 · aada3ec · aada3ec
1 parent 213bb67
commit aada3ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JParser.java b/java-frontend/src/main/java/org/sonar/java/model/JParser.java
@@ -1771,9 +1771,7 @@ private List<CaseGroupTreeImpl> convertSwitchStatements(List list) {
 
   private ExpressionTree convertExpression(Expression node) {
     ExpressionTree t = createExpression(node);
-    if (!t.is(Tree.Kind.SWITCH_EXPRESSION)) {
-      ((AbstractTypedTree) t).typeBinding = node.resolveTypeBinding();
-    }
+    ((AbstractTypedTree) t).typeBinding = node.resolveTypeBinding();
     return t;
   }
 

diff --git a/java-frontend/src/main/java/org/sonar/java/model/statement/SwitchExpressionTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/statement/SwitchExpressionTreeImpl.java
@@ -27,8 +27,6 @@
 import java.util.Objects;
 import org.sonar.java.model.InternalSyntaxToken;
 import org.sonar.java.model.expression.AssessableExpressionTree;
-import org.sonar.java.resolve.Symbols;
-import org.sonar.plugins.java.api.semantic.Type;
 import org.sonar.plugins.java.api.tree.CaseGroupTree;
 import org.sonar.plugins.java.api.tree.ExpressionTree;
 import org.sonar.plugins.java.api.tree.SwitchExpressionTree;
@@ -57,11 +55,6 @@ public SwitchExpressionTreeImpl(InternalSyntaxToken switchKeyword, InternalSynta
     this.closeBraceToken = closeBraceToken;
   }
 
-  @Override
-  public Type symbolType() {
-    return Symbols.unknownType;
-  }
-
   @Override
   public Kind kind() {
     return Kind.SWITCH_EXPRESSION;

diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserSemanticTest.java b/java-frontend/src/test/java/org/sonar/java/model/JParserSemanticTest.java
@@ -72,7 +72,6 @@
 import org.sonar.plugins.java.api.tree.MethodTree;
 import org.sonar.plugins.java.api.tree.ParameterizedTypeTree;
 import org.sonar.plugins.java.api.tree.ReturnStatementTree;
-import org.sonar.plugins.java.api.tree.StatementTree;
 import org.sonar.plugins.java.api.tree.SwitchStatementTree;
 import org.sonar.plugins.java.api.tree.Tree;
 import org.sonar.plugins.java.api.tree.TryStatementTree;
@@ -479,14 +478,16 @@ void expression_super_method_reference() {
   void expression_switch() {
     {
       SwitchExpressionTreeImpl switchExpression = (SwitchExpressionTreeImpl) expression("switch (0) { default: yield 0; }");
+      assertThat(switchExpression.symbolType().isUnknown()).isFalse();
+
       YieldStatementTreeImpl statement = (YieldStatementTreeImpl) switchExpression.cases().get(0).body().get(0);
       assertThat(statement.yieldKeyword().text()).isEqualTo("yield");
       assertThat(statement.expression()).isNotNull();
     }
     {
       SwitchExpressionTreeImpl switchExpression = (SwitchExpressionTreeImpl) expression("switch (0) { default -> 0; case 0, 1 -> 0; }");
       assertThat(switchExpression).isInstanceOf(AbstractTypedTree.class);
-      assertThat(switchExpression.symbolType().isUnknown()).isTrue();
+      assertThat(switchExpression.symbolType().isUnknown()).isFalse();
 
       YieldStatementTreeImpl statement = (YieldStatementTreeImpl) switchExpression.cases().get(0).body().get(0);
       assertThat(statement.yieldKeyword()).as("implicit yield-statement").isNull();