-
Notifications
You must be signed in to change notification settings - Fork 486
Handle extra semicolons after import statements #6323
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.
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
Draft
saranshflip
wants to merge
8
commits into
openrewrite:main
Choose a base branch
from
saranshflip:feature
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+39
−5
Draft
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e778f0c
Handle extra semicolons after import statements
saranshflip c6f951b
Update comment
saranshflip 09d3d15
Apply suggestions from code review
timtebeek 44d445f
Merge branch 'main' into feature
timtebeek 497c251
Changes made in MyParserDebug file to use RewriteTest
saranshflip 21a4794
Expand and enable `ImportTest.semicolonAfterPackage`
timtebeek 3842e42
Delete MyParserDebug, as the same can be achieved in `ImportTest`
timtebeek 951ddca
Merge branch 'main' into feature
timtebeek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
rewrite-java/src/test/java/org/openrewrite/java/MyParserDebug.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package org.openrewrite.java; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.openrewrite.SourceFile; | ||
| import org.openrewrite.java.tree.J; | ||
| import org.openrewrite.tree.ParseError; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
timtebeek marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| import org.openrewrite.java.TreeVisitingPrinter; | ||
|
|
||
|
|
||
| class MyParserDebug { | ||
|
|
||
| @Test | ||
| void debugDirectly() { | ||
| JavaParser parser = JavaParser.fromJavaVersion().build(); | ||
|
|
||
| String sourceCode = """ | ||
| import java.util.*;; | ||
| import java.io.*; | ||
|
|
||
| public class Main { | ||
| public static void main(String[] args) {} | ||
| } | ||
| """; | ||
|
|
||
| List<SourceFile> sourceFiles = parser.parse(sourceCode) | ||
| .collect(Collectors.toList()); | ||
timtebeek marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| SourceFile result = sourceFiles.get(0); | ||
|
|
||
| // --- CHECK FOR PARSE ERROR --- | ||
| if (result instanceof ParseError) { | ||
| ParseError error = (ParseError) result; | ||
| System.err.println("\n\n========================================"); | ||
| System.err.println("CRITICAL: PARSER FAILED"); | ||
| System.err.println("The parser could not understand the code."); | ||
| System.err.println("Error Message: " + error.getText()); // This usually holds the source | ||
| System.err.println("To String: " + error.toString()); | ||
| System.err.println("========================================\n\n"); | ||
|
|
||
| // Test should fail if parsing fails | ||
| throw new RuntimeException("Parser failed: " + error.toString()); | ||
| } | ||
| else if (result instanceof J.CompilationUnit) { | ||
| // This part runs if parsing SUCCEEDS | ||
| J.CompilationUnit cu = (J.CompilationUnit) result; | ||
| var imports = cu.getImports(); | ||
|
|
||
| System.err.println("========================================"); | ||
| System.err.println("SUCCESS: Parser succeeded!"); | ||
| System.err.println("Number of imports: " + imports.size()); | ||
|
|
||
| if (imports.size() > 1) { | ||
| String prefix = imports.get(1).getPrefix().getWhitespace(); | ||
| System.err.println("Second import prefix hex: " + stringToHex(prefix)); | ||
| System.err.println("Second import prefix text: '" + prefix.replace("\n", "\\n").replace("\r", "\\r") + "'"); | ||
| } | ||
|
|
||
| String printedSource = cu.print(); | ||
| System.err.println("Original source length: " + sourceCode.length()); | ||
| System.err.println("Printed source length: " + printedSource.length()); | ||
| System.err.println("Sources match: " + sourceCode.equals(printedSource)); | ||
|
|
||
| System.err.println("LST Structure:"); | ||
| System.err.println(TreeVisitingPrinter.printTree((cu))); | ||
|
|
||
| System.err.println("========================================"); | ||
| } | ||
| } | ||
|
|
||
| private String stringToHex(String input) { | ||
| if (input == null) return "null"; | ||
| StringBuilder sb = new StringBuilder(); | ||
| for (char c : input.toCharArray()) { | ||
| sb.append(String.format("\\u%04x ", (int) c)); | ||
| } | ||
| return sb.toString(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.