Fix indent when line contains multi-byte codepoint

Author: camsaul

cljfmt/src/cljfmt/core.cljc

@@ -191,11 +191,12 @@
         (recur p (cons (start-element (n/tag (z/node p))) worklist))
         (apply str worklist)))))
 
-(defn- last-line-in-string [^String s]
+(defn- last-line-in-string ^String [^String s]
   (subs s (inc (.lastIndexOf s "\n"))))
 
 (defn- margin [zloc]
-  (-> zloc prior-line-string last-line-in-string count))
+  (let [last-line (-> zloc prior-line-string last-line-in-string)]
+    (.codePointCount last-line 0 (.length last-line))))
 
 (defn- whitespace [width]
   (n/whitespace-node (apply str (repeat width " "))))

cljfmt/test/cljfmt/core_test.cljc

@@ -2009,3 +2009,20 @@
            ["(when 42  ;;;"
             "  :a)"]
            {:indent-line-comments? true})))))
+
+(deftest test-multibyte-codepoints
+  (is (reformats-to?
+       ["(defn- x"
+        "  [x style]"
+        "  (case style"
+        "    :normal x"
+        "    :𝕨𝕚𝕝𝕕   (if (sequential? x)"
+        "       :a"
+        "       :b)))"]
+       ["(defn- x"
+        "  [x style]"
+        "  (case style"
+        "    :normal x"
+        "    :𝕨𝕚𝕝𝕕   (if (sequential? x)"
+        "              :a"
+        "              :b)))"])))