Skip to content

Commit 4f52b93

Browse files
committed
Fix FILE_PATH macro in source links
1 parent eb8773e commit 4f52b93

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ case class TemplateSourceLink(val urlTemplate: String) extends SourceLink:
2222
"\\{\\{ path \\}\\}".r -> pathString,
2323
"\\{\\{ line \\}\\}".r -> line.fold("")(_.toString),
2424
"\\{\\{ ext \\}\\}".r -> Some(
25-
pathString).filter(_.lastIndexOf(".") == -1).fold("")(p => p.substring(p.lastIndexOf("."))
25+
pathString).filter(_.lastIndexOf(".") != -1).fold("")(p => p.substring(p.lastIndexOf("."))
2626
),
2727
"\\{\\{ path_no_ext \\}\\}".r -> Some(
28-
pathString).filter(_.lastIndexOf(".") == -1).fold(pathString)(p => p.substring(0, p.lastIndexOf("."))
28+
pathString).filter(_.lastIndexOf(".") != -1).fold(pathString)(p => p.substring(0, p.lastIndexOf("."))
2929
),
3030
"\\{\\{ name \\}\\}".r -> memberName
3131
)

scaladoc/test/dotty/tools/scaladoc/source-links/SourceLinksTest.scala

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class SourceLinksTest:
121121
("project/Build.scala", 54, edit) -> "https://gitlab.com/lampepfl/dotty/-/edit/develop/project/Build.scala#L54",
122122
)
123123

124-
testLink(Seq("€{FILE_PATH}#€{FILE_LINE}"), Some("develop"))(
124+
testLink(Seq("€{FILE_PATH}.scala#€{FILE_LINE}"), Some("develop"))(
125125
"project/Build.scala" -> "/project/Build.scala#",
126126
("project/Build.scala", 54) -> "/project/Build.scala#54",
127127
("project/Build.scala", edit) -> "/project/Build.scala#",
@@ -135,6 +135,13 @@ class SourceLinksTest:
135135
("project/Build.scala", 54, edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
136136
)
137137

138+
testLink(Seq("https://github.com/scala/scala/blob/2.13.x€{FILE_PATH}.scala#L€{FILE_LINE}"), Some("develop"))(
139+
"project/Build.scala" -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
140+
("project/Build.scala", 54) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
141+
("project/Build.scala", edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L",
142+
("project/Build.scala", 54, edit) -> "https://github.com/scala/scala/blob/2.13.x/project/Build.scala#L54",
143+
)
144+
138145
@Test
139146
def testBasicPrefixedPaths =
140147
testLink(Seq("src=gitlab://lampepfl/dotty"), Some("develop"))(
@@ -148,7 +155,7 @@ class SourceLinksTest:
148155
@Test
149156
def prefixedPaths =
150157
testLink(Seq(
151-
"src/generated=€{FILE_PATH}#€{FILE_LINE}",
158+
"src/generated=€{FILE_PATH_EXT}#€{FILE_LINE}",
152159
"src=gitlab://lampepfl/dotty",
153160
"github://lampepfl/dotty"
154161
), Some("develop"))(

0 commit comments

Comments
 (0)