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

Change SourcePosition definition + minor cleanup.

This commit is contained in:
Eugene Vigdorchik 2012-01-24 13:32:21 +04:00
parent aafa6a0740
commit 6d0c2c8d33
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/Project.scala
View File

@ -274,12 +274,14 @@ object Project extends Init[Scope] with ProjectExtra
} }
val comp = compiled(structure.settings, actual)(structure.delegates, structure.scopeLocal, display) val comp = compiled(structure.settings, actual)(structure.delegates, structure.scopeLocal, display)
val definedAt = comp get scoped map { c => val definedAt = comp get scoped map { c =>
if (c.settings exists (_.pos ne NoPosition)) { val posDefined = c.settings filter (_.pos ne NoPosition)
val header = if (c.settings forall (_.pos ne NoPosition)) "Defined at:" else "Some of the definition places:" if (posDefined.size > 0) {
val header = if (posDefined.size == c.settings.size) "Defined at:" else
"Some of the defining occurrences:"
def fmt(s: Setting[_]) = s.pos match { def fmt(s: Setting[_]) = s.pos match {
case SourceCoord(fileName, line) => fileName + ":" + line case SourceCoord(fileName, line) => fileName + ":" + line
} }
header + (c.settings filter (_.pos ne NoPosition) map fmt mkString ("\n\t", "\n\t", "\n")) header + (posDefined map fmt mkString ("\n\t", "\n\t", "\n"))
} else "" } else ""
} getOrElse "" } getOrElse ""

12
util/collection/Settings.scala
View File

@ -259,16 +259,8 @@ trait Init[Scope]
override def toString = "setting(" + key + ") at " + pos override def toString = "setting(" + key + ") at " + pos
} }
trait SourcePosition { sealed trait SourcePosition
def fileName: String case object NoPosition extends SourcePosition
def line: Int
}
case object NoPosition extends SourcePosition {
override def fileName = throw new UnsupportedOperationException("NoPosition")
override def line = throw new UnsupportedOperationException("NoPosition")
}
case class SourceCoord(fileName: String, line: Int) extends SourcePosition case class SourceCoord(fileName: String, line: Int) extends SourcePosition
// mainly for reducing generated class count // mainly for reducing generated class count