Fix conflicts after scaladoc rename

pikinier20 · pikinier20 · commit 72b0729bb671 · 2021-02-08T10:51:47.000+01:00
diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml
@@ -36,7 +36,7 @@ jobs:
           java-version: 11
 
       - name: Compile and test scala3doc-js
-        run: ./project/scripts/sbt scala3doc-js/test
+        run: ./project/scripts/sbt scaladoc-js/test
 
       - name: Compile and test
         run: ./project/scripts/sbt scaladoc/test
diff --git a/scaladoc-js/resources/scaladoc-searchbar.css b/scaladoc-js/resources/scaladoc-searchbar.css
@@ -40,7 +40,7 @@
     display: none;
 }
 
-#scala3doc-searchbar {
+#scaladoc-searchbar {
     position: fixed;
     top: 50px;
     right: 40px;
@@ -71,7 +71,7 @@
     overflow: auto;
 }
 
-.scala3doc-searchbar-result {
+.scaladoc-searchbar-result {
     background: white;
     line-height: 32px;
     padding-left: 10px;
@@ -82,7 +82,7 @@
     margin-top: 10px;
 }
 
-.scala3doc-searchbar-result[selected] {
+.scaladoc-searchbar-result[selected] {
     background-color: #d4edff;
 }
 
diff --git a/scaladoc-js/src/searchbar/SearchbarComponent.scala b/scaladoc-js/src/searchbar/SearchbarComponent.scala
@@ -107,7 +107,7 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]):
         else if e.keyCode == 38 then handleArrowUp()
         else if e.keyCode == 13 then handleEnter()
     })
-    element.id = "scala3doc-searchbar"
+    element.id = "scaladoc-searchbar"
     element.appendChild(input)
     element.appendChild(resultsDiv)
     element
diff --git a/scaladoc-js/test/dotty/dokka/MatchersTest.scala b/scaladoc-js/test/dotty/dokka/MatchersTest.scala
@@ -1,4 +1,4 @@
-package dotty.dokka
+package dotty.tools.scaladoc
 
 import org.junit.{Test, Assert}
 import org.junit.Assert._
diff --git a/scaladoc-js/test/dotty/dokka/QueryParserTest.scala b/scaladoc-js/test/dotty/dokka/QueryParserTest.scala
@@ -1,4 +1,4 @@
-package dotty.dokka
+package dotty.tools.scaladoc
 
 import org.junit.{Test, Assert}
 import org.junit.Assert._

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`display: none;`
`41`	`41`	`}`
`42`	`42`
`43`		`-#scala3doc-searchbar {`
	`43`	`+#scaladoc-searchbar {`
`44`	`44`	`position: fixed;`
`45`	`45`	`top: 50px;`
`46`	`46`	`right: 40px;`
`@@ -71,7 +71,7 @@`
`71`	`71`	`overflow: auto;`
`72`	`72`	`}`
`73`	`73`
`74`		`-.scala3doc-searchbar-result {`
	`74`	`+.scaladoc-searchbar-result {`
`75`	`75`	`background: white;`
`76`	`76`	`line-height: 32px;`
`77`	`77`	`padding-left: 10px;`
`@@ -82,7 +82,7 @@`
`82`	`82`	`margin-top: 10px;`
`83`	`83`	`}`
`84`	`84`
`85`		`-.scala3doc-searchbar-result[selected] {`
	`85`	`+.scaladoc-searchbar-result[selected] {`
`86`	`86`	`background-color: #d4edff;`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dotty.dokka`
	`1`	`+package dotty.tools.scaladoc`
`2`	`2`
`3`	`3`	`import org.junit.{Test, Assert}`
`4`	`4`	`import org.junit.Assert._`