Skip to content

Commit

Permalink
Update scalafmt-core to 3.4.2 (#130)
Browse files Browse the repository at this point in the history
* Update scalafmt-core to 3.4.2

* Reformat with scalafmt 3.4.2
  • Loading branch information
scala-steward authored Feb 7, 2022
1 parent 36a3404 commit 8cde623
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3.4.0
version=3.4.2
runner.dialect = scala213
preset = IntelliJ
maxColumn = 100
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/io/shiftleft/js2cpg/core/Config.scala
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ case class Config(
|\t- Typescript types: $withTsTypes
|\t- Ignored files regex: '$ignoredFilesRegex'
|\t- Ignored folders: ${ignoredFiles
.filter(f => new File(f.toString).isDirectory)
.map(f => s"${System.lineSeparator()}\t\t'${f.toString}'")
.mkString}
.filter(f => new File(f.toString).isDirectory)
.map(f => s"${System.lineSeparator()}\t\t'${f.toString}'")
.mkString}
|\t- Ignore minified files: $ignoreMinified
|\t- Ignore test files: $ignoreTests
|\t- Ignore private dependencies: $ignorePrivateDeps
|\t- Additional private dependencies: ${privateDeps
.map(f => s"${System.lineSeparator()}\t\t'$f'")
.mkString}
.map(f => s"${System.lineSeparator()}\t\t'$f'")
.mkString}
|\t- Include configuration files: $includeConfigs
|\t- Include HTML files: $includeHtml
|\t- Output file: '$outputFile'
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/io/shiftleft/js2cpg/core/Js2Cpg.scala
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class Js2Cpg {
List(head)
case _ =>
logger.info(s"Found the following sub-projects:${subProjects
.map(p => projectDir.relativize(p))
.mkString("\n\t- ", "\n\t- ", "")}")
.map(p => projectDir.relativize(p))
.mkString("\n\t- ", "\n\t- ", "")}")
projectDir.path +: subProjects.toList
}
}
Expand Down

0 comments on commit 8cde623

Please sign in to comment.