Fix test

alexarchambault · Nov 24, 2021 · b81f687 · b81f687
1 parent d1243d7
commit b81f687
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/core/shared/src/main/scala/caseapp/core/complete/Bash.scala b/core/shared/src/main/scala/caseapp/core/complete/Bash.scala
@@ -21,7 +21,7 @@ object Bash {
   }
 
   private def escape(s: String): String =
-    s.replace("\"", "\\\"").replace("`", "\\`").split("\\r?\\n").headOption.getOrElse("")
+    s.replace("\"", "\\\"").replace("`", "\\`").split("\r?\n").headOption.getOrElse("")
   def print(items: Seq[CompletionItem]): String = {
     val newLine     = System.lineSeparator()
     val b           = new StringBuilder

diff --git a/core/shared/src/main/scala/caseapp/core/complete/Zsh.scala b/core/shared/src/main/scala/caseapp/core/complete/Zsh.scala
@@ -36,7 +36,7 @@ object Zsh {
       res
   }
   private def escape(s: String): String =
-    s.replace("'", "\\'").replace("`", "\\`").split("\\r?\\n").headOption.getOrElse("")
+    s.replace("'", "\\'").replace("`", "\\`").split("\r?\n").headOption.getOrElse("")
   private def defs(item: CompletionItem): Seq[String] = {
     val (options, arguments) = item.values.partition(_.startsWith("-"))
     val optionsOutput =

diff --git a/tests/shared/src/test/scala/caseapp/CompletionDefinitions.scala b/tests/shared/src/test/scala/caseapp/CompletionDefinitions.scala
@@ -62,8 +62,7 @@ object CompletionDefinitions {
     case class BackTickOptions(
       @HelpMessage(
         """A pattern with backtick `--`
-          |with multiline
-          |""".stripMargin
+          |with multiline""".stripMargin
       ) backtick: String = "",
       @Name("d") count: Int = 0
     )

diff --git a/tests/shared/src/test/scala/caseapp/CompletionTests.scala b/tests/shared/src/test/scala/caseapp/CompletionTests.scala
@@ -145,7 +145,7 @@ object CompletionTests extends TestSuite {
       test("bash") {
         val res = Prog.complete(Seq("back-tick", "-"), 1)
         val expected = List(
-          CompletionItem("--backtick", Some("A pattern with backtick `--`"), Nil),
+          CompletionItem("--backtick", Some("A pattern with backtick `--`\nwith multiline"), Nil),
           CompletionItem("--count", None, List("-d"))
         )
         assert(res == expected)
@@ -158,7 +158,7 @@ object CompletionTests extends TestSuite {
       test("zsh") {
         val res = Prog.complete(Seq("back-tick", "-"), 1)
         val expected = List(
-          CompletionItem("--backtick", Some("A pattern with backtick `--`"), Nil),
+          CompletionItem("--backtick", Some("A pattern with backtick `--`\nwith multiline"), Nil),
           CompletionItem("--count", None, List("-d"))
         )
         assert(res == expected)