Change CaseBlock#patterns() to CaseBlock#pattern()

Author: andreaguarino

python-frontend/src/main/java/org/sonar/plugins/python/api/tree/BaseTreeVisitor.java

@@ -480,7 +480,7 @@ public void visitMatchStatement(MatchStatement matchStatement) {
 
   @Override
   public void visitCaseBlock(CaseBlock caseBlock) {
-    scan(caseBlock.patterns());
+    scan(caseBlock.pattern());
     scan(caseBlock.guard());
     scan(caseBlock.body());
   }

python-frontend/src/main/java/org/sonar/plugins/python/api/tree/CaseBlock.java

@@ -20,14 +20,13 @@
 package org.sonar.plugins.python.api.tree;
 
 
-import java.util.List;
 import javax.annotation.CheckForNull;
 
 /**
  * Case block
  *
  * <pre>
- *   {@link #caseKeyword()} {@link #patterns()} {@link #guard()}:
+ *   {@link #caseKeyword()} {@link #pattern()} {@link #guard()}:
  *     {@link #body()}
  * </pre>
  *
@@ -37,7 +36,7 @@ public interface CaseBlock extends Tree {
 
   Token caseKeyword();
 
-  List<Pattern> patterns();
+  Pattern pattern();
 
   @CheckForNull
   Guard guard();

python-frontend/src/main/java/org/sonar/python/api/PythonGrammar.java

@@ -154,7 +154,7 @@ public enum PythonGrammar implements GrammarRuleKey {
   CASE_BLOCK,
   GUARD,
 
-  PATTERNS,
+  PATTERN,
   LITERAL_PATTERN,
 
   SIGNED_NUMBER,
@@ -452,11 +452,11 @@ public static void compoundStatements(LexerfulGrammarBuilder b) {
 
     b.rule(MATCH_STMT).is("match", SUBJECT_EXPR, ":", NEWLINE, INDENT, b.oneOrMore(CASE_BLOCK), DEDENT);
     b.rule(SUBJECT_EXPR).is(STAR_NAMED_EXPRESSIONS);
-    b.rule(CASE_BLOCK).is("case", PATTERNS, b.optional(GUARD), ":", SUITE);
+    b.rule(CASE_BLOCK).is("case", PATTERN, b.optional(GUARD), ":", SUITE);
     b.rule(GUARD).is("if", NAMED_EXPR_TEST);
 
     // TODO: this should be either OR_PATTERN or AS_PATTERN
-    b.rule(PATTERNS).is(LITERAL_PATTERN);
+    b.rule(PATTERN).is(LITERAL_PATTERN);
 
     b.rule(LITERAL_PATTERN).is(b.firstOf(
       COMPLEX_NUMBER,

python-frontend/src/main/java/org/sonar/python/tree/CaseBlockImpl.java

@@ -19,8 +19,6 @@
  */
 package org.sonar.python.tree;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -37,7 +35,7 @@
 
 public class CaseBlockImpl extends PyTree implements CaseBlock {
   private final Token caseKeyword;
-  private final List<Pattern> patterns;
+  private final Pattern pattern;
   @Nullable
   private final Guard guard;
   private final Token colon;
@@ -49,11 +47,11 @@ public class CaseBlockImpl extends PyTree implements CaseBlock {
   @Nullable
   private final Token dedent;
 
-  public CaseBlockImpl(Token caseKeyword, List<Pattern> patterns, @Nullable Guard guard, Token colon, @Nullable Token newLine,
+  public CaseBlockImpl(Token caseKeyword, Pattern pattern, @Nullable Guard guard, Token colon, @Nullable Token newLine,
     @Nullable Token indent, StatementList body, @Nullable Token dedent) {
 
     this.caseKeyword = caseKeyword;
-    this.patterns = patterns;
+    this.pattern = pattern;
     this.guard = guard;
     this.colon = colon;
     this.newLine = newLine;
@@ -69,8 +67,8 @@ public Token caseKeyword() {
   }
 
   @Override
-  public List<Pattern> patterns() {
-    return patterns;
+  public Pattern pattern() {
+    return pattern;
   }
 
   @CheckForNull
@@ -96,8 +94,7 @@ public Kind getKind() {
 
   @Override
   List<Tree> computeChildren() {
-    return Stream.of(Collections.singletonList(caseKeyword), patterns, Arrays.asList(guard, colon, newLine, indent, body, dedent))
-      .flatMap(List::stream)
+    return Stream.of(caseKeyword, pattern, guard, colon, newLine, indent, body, dedent)
       .filter(Objects::nonNull)
       .collect(Collectors.toList());
   }

python-frontend/src/main/java/org/sonar/python/tree/PythonTreeMaker.java

@@ -804,7 +804,7 @@ public MatchStatement matchStatement(AstNode matchStmt) {
 
   public CaseBlock caseBlock(AstNode caseBlock) {
     Token caseKeyword = toPyToken(caseBlock.getTokens().get(0));
-    List<Pattern> patterns = patterns(caseBlock.getFirstChild(PythonGrammar.PATTERNS));
+    Pattern pattern = pattern(caseBlock.getFirstChild(PythonGrammar.PATTERN));
     Guard guard = null;
     AstNode guardNode = caseBlock.getFirstChild(PythonGrammar.GUARD);
     if (guardNode != null) {
@@ -813,7 +813,7 @@ public CaseBlock caseBlock(AstNode caseBlock) {
     Token colon = toPyToken(caseBlock.getFirstChild(PythonPunctuator.COLON).getToken());
     AstNode suite = caseBlock.getFirstChild(PythonGrammar.SUITE);
     StatementList body = getStatementListFromSuite(suite);
-    return new CaseBlockImpl(caseKeyword, patterns, guard, colon, suiteNewLine(suite), suiteIndent(suite), body, suiteDedent(suite));
+    return new CaseBlockImpl(caseKeyword, pattern, guard, colon, suiteNewLine(suite), suiteIndent(suite), body, suiteDedent(suite));
   }
 
   public Guard guard(AstNode guardNode) {
@@ -822,7 +822,7 @@ public Guard guard(AstNode guardNode) {
     return new GuardImpl(ifKeyword, condition);
   }
 
-  private static List<Pattern> patterns(AstNode pattern) {
+  private static Pattern pattern(AstNode pattern) {
     // TODO: consider OR Patterns and other kind of patterns
     AstNode literalPattern = pattern.getFirstChild(PythonGrammar.LITERAL_PATTERN);
     LiteralPattern.LiteralKind literalKind;
@@ -836,7 +836,7 @@ private static List<Pattern> patterns(AstNode pattern) {
       literalKind = LiteralPattern.LiteralKind.BOOLEAN;
     }
     List<Token> tokens = literalPattern.getTokens().stream().map(PythonTreeMaker::toPyToken).collect(Collectors.toList());
-    return Collections.singletonList(new LiteralPatternImpl(tokens, literalKind));
+    return new LiteralPatternImpl(tokens, literalKind);
   }
 
 

python-frontend/src/test/java/org/sonar/plugins/python/api/tree/BaseTreeVisitorTest.java

@@ -386,7 +386,7 @@ public void case_block() {
     FirstLastTokenVerifierVisitor visitor = spy(FirstLastTokenVerifierVisitor.class);
     caseBlock.accept(visitor);
 
-    verify(visitor).visitLiteralPattern(((LiteralPattern) caseBlock.patterns().get(0)));
+    verify(visitor).visitLiteralPattern(((LiteralPattern) caseBlock.pattern()));
     verify(visitor).visitGuard(caseBlock.guard());
     verify(visitor).visitStatementList(caseBlock.body());
   }

python-frontend/src/test/java/org/sonar/python/parser/compound/statements/CasePatternsTest.java

@@ -30,7 +30,7 @@ public class CasePatternsTest extends RuleTest {
 
   @Before
   public void init() {
-    setRootRule(PythonGrammar.PATTERNS);
+    setRootRule(PythonGrammar.PATTERN);
   }
 
   @Test

python-frontend/src/test/java/org/sonar/python/tree/PythonTreeMakerMatchStatementTest.java

@@ -51,13 +51,12 @@ public void match_statement() {
 
     CaseBlock caseBlock = matchStatement.caseBlocks().get(0);
     assertThat(caseBlock.caseKeyword().value()).isEqualTo("case");
-    assertThat(caseBlock.patterns()).hasSize(1);
     assertThat(caseBlock.guard()).isNull();
     assertThat(caseBlock.body().statements()).extracting(Tree::getKind).containsExactly(Tree.Kind.EXPRESSION_STMT);
     assertThat(caseBlock.children()).extracting(Tree::getKind)
       .containsExactly(Tree.Kind.TOKEN, Tree.Kind.LITERAL_PATTERN, Tree.Kind.TOKEN, Tree.Kind.STATEMENT_LIST);
 
-    Pattern pattern = caseBlock.patterns().get(0);
+    Pattern pattern = caseBlock.pattern();
     assertThat(pattern.getKind()).isEqualTo(Tree.Kind.LITERAL_PATTERN);
     LiteralPattern literalPattern = (LiteralPattern) pattern;
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.NUMBER);
@@ -113,37 +112,37 @@ public void case_block_with_guard() {
   public void literal_patterns() {
     setRootRule(PythonGrammar.CASE_BLOCK);
     CaseBlock caseBlock = parse("case \"foo\": ...", treeMaker::caseBlock);
-    LiteralPattern literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    LiteralPattern literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.STRING);
     assertThat(literalPattern.valueAsString()).isEqualTo("\"foo\"");
 
     caseBlock = parse("case \"foo\" \"bar\": ...", treeMaker::caseBlock);
-    literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.STRING);
     assertThat(literalPattern.valueAsString()).isEqualTo("\"foo\"\"bar\"");
 
     caseBlock = parse("case -42: ...", treeMaker::caseBlock);
-    literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.NUMBER);
     assertThat(literalPattern.valueAsString()).isEqualTo("-42");
 
     caseBlock = parse("case 3 + 5j: ...", treeMaker::caseBlock);
-    literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.NUMBER);
     assertThat(literalPattern.valueAsString()).isEqualTo("3+5j");
 
     caseBlock = parse("case None: ...", treeMaker::caseBlock);
-    literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.NONE);
     assertThat(literalPattern.valueAsString()).isEqualTo("None");
 
     caseBlock = parse("case True: ...", treeMaker::caseBlock);
-    literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.BOOLEAN);
     assertThat(literalPattern.valueAsString()).isEqualTo("True");
 
     caseBlock = parse("case False: ...", treeMaker::caseBlock);
-    literalPattern = (LiteralPattern) caseBlock.patterns().get(0);
+    literalPattern = (LiteralPattern) caseBlock.pattern();
     assertThat(literalPattern.literalKind()).isEqualTo(LiteralPattern.LiteralKind.BOOLEAN);
     assertThat(literalPattern.valueAsString()).isEqualTo("False");
   }