Merge pull request #2626 from DougGregor/integer-literal-utils

Improvements to integer literal utilities used in SourceKit-LSP

Author: DougGregor

Sources/SwiftRefactor/IntegerLiteralUtilities.swift

@@ -31,6 +31,17 @@ extension IntegerLiteralExprSyntax {
       case .hex: return 16
       }
     }
+
+    /// The prefix that is used to express an integer literal with this
+    /// radix in Swift source code, e.g., "0x" for hexadecimal.
+    public var literalPrefix: String {
+      switch self {
+      case .binary: return "0b"
+      case .octal: return "0o"
+      case .hex: return "0x"
+      case .decimal: return ""
+      }
+    }
   }
 
   public var radix: Radix {
@@ -67,15 +78,8 @@ extension IntegerLiteralExprSyntax {
   /// ```
   public func split() -> (prefix: String, value: Substring) {
     let text = self.literal.text
-    switch self.radix {
-    case .binary:
-      return ("0b", text.dropFirst(2))
-    case .octal:
-      return ("0o", text.dropFirst(2))
-    case .decimal:
-      return ("", Substring(text))
-    case .hex:
-      return ("0x", text.dropFirst(2))
-    }
+    let radix = self.radix
+    let literalPrefix = radix.literalPrefix
+    return (literalPrefix, text.dropFirst(literalPrefix.count))
   }
 }