diff --git a/Package.swift b/Package.swift
index 9b82e55a5..3ff2e0ce6 100644
--- a/Package.swift
+++ b/Package.swift
@@ -202,7 +202,7 @@ var dependencies: [Package.Dependency] {
     return [
       .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
       .package(url: "https://github.com/kkebo/swift-markdown.git", branch: "swift-markdown-wasm32-wasi-0.5"),
-      .package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),
+      .package(url: "https://github.com/rintaro/swift-syntax.git", branch: "wasi-nothread"),
     ]
   }
 }
diff --git a/Sources/SwiftFormat/PrettyPrint/PrettyPrintBuffer.swift b/Sources/SwiftFormat/PrettyPrint/PrettyPrintBuffer.swift
index 4b02d372e..9ea726206 100644
--- a/Sources/SwiftFormat/PrettyPrint/PrettyPrintBuffer.swift
+++ b/Sources/SwiftFormat/PrettyPrint/PrettyPrintBuffer.swift
@@ -119,18 +119,21 @@ struct PrettyPrintBuffer {
     consecutiveNewlineCount = 0
     pendingSpaces = 0
 
-    // In case of comments, we may get a multi-line string.
-    // To account for that case, we need to correct the lineNumber count.
-    // The new column is only the position within the last line.
-    let lines = text.split(separator: "\n")
-    lineNumber += lines.count - 1
-    if lines.count > 1 {
-      // in case we have inserted new lines, we need to reset the column
-      column = lines.last?.count ?? 0
+    // In case of comments, we may get a multi-line string. To account for that case, we need to correct the
+    // `lineNumber` count. The new `column` is the position within the last line.
+
+    var lastNewlineIndex: String.Index? = nil
+    for i in text.utf8.indices {
+      if text.utf8[i] == UInt8(ascii: "\n") {
+        lastNewlineIndex = i
+        lineNumber += 1
+      }
+    }
+
+    if let lastNewlineIndex {
+      column = text.distance(from: text.utf8.index(after: lastNewlineIndex), to: text.endIndex)
     } else {
-      // in case it is an end of line comment or a single line comment,
-      // we just add to the current column
-      column += lines.last?.count ?? 0
+      column += text.count
     }
   }
 
diff --git a/Sources/SwiftFormat/PrettyPrint/WhitespaceLinter.swift b/Sources/SwiftFormat/PrettyPrint/WhitespaceLinter.swift
index c5c5e2ae8..30f733952 100644
--- a/Sources/SwiftFormat/PrettyPrint/WhitespaceLinter.swift
+++ b/Sources/SwiftFormat/PrettyPrint/WhitespaceLinter.swift
@@ -339,9 +339,16 @@ public class WhitespaceLinter {
     startingAt offset: Int,
     in data: [UTF8.CodeUnit]
   ) -> ArraySlice<UTF8.CodeUnit> {
+    func isWhitespace(_ char: UTF8.CodeUnit) -> Bool {
+      switch char {
+      case UInt8(ascii: " "), UInt8(ascii: "\n"), UInt8(ascii: "\t"), UInt8(ascii: "\r"), /*VT*/ 0x0B, /*FF*/ 0x0C:
+        return true
+      default:
+        return false
+      }
+    }
     guard
-      let whitespaceEnd =
-        data[offset...].firstIndex(where: { !UnicodeScalar($0).properties.isWhitespace })
+      let whitespaceEnd = data[offset...].firstIndex(where: { !isWhitespace($0) })
     else {
       return data[offset..<data.endIndex]
     }
diff --git a/Tests/SwiftFormatTests/PrettyPrint/LineNumbersTests.swift b/Tests/SwiftFormatTests/PrettyPrint/LineNumbersTests.swift
index 1bb58f7ab..c377e7cad 100644
--- a/Tests/SwiftFormatTests/PrettyPrint/LineNumbersTests.swift
+++ b/Tests/SwiftFormatTests/PrettyPrint/LineNumbersTests.swift
@@ -81,4 +81,38 @@ final class LineNumbersTests: PrettyPrintTestCase {
       ]
     )
   }
+
+  func testCharacterVsCodepoint() {
+    let input =
+      """
+      let fo = 1  // 🤥
+
+      """
+
+    assertPrettyPrintEqual(
+      input: input,
+      expected: input,
+      linelength: 16,
+      whitespaceOnly: true,
+      findings: []
+    )
+  }
+
+  func testCharacterVsCodepointMultiline() {
+    let input =
+      #"""
+      /// This is a multiline
+      /// comment that is in 🤥
+      /// fact perfectly sized
+
+      """#
+
+    assertPrettyPrintEqual(
+      input: input,
+      expected: input,
+      linelength: 25,
+      whitespaceOnly: true,
+      findings: []
+    )
+  }
 }