Skip to content

Commit c8c5644

Browse files
authored
Merge pull request #93 from scala-steward/update/scalafmt-core-2.7.5
Update scalafmt-core to 2.7.5
2 parents df66d93 + e967eb7 commit c8c5644

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = "2.2.2"
1+
version = "2.7.5"
22
maxColumn = 120

src/main/scala/com/thoughtworks/sbtScalaJsMap/ScalaJsMap.scala

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ object ScalaJsMap extends AutoPlugin {
3939
val isLatestSourcePushed =
4040
settingKey[Boolean]("Determine if the latest source files have been pushed to the remote git repository.")
4141
val scalaJsMapToGithubScalacOptions = settingKey[Seq[String]](
42-
"The scalac options to create Scala.js source map to the corresponding Github URI if any.")
42+
"The scalac options to create Scala.js source map to the corresponding Github URI if any."
43+
)
4344

4445
}
4546

@@ -68,11 +69,12 @@ object ScalaJsMap extends AutoPlugin {
6869
scalaJsMapToGithubScalacOptions ++= {
6970
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
7071
val repository = repositoryBuilder.build()
71-
val head = try {
72-
repository.resolve(HEAD)
73-
} finally {
74-
repository.close()
75-
}
72+
val head =
73+
try {
74+
repository.resolve(HEAD)
75+
} finally {
76+
repository.close()
77+
}
7678
if (repositoryBuilder.getGitDir == null) {
7779
None
7880
} else {
@@ -91,39 +93,39 @@ object ScalaJsMap extends AutoPlugin {
9193
isLatestSourcePushed := {
9294
def isCi = sys.env.contains("CI")
9395
def isLatestSourcePushedFromWorkTree = {
94-
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
95-
if (repositoryBuilder.getGitDir == null) {
96-
false
97-
} else {
98-
val repository = repositoryBuilder.build()
99-
try {
100-
val git = new Git(repository)
96+
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
97+
if (repositoryBuilder.getGitDir == null) {
98+
false
99+
} else {
100+
val repository = repositoryBuilder.build()
101101
try {
102+
val git = new Git(repository)
103+
try {
102104
def isClean = git.status().call().isClean
103105
def unreachableOriginBranches = {
104-
val head = repository.resolve(HEAD)
105-
val revWalk = new RevWalk(repository)
106+
val head = repository.resolve(HEAD)
107+
val revWalk = new RevWalk(repository)
106108
try {
107-
RevWalkUtils
108-
.findBranchesReachableFrom(
109-
revWalk.lookupCommit(head),
110-
revWalk,
111-
repository.getRefDatabase.getRefsByPrefix(s"$R_REMOTES$DEFAULT_REMOTE_NAME/")
112-
)
113-
.isEmpty
114-
} finally {
115-
revWalk.close()
109+
RevWalkUtils
110+
.findBranchesReachableFrom(
111+
revWalk.lookupCommit(head),
112+
revWalk,
113+
repository.getRefDatabase.getRefsByPrefix(s"$R_REMOTES$DEFAULT_REMOTE_NAME/")
114+
)
115+
.isEmpty
116+
} finally {
117+
revWalk.close()
118+
}
116119
}
117-
}
118120
isClean && !unreachableOriginBranches
121+
} finally {
122+
git.close()
123+
}
119124
} finally {
120-
git.close()
125+
repository.close()
121126
}
122-
} finally {
123-
repository.close()
124127
}
125128
}
126-
}
127129
isCi || isLatestSourcePushedFromWorkTree
128130
},
129131
scalacOptions ++= {

0 commit comments

Comments
 (0)