diff options
author | Vlad Ureche <vlad.ureche@epfl.ch> | 2014-07-15 23:07:01 +0300 |
---|---|---|
committer | Vlad Ureche <vlad.ureche@epfl.ch> | 2014-07-15 23:07:01 +0300 |
commit | 0f8b07a8d7deda602a41859a175b0b46bb113d51 (patch) | |
tree | 8d18c6286f70a7393d8e15d44cfc580156fedb9a /src | |
parent | 174cf45735cd5ca54223b2a353a92e472aeb2324 (diff) | |
parent | ec46a1fba7395714e65e0f6644b7ad429c985ec7 (diff) | |
download | scala-0f8b07a8d7deda602a41859a175b0b46bb113d51.tar.gz scala-0f8b07a8d7deda602a41859a175b0b46bb113d51.tar.bz2 scala-0f8b07a8d7deda602a41859a175b0b46bb113d51.zip |
Merge pull request #3883 from gourlaysama/wip/t8557
SI-8557 make scaladoc normalize paths of external jars.
Diffstat (limited to 'src')
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/Settings.scala | 2 | ||||
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/model/MemberLookup.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/Settings.scala b/src/scaladoc/scala/tools/nsc/doc/Settings.scala index 67529f4178..a8e1dee4a0 100644 --- a/src/scaladoc/scala/tools/nsc/doc/Settings.scala +++ b/src/scaladoc/scala/tools/nsc/doc/Settings.scala @@ -249,7 +249,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_)) val idx = s.indexOf("#") if (idx > 0) { val (first, last) = s.splitAt(idx) - Some(new File(first).getAbsolutePath -> appendIndex(last.substring(1))) + Some(new File(first).getCanonicalPath -> appendIndex(last.substring(1))) } else { error(s"Illegal -doc-external-doc option; expected a pair with '#' separator, found: '$s'") None diff --git a/src/scaladoc/scala/tools/nsc/doc/model/MemberLookup.scala b/src/scaladoc/scala/tools/nsc/doc/model/MemberLookup.scala index 339129bdbc..64eb1adbea 100644 --- a/src/scaladoc/scala/tools/nsc/doc/model/MemberLookup.scala +++ b/src/scaladoc/scala/tools/nsc/doc/model/MemberLookup.scala @@ -45,7 +45,7 @@ trait MemberLookup extends base.MemberLookupBase { sym.info.member(newTermName("package")) else sym Option(sym1.associatedFile) flatMap (_.underlyingSource) flatMap { src => - val path = src.path + val path = src.canonicalPath settings.extUrlMapping get path map { url => LinkToExternal(name, url + "#" + name) } |