summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/util/PathResolver.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-04-11 19:11:40 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-04-11 19:11:40 +0000
commit67b1041a8512a760749a6e3882113e5aee7ba321 (patch)
tree7ebde6995f12364fce7caad7e620e0acc276c33b /src/compiler/scala/tools/util/PathResolver.scala
parentad596fcfc77a931f9b91444acd0063dcbc9b25aa (diff)
downloadscala-67b1041a8512a760749a6e3882113e5aee7ba321.tar.gz
scala-67b1041a8512a760749a6e3882113e5aee7ba321.tar.bz2
scala-67b1041a8512a760749a6e3882113e5aee7ba321.zip
moved plugin folder back to 'misc/scala-devel/p...
moved plugin folder back to 'misc/scala-devel/plugins'. moved bash completion to scala-tool-support (see r21449). include continuations in compiler sbaz package. replaced some tabs by spaces. review by extempore.
Diffstat (limited to 'src/compiler/scala/tools/util/PathResolver.scala')
-rw-r--r--src/compiler/scala/tools/util/PathResolver.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala
index 716b0b43dc..d2cb5e74c0 100644
--- a/src/compiler/scala/tools/util/PathResolver.scala
+++ b/src/compiler/scala/tools/util/PathResolver.scala
@@ -119,9 +119,9 @@ object PathResolver {
case _ => ""
}
- def scalaExtDirs = Environment.scalaExtDirs
- def scalaPluginDirs = List("misc", "scala-devel", "plugins")
- def scalaPluginPath = join(scalaPluginDirs map (scalaHomeDir / _ path): _*)
+ def scalaExtDirs = Environment.scalaExtDirs
+
+ def scalaPluginPath = (scalaHomeDir / "misc" / "scala-devel" / "plugins").path
override def toString = """
|object Defaults {