Skip to content
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.

Sign up for GitHub

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

Imports: improve blank line detection #4132

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Imports: improve blank line detection #4132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f072543
Test Imports with comment + blank + import
kitbellew Aug 2, 2024
88c478a
Imports: improve blank line detection
kitbellew Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/Imports.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,8 @@ object Imports extends RewriteFactory {
var hadLf = false
val slc = new ListBuffer[Token]
ctx.tokenTraverser.findAtOrBefore(ctx.getIndex(tok) - 1) {
case _: Token.AtEOL => if (hadLf) Some(true) else { hadLf = true; None }
case t: Token.AtEOL =>
if (hadLf || t.newlines > 1) Some(true) else { hadLf = true; None }
case t: Token.Comment if TokenOps.isSingleLineIfComment(t) =>
slc.prepend(t); hadLf = false; None
case _: Token.Whitespace => None
Expand Down
14 changes: 14 additions & 0 deletions scalafmt-tests/src/test/resources/rewrite/Imports.source
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,3 +973,17 @@ import j.collections as collections
>>>
import java as j
import j.collections as collections
<<< comment and blank before import
rewrite.imports.groups = [["qux"]]
===
package foo {
// c1

import bar.baz
}
>>>
package foo {
// c1

import bar.baz
}
Loading