Merge pull request #301 from SwiftFiddle/refactor

Refactor

Author: kishikawakatsumi

Resources/branch_main/Sources/parser/TokenVisitor.swift

@@ -146,20 +146,19 @@ final class TokenVisitor: SyntaxRewriter {
       .text
       .htmlEscaped()
       .substituteInvisibles()
-      .replacingOccurrences(of: " ", with: "␣")
-      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
+      .transformWhitespaces()
     current.token = Token(kind: "\(token.tokenKind)", leadingTrivia: "", trailingTrivia: "")
 
     token.leadingTrivia.forEach { (piece) in
       let trivia = processTriviaPiece(piece)
       list.append(trivia)
-      current.token?.leadingTrivia += replaceSymbols(text: trivia)
+      current.token?.leadingTrivia += trivia.transformWhitespaces()
     }
     processToken(token)
     token.trailingTrivia.forEach { (piece) in
       let trivia = processTriviaPiece(piece)
       list.append(trivia)
-      current.token?.trailingTrivia += replaceSymbols(text: trivia)
+      current.token?.trailingTrivia += trivia.transformWhitespaces()
     }
 
     return token
@@ -234,12 +233,6 @@ final class TokenVisitor: SyntaxRewriter {
     }
     return trivia
   }
-
-  private func replaceSymbols(text: String) -> String {
-    text
-      .replacingOccurrences(of: "&nbsp;", with: "␣")
-      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
-  }
 }
 
 private extension String {
@@ -269,4 +262,10 @@ private extension String {
       .replacingOccurrences(of: " ", with: "␣")
       .replacingOccurrences(of: "\n", with: "↲")
   }
+
+  func transformWhitespaces() -> String {
+    self
+      .replacingOccurrences(of: "&nbsp;", with: "␣")
+      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
+  }
 }

Resources/branch_release-5.9/Sources/parser/TokenVisitor.swift

@@ -146,20 +146,19 @@ final class TokenVisitor: SyntaxRewriter {
       .text
       .htmlEscaped()
       .substituteInvisibles()
-      .replacingOccurrences(of: " ", with: "␣")
-      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
+      .transformWhitespaces()
     current.token = Token(kind: "\(token.tokenKind)", leadingTrivia: "", trailingTrivia: "")
 
     token.leadingTrivia.forEach { (piece) in
       let trivia = processTriviaPiece(piece)
       list.append(trivia)
-      current.token?.leadingTrivia += replaceSymbols(text: trivia)
+      current.token?.leadingTrivia += trivia.transformWhitespaces()
     }
     processToken(token)
     token.trailingTrivia.forEach { (piece) in
       let trivia = processTriviaPiece(piece)
       list.append(trivia)
-      current.token?.trailingTrivia += replaceSymbols(text: trivia)
+      current.token?.trailingTrivia += trivia.transformWhitespaces()
     }
 
     return token
@@ -234,12 +233,6 @@ final class TokenVisitor: SyntaxRewriter {
     }
     return trivia
   }
-
-  private func replaceSymbols(text: String) -> String {
-    text
-      .replacingOccurrences(of: "&nbsp;", with: "␣")
-      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
-  }
 }
 
 private extension String {
@@ -269,4 +262,10 @@ private extension String {
       .replacingOccurrences(of: " ", with: "␣")
       .replacingOccurrences(of: "\n", with: "↲")
   }
+
+  func transformWhitespaces() -> String {
+    self
+      .replacingOccurrences(of: "&nbsp;", with: "␣")
+      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
+  }
 }

Sources/App/Controllers/TokenVisitor.swift

@@ -133,20 +133,19 @@ final class TokenVisitor: SyntaxRewriter {
       .text
       .htmlEscaped()
       .substituteInvisibles()
-      .replacingOccurrences(of: " ", with: "␣")
-      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
+      .transformWhitespaces()
     current.token = Token(kind: "\(token.tokenKind)", leadingTrivia: "", trailingTrivia: "")
 
     token.leadingTrivia.forEach { (piece) in
       let trivia = processTriviaPiece(piece)
       list.append(trivia)
-      current.token?.leadingTrivia += replaceSymbols(text: trivia)
+      current.token?.leadingTrivia += trivia.transformWhitespaces()
     }
     processToken(token)
     token.trailingTrivia.forEach { (piece) in
       let trivia = processTriviaPiece(piece)
       list.append(trivia)
-      current.token?.trailingTrivia += replaceSymbols(text: trivia)
+      current.token?.trailingTrivia += trivia.transformWhitespaces()
     }
 
     return token
@@ -221,12 +220,6 @@ final class TokenVisitor: SyntaxRewriter {
     }
     return trivia
   }
-
-  private func replaceSymbols(text: String) -> String {
-    text
-      .replacingOccurrences(of: "&nbsp;", with: "␣")
-      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
-  }
 }
 
 private extension String {
@@ -256,4 +249,10 @@ private extension String {
       .replacingOccurrences(of: " ", with: "␣")
       .replacingOccurrences(of: "\n", with: "↲")
   }
+
+  func transformWhitespaces() -> String {
+    self
+      .replacingOccurrences(of: "&nbsp;", with: "␣")
+      .replacingOccurrences(of: "<br/>", with: "↲<br/>")
+  }
 }