luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address Codacy issues

This commit is contained in:
Eugene Yokota 2016-05-07 15:46:22 -04:00
parent 772e5bc06c
commit 420679df10
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/scala/sbt/Defaults.scala
View File

@ -4,8 +4,7 @@
package sbt
import scala.concurrent.duration.{ FiniteDuration, Duration }
import sbt.internal.{ OldPlugin, Aggregation, LoadedBuild, BuildUtil, PluginDiscovery, APIMappings, BuildDependencies, GCUtil, TaskSequential }
import sbt.internal.ConsoleProject
import sbt.internal._
import sbt.internal.util.Attributed
import sbt.internal.util.Attributed.data
import Scope.{ fillTaskAxis, GlobalScope, ThisScope }

14
main/src/main/scala/sbt/internal/parser/SbtRefactorings.scala
View File

@ -9,8 +9,8 @@ private[sbt] object SbtRefactorings {
import sbt.internal.parser.SbtParser.{ END_OF_LINE, FAKE_FILE }
import sbt.internal.SessionSettings.{ SessionSetting, SbtConfigFile }
val EMPTY_STRING = ""
val REVERSE_ORDERING_INT = Ordering[Int].reverse
val emtpyString = ""
val reverseOrdeingInt = Ordering[Int].reverse
/**
* Refactoring a `.sbt` file so that the new settings are used instead of any existing settings.
@ -25,7 +25,7 @@ private[sbt] object SbtRefactorings {
val (file, lines) = configFile
val split = SbtParser(FAKE_FILE, lines)
val recordedCommands = recordCommands(commands, split)
val sortedRecordedCommands = recordedCommands.sortBy(_._1)(REVERSE_ORDERING_INT)
val sortedRecordedCommands = recordedCommands.sortBy(_._1)(reverseOrdeingInt)
val newContent = replaceFromBottomToTop(lines.mkString(END_OF_LINE), sortedRecordedCommands)
(file, newContent.lines.toList)
@ -61,11 +61,9 @@ private[sbt] object SbtRefactorings {
case (acc, (st, tree)) =>
val treeName = extractSettingName(tree)
if (name == treeName) {
val replacement = if (acc.isEmpty) {
command.mkString(END_OF_LINE)
} else {
EMPTY_STRING
}
val replacement =
if (acc.isEmpty) command.mkString(END_OF_LINE)
else emtpyString
(tree.pos.start, st, replacement) +: acc
} else {
acc