Refactor

Author: kishikawakatsumi

Resources/parsers/50800/Package.resolved

@@ -1,14 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "stringwidth",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kishikawakatsumi/StringWidth.git",
-      "state" : {
-        "branch" : "main",
-        "revision" : "e4c8035546a046d3461a1621c5643a963f97bc20"
-      }
-    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",

Resources/parsers/50800/Package.swift

@@ -8,7 +8,6 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-syntax", from: "508.0.1"),
-    .package(url: "https://github.com/kishikawakatsumi/StringWidth.git", branch: "main"),
   ],
   targets: [
     .executableTarget(
@@ -17,7 +16,6 @@ let package = Package(
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftOperators", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "StringWidth", package: "StringWidth"),
       ],
       swiftSettings: [
         .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))

Resources/parsers/50800/Sources/parser/SyntaxParser.swift

@@ -18,7 +18,7 @@ struct SyntaxParser {
       locationConverter: SourceLocationConverter(file: "", tree: sourceFile),
       showMissingTokens: options.contains("showmissing")
     )
-    _ = visitor.visit(syntax)
+    _ = visitor.rewrite(syntax)
 
     let html = "\(visitor.list.joined())"
 

Resources/parsers/50800/Sources/parser/TokenVisitor.swift

@@ -1,6 +1,5 @@
 import Foundation
 import SwiftSyntax
-import StringWidth
 
 final class TokenVisitor: SyntaxRewriter {
   var list = [String]()
@@ -17,6 +16,10 @@ final class TokenVisitor: SyntaxRewriter {
     self.showMissingTokens = showMissingTokens
   }
 
+  func rewrite(_ node: Syntax) -> Syntax {
+    visit(node)
+  }
+
   override func visitPre(_ node: Syntax) {
     if let token = node.as(TokenSyntax.self), token.presence == .missing, !showMissingTokens {
       return
@@ -54,13 +57,13 @@ final class TokenVisitor: SyntaxRewriter {
 
     let graphemeStartColumn: Int
     if let prefix = String(locationConverter.sourceLines[startRow - 1].utf8.prefix(startColumn - 1)) {
-      graphemeStartColumn = stringWidth(prefix) + 1
+      graphemeStartColumn = prefix.utf16.count + 1
     } else {
       graphemeStartColumn = startColumn
     }
     let graphemeEndColumn: Int
     if let prefix = String(locationConverter.sourceLines[endRow - 1].utf8.prefix(endColumn - 1)) {
-      graphemeEndColumn = stringWidth(prefix) + 1
+      graphemeEndColumn = prefix.utf16.count + 1
     } else {
       graphemeEndColumn = endColumn
     }

Resources/parsers/50900/Package.resolved

@@ -1,14 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "stringwidth",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kishikawakatsumi/StringWidth.git",
-      "state" : {
-        "branch" : "main",
-        "revision" : "e4c8035546a046d3461a1621c5643a963f97bc20"
-      }
-    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",

Resources/parsers/50900/Package.swift

@@ -8,7 +8,6 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-syntax", branch: "release/5.9"),
-    .package(url: "https://github.com/kishikawakatsumi/StringWidth.git", branch: "main"),
   ],
   targets: [
     .executableTarget(
@@ -17,7 +16,6 @@ let package = Package(
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftOperators", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "StringWidth", package: "StringWidth"),
       ],
       swiftSettings: [
         .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))

Resources/parsers/50900/Sources/parser/SyntaxParser.swift

@@ -0,0 +1 @@
+../../../50800/Sources/parser/SyntaxParser.swift

Resources/parsers/50900/Sources/parser/SyntaxParser.swift

@@ -1,6 +1,5 @@
 import Foundation
 @_spi(RawSyntax) import SwiftSyntax
-import StringWidth
 
 final class TokenVisitor: SyntaxRewriter {
   var list = [String]()
@@ -47,13 +46,13 @@ final class TokenVisitor: SyntaxRewriter {
 
     let graphemeStartColumn: Int
     if let prefix = String(locationConverter.sourceLines[start.line - 1].utf8.prefix(start.column - 1)) {
-      graphemeStartColumn = stringWidth(prefix) + 1
+      graphemeStartColumn = prefix.utf16.count + 1
     } else {
       graphemeStartColumn = start.column
     }
     let graphemeEndColumn: Int
     if let prefix = String(locationConverter.sourceLines[end.line - 1].utf8.prefix(end.column - 1)) {
-      graphemeEndColumn = stringWidth(prefix) + 1
+      graphemeEndColumn = prefix.utf16.count + 1
     } else {
       graphemeEndColumn = end.column
     }

Resources/parsers/50900/Sources/parser/TokenVisitor.swift

@@ -0,0 +1 @@
+../../../50800/Sources/parser/SyntaxParser.swift