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

Remove irregular files, including symbolic links, from git ls-files. #1559

Merged
merged 3 commits into from
Nov 23, 2019
Merged

Remove irregular files, including symbolic links, from git ls-files. #1559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c68700
Remove irregular files, including symbolic links, from `git ls-files`.
SamirTalwar Nov 22, 2019
6092dff
Actually delete the temporary directory after each GitOps test.
SamirTalwar Nov 22, 2019
629284a
Move the filtering of symbolic links to `GitOps#lsTree`.
SamirTalwar Nov 22, 2019
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
8 changes: 6 additions & 2 deletions scalafmt-cli/src/main/scala/org/scalafmt/cli/ScalafmtRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ trait ScalafmtRunner {
val files = options.fileFetchMode match {
case m @ (GitFiles | RecursiveSearch) =>
val fetchFiles: AbsoluteFile => Seq[AbsoluteFile] =
if (m == GitFiles) options.gitOps.lsTree(_)
else FileOps.listFiles(_)
if (m == GitFiles)
options.gitOps
.lsTree(_)
.filter(file => FileOps.isRegularFile(file.jfile))
SamirTalwar marked this conversation as resolved.
Show resolved Hide resolved
else
FileOps.listFiles(_)

options.files.flatMap {
case d if d.jfile.isDirectory => fetchFiles(d).filter(canFormat)
Expand Down
3 changes: 3 additions & 0 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/util/FileOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ object FileOps {
if (file.isAbsolute) file
else new File(workingDir, file.getPath)

def isRegularFile(file: File): Boolean =
Files.isRegularFile(file.toPath)

def listFiles(path: String): Vector[String] = {
listFiles(new File(path))
}
Expand Down