-
Notifications
You must be signed in to change notification settings - Fork 191
test(organizeimports): add failing IO tests for inline comment behavior (issue #2267) #2324
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
Open
arnavsharma990
wants to merge
3
commits into
scalacenter:main
Choose a base branch
from
arnavsharma990:fix-organizeimports-comments
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.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
14 changes: 14 additions & 0 deletions
14
scalafix-tests/input/src/main/scala/test/organizeImports/InlineCommentMoves.scala
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,14 @@ | ||
| /* | ||
| rules = [OrganizeImports] | ||
| */ | ||
|
|
||
| package test.organizeImports | ||
|
|
||
| import z.Z // commentZ | ||
|
|
||
| import a.A | ||
|
|
||
| object InlineCommentMoves { | ||
| val keep = (null: AnyRef) | ||
| } | ||
|
|
||
14 changes: 14 additions & 0 deletions
14
scalafix-tests/input/src/main/scala/test/organizeImports/InlineCommentMultiple.scala
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,14 @@ | ||
| /* | ||
| rules = [OrganizeImports] | ||
| */ | ||
|
|
||
| package test.organizeImports | ||
|
|
||
| import b.B // bnote | ||
|
|
||
| import a.A // anote | ||
|
|
||
| object InlineCommentMultiple { | ||
| val keep = 1 | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: we can remove that if
bjaglin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
15 changes: 15 additions & 0 deletions
15
scalafix-tests/input/src/main/scala/test/organizeImports/InlineCommentRemoved.scala
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,15 @@ | ||
| /* | ||
| rules = [OrganizeImports] | ||
| OrganizeImports.removeUnused = true | ||
| */ | ||
|
|
||
| package test.organizeImports | ||
|
|
||
| import my.pkg.K // noteK | ||
|
|
||
| import other.P | ||
|
|
||
| object InlineCommentRemoved { | ||
| val keep: P = null.asInstanceOf[P] | ||
| } | ||
|
|
15 changes: 15 additions & 0 deletions
15
scalafix-tests/input/src/main/scala/test/organizeImports/StandaloneComment.scala
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,15 @@ | ||
| /* | ||
| rules = [OrganizeImports] | ||
| */ | ||
|
|
||
| package test.organizeImports | ||
|
|
||
| // This comment is ambiguous and not linked to a specific import | ||
| import y.Y | ||
| import x.X | ||
|
|
||
| object StandaloneComment { | ||
| val keep = new X | ||
| val alsoKeep = new Y | ||
| } | ||
|
|
9 changes: 9 additions & 0 deletions
9
scalafix-tests/output/src/main/scala/test/organizeImports/InlineCommentMoves.scala
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,9 @@ | ||
| package test.organizeImports | ||
|
|
||
| import a.A | ||
| import z.Z // commentZ | ||
|
|
||
| object InlineCommentMoves { | ||
| val keep = (null: AnyRef) | ||
| } | ||
|
|
10 changes: 10 additions & 0 deletions
10
scalafix-tests/output/src/main/scala/test/organizeImports/InlineCommentMultiple.scala
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,10 @@ | ||
| package test.organizeImports | ||
|
|
||
| import a.A // anote | ||
| import b.B // bnote | ||
| import c.C | ||
|
|
||
| object InlineCommentMultiple { | ||
| val keep = 1 | ||
| } | ||
|
|
8 changes: 8 additions & 0 deletions
8
scalafix-tests/output/src/main/scala/test/organizeImports/InlineCommentRemoved.scala
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,8 @@ | ||
| package test.organizeImports | ||
|
|
||
| import other.P | ||
|
|
||
| object InlineCommentRemoved { | ||
| val keep: P = null.asInstanceOf[P] | ||
| } | ||
|
|
11 changes: 11 additions & 0 deletions
11
scalafix-tests/output/src/main/scala/test/organizeImports/StandaloneComment.scala
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,11 @@ | ||
| package test.organizeImports | ||
|
|
||
| // This comment is ambiguous and not linked to a specific import | ||
| import x.X | ||
| import y.Y | ||
|
|
||
| object StandaloneComment { | ||
| val keep = new X | ||
| val alsoKeep = new Y | ||
| } | ||
|
|
32 changes: 32 additions & 0 deletions
32
scalafix-tests/shared/src/main/scala/test/organizeImports/InlineCommentFixtures.scala
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,32 @@ | ||
| package a { | ||
| class A | ||
| } | ||
|
|
||
| package b { | ||
| class B | ||
| } | ||
|
|
||
| package c { | ||
| class C | ||
| } | ||
|
|
||
| package z { | ||
| class Z | ||
| } | ||
|
|
||
| package my.pkg { | ||
| class K | ||
| } | ||
|
|
||
| package other { | ||
| class P | ||
| } | ||
|
|
||
| package x { | ||
| class X | ||
| } | ||
|
|
||
| package y { | ||
| class Y | ||
| } | ||
|
|
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.