Issue #13279: Support JDK 20 preview language features by nrmancuso · Pull Request #13291 · checkstyle/checkstyle

nrmancuso · 2023-06-22T05:09:41Z

Check Regression Reports

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/sevntu-check-regression_part_1-report/index.html - no diff

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/part4-report/index.html - no dif

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/part2-report/index.html - no diff

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/part3-report/index.html - no diff

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/part5-report/index.html - no diff

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/part6-report/index.html - no diff

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/part1-report/index.html - no diff

https://nrmancuso.github.io/reports/issue-13279/2023-07-20-T-17-39-42/sevntu-check-regression_part_2-report/index.html - no diff

ANTLR regression reports

https://nrmancuso.github.io/reports/issue-13279/2023-07-21-T-06-50-01/antlr-report/index.html

nrmancuso · 2023-07-21T13:31:36Z

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java

        if (forInitAST == null) {
-            if (!skipEnhancedForLoopVariable) {
+            final Deque<String> currentVariables = getCurrentVariables();
+            if (!skipEnhancedForLoopVariable && !currentVariables.isEmpty()) {


Had to guard Deque#pop to avoid NoSuchElementException.

nrmancuso · 2023-07-21T13:32:05Z

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java

     * @param paramDef a for-each clause variable
     */
    private void leaveForEach(DetailAST paramDef) {
-        final DetailAST paramName = paramDef.findFirstToken(TokenTypes.IDENT);


We were throwing a NPE here, so I fixed it in this PR.

nrmancuso · 2023-07-23T02:40:06Z

...l/tools/checkstyle/grammar/java20/ExpectedJava20RecordDecompositionEnhancedForLoopTricky.txt

+        |       |       |   |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [32:17]
+        |       |       |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [32:17]
+        |       |       |   |   |   |--MODIFIERS -> MODIFIERS [32:17]
+        |       |       |   |   |   |--TYPE -> TYPE [32:17]
+        |       |       |   |   |   |   `--IDENT -> Point [32:17]
+        |       |       |   |   |   |--LPAREN -> ( [32:22]
+        |       |       |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [32:23]
+        |       |       |   |   |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [32:23]
+        |       |       |   |   |   |   |   |--MODIFIERS -> MODIFIERS [32:23]
+        |       |       |   |   |   |   |   |   `--FINAL -> final [32:23]
+        |       |       |   |   |   |   |   |--TYPE -> TYPE [32:29]
+        |       |       |   |   |   |   |   |   `--IDENT -> var [32:29]
+        |       |       |   |   |   |   |   `--IDENT -> x [32:33]
+        |       |       |   |   |   |   |--COMMA -> , [32:34]
+        |       |       |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [32:36]
+        |       |       |   |   |   |       |--MODIFIERS -> MODIFIERS [32:36]
+        |       |       |   |   |   |       |   `--FINAL -> final [32:36]
+        |       |       |   |   |   |       |--TYPE -> TYPE [32:42]
+        |       |       |   |   |   |       |   `--IDENT -> var [32:42]
+        |       |       |   |   |   |       `--IDENT -> y [32:46]
+        |       |       |   |   |   `--RPAREN -> ) [32:47]
+        |       |       |   |   |--COLON -> : [32:49]
+        |       |       |   |   `--EXPR -> EXPR [32:51]
+        |       |       |   |       `--IDENT -> points1 [32:51]


Example of basic record component decomposition in enhanced for loop:

for (Point(final var x, final var y) : points1) { }

romani

good, only minors:

config/jsoref-spellchecker/whitelist.words

...awl/tools/checkstyle/grammar/java20/InputJava20RecordDecompositionEnhancedForLoopTricky.java

nrmancuso · 2023-07-23T14:17:06Z

Moving this back to draft, I want to double check some things at https://docs.oracle.com/javase/specs/jls/se20/preview/specs/patterns-switch-record-patterns-jls.html

Ok, I wanted to double check the switch grammar because it is not specified in the JEP (though they mention it has changed). Here it is from the JLS SE 20 preview:

...

SwitchLabel:
    case CaseConstant {, CaseConstant}
    case null [, default]
    case CasePattern
    default

CaseConstant:
    ConditionalExpression

CasePattern:
    Pattern [ Guard ]

Guard:
    when Expression

This is from the JLS SE 19 preview:

...
SwitchLabel:
    CaseOrDefaultLabel {: CaseOrDefaultLabel }

CaseOrDefaultLabel:
    case CaseElement {, CaseElement }
    default

CaseElement:
    CaseConstant
    Pattern [ Guard ]
    null
    default

CaseConstant:
    ConditionalExpression

Guard:
    when Expression

So, this was just a simplification/ clean up of the existing grammar. This does not really have any impact on us; our grammar kind of falls between the two and I am OK with this.

romani

ok to merge.

nrmancuso · 2023-07-29T17:58:03Z

@romani @rnveach ok, I have resolved my doubts, see conclusion of investigation at #13291 (comment)

nrmancuso self-assigned this Jun 22, 2023

nrmancuso marked this pull request as draft June 22, 2023 05:09

nrmancuso added the blocked label Jun 22, 2023

nrmancuso force-pushed the issue-13279 branch from 8103cdf to 3bb9f3e Compare June 22, 2023 05:11

nrmancuso force-pushed the issue-13279 branch 14 times, most recently from a10470b to a5972c3 Compare July 21, 2023 14:06

nrmancuso force-pushed the issue-13279 branch from a5972c3 to 7483fc9 Compare July 23, 2023 02:27

nrmancuso removed the blocked label Jul 23, 2023

nrmancuso marked this pull request as ready for review July 23, 2023 02:27

nrmancuso force-pushed the issue-13279 branch from 7483fc9 to ba073de Compare July 23, 2023 02:37

nrmancuso commented Jul 23, 2023

View reviewed changes

nrmancuso requested review from rnveach and romani July 23, 2023 02:41

nrmancuso assigned romani and unassigned nrmancuso Jul 23, 2023

romani requested changes Jul 23, 2023

View reviewed changes

config/jsoref-spellchecker/whitelist.words Outdated Show resolved Hide resolved

...awl/tools/checkstyle/grammar/java20/InputJava20RecordDecompositionEnhancedForLoopTricky.java Outdated Show resolved Hide resolved

romani assigned nrmancuso and unassigned romani Jul 23, 2023

nrmancuso force-pushed the issue-13279 branch 2 times, most recently from 545212a to 417e426 Compare July 23, 2023 13:58

nrmancuso mentioned this pull request Jul 23, 2023

Update grammar inputs for JDK20 #13418

Open

nrmancuso force-pushed the issue-13279 branch 2 times, most recently from 1b16d33 to bf0e0a9 Compare July 23, 2023 14:11

nrmancuso marked this pull request as draft July 23, 2023 14:17

romani approved these changes Jul 23, 2023

View reviewed changes

nrmancuso marked this pull request as ready for review July 29, 2023 17:57

Issue checkstyle#13279: Support JDK 20 preview language features

169c7d2

nrmancuso force-pushed the issue-13279 branch from bf0e0a9 to 169c7d2 Compare July 29, 2023 17:57

nrmancuso assigned rnveach and unassigned nrmancuso Jul 29, 2023

rnveach approved these changes Aug 1, 2023

View reviewed changes

rnveach assigned romani and unassigned rnveach Aug 1, 2023

romani merged commit 34e7d5c into checkstyle:master Aug 1, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Issue #13279: Support JDK 20 preview language features#13291

Issue #13279: Support JDK 20 preview language features#13291
romani merged 1 commit intocheckstyle:masterfrom
nrmancuso:issue-13279

nrmancuso commented Jun 22, 2023 •

edited

Loading

Uh oh!

nrmancuso Jul 21, 2023

Uh oh!

nrmancuso Jul 21, 2023

Uh oh!

nrmancuso Jul 23, 2023

Uh oh!

romani left a comment

Uh oh!

Uh oh!

Uh oh!

nrmancuso commented Jul 23, 2023 •

edited

Loading

Uh oh!

romani left a comment

Uh oh!

nrmancuso commented Jul 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

nrmancuso commented Jun 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Check Regression Reports

ANTLR regression reports

Uh oh!

nrmancuso Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

nrmancuso Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

nrmancuso Jul 23, 2023

Choose a reason for hiding this comment

Uh oh!

romani left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

nrmancuso commented Jul 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

romani left a comment

Choose a reason for hiding this comment

Uh oh!

nrmancuso commented Jul 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

nrmancuso commented Jun 22, 2023 •

edited

Loading

nrmancuso commented Jul 23, 2023 •

edited

Loading