Use MurmurHash3 to count id in Zsh - avoid using java methods from Me…

…ssageDigest
alexarchambault · Nov 25, 2021 · 3e1229b · 3e1229b
1 parent 50aa34a
commit 3e1229b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 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
@@ -19,7 +19,7 @@ object Bash {
   }
 
   private def escape(s: String): String =
-    s.replace("\"", "\\\"").replace("`", "\\`").linesIterator.toStream.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
@@ -1,12 +1,7 @@
 package caseapp.core.complete
 
-import java.math.BigInteger
 import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
-
-import dataclass.data
-
-import scala.collection.mutable
+import scala.util.hashing.MurmurHash3
 
 object Zsh {
 
@@ -24,18 +19,14 @@ object Zsh {
        |}
        |""".stripMargin
 
-  private def md5(content: Iterator[String]): String = {
-    val md = MessageDigest.getInstance("MD5")
-    for (s <- content) md.update(s.getBytes(StandardCharsets.UTF_8))
-    val digest = md.digest()
-    val res    = new BigInteger(1, digest).toString(16)
-    if (res.length < 32)
-      ("0" * (32 - res.length)) + res
-    else
-      res
+  private def hash(content: Iterator[String]): String = {
+    val sb = new StringBuilder()
+    for (s <- content) sb.append(s.getBytes(StandardCharsets.UTF_8))
+
+    MurmurHash3.arrayHash(sb.result().getBytes).toString
   }
   private def escape(s: String): String =
-    s.replace("'", "\\'").replace("`", "\\`").linesIterator.toStream.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 =
@@ -59,7 +50,7 @@ object Zsh {
   private def render(commands: Seq[String]): String =
     if (commands.isEmpty) "_files" + System.lineSeparator()
     else {
-      val id = md5(commands.iterator)
+      val id = hash(commands.iterator)
       s"""local -a args$id
          |args$id=(
          |${commands.mkString(System.lineSeparator())}