Merge branch 'develop'

Lighter-swift · Sep 19, 2023 · 93830c2 · 93830c2
2 parents 93d883e + 7350642
commit 93830c2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/Plugins/Libraries/LighterCodeGenAST/Generation/GenLiterals.swift b/Plugins/Libraries/LighterCodeGenAST/Generation/GenLiterals.swift
@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2023 ZeeZide GmbH.
 //
 
 import Foundation
@@ -32,9 +32,13 @@ public extension CodeGenerator {
           assert(!pounds.isEmpty)
           // ##"Hello # "##
 
-          if value.contains("\n") { // meh
-            let indent =
-            String(repeating: configuration.indent, count: indentationLevel + 1)
+          if value.isMultilineASCIIString { // Meh
+            // We don't want CRs in beautiful Swift code.
+            let value = value.replacingOccurrences(of: "\r\n", with: "\n")
+            let indent = String(
+              repeating: configuration.indent,
+              count: indentationLevel + 1
+            )
             var s = "\n"
             s += "\(indent)\(pounds)\"\"\"\n"
             for line in value.split(separator: "\n",
@@ -52,6 +56,7 @@ public extension CodeGenerator {
         else { // complete me :-)
           let escaped = value
                 .replacingOccurrences(of: "\\", with: "\\\\")
+                .replacingOccurrences(of: "\r", with: "\\r")
                 .replacingOccurrences(of: "\n", with: "\\n")
                 .replacingOccurrences(of: "\t", with: "\\t")
                 .replacingOccurrences(of: "\"", with: "\\\"")
@@ -79,3 +84,19 @@ fileprivate let unsafeSwiftStringLiteralCharacters : CharacterSet = {
   safeCharacters.formUnion(.init(charactersIn: "_,;&'@#!$(){}+-*/:."))
   return safeCharacters.inverted
 }()
+
+extension String {
+
+  /// Returns true if the string is a multiline string, i.e. contains LF or CR.
+  /// Does *not* consider arbitrary newline Unicode characters.
+  var isMultilineASCIIString : Bool {
+    // Note: Don't do this: `self.contains("\n")` (Issue #23).
+    // If the String contains CR LF (`\r\n`, ASCII 13,10), this doesn't
+    // match! `\r\n` is turned into a Unicode composed character in the
+    // Swift String. Which interestingly has an `asciiValue`, 10 and returns
+    // `true` on `isASCII`.
+    // This does work: `self.contains(where: \.isNewline)`, but in here
+    // we really want just the ASCII codes for source.
+    self.utf8.contains(where: { $0 == 10 /* NL */ || $0 == 13 /* CR */ })
+  }
+}
diff --git a/Plugins/Libraries/LighterCodeGenAST/Nodes/TypeComment.swift b/Plugins/Libraries/LighterCodeGenAST/Nodes/TypeComment.swift
@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2023 ZeeZide GmbH.
 //
 
 /// A comment on top of e.g. a class or struct.
@@ -19,7 +19,7 @@ public struct TypeComment: Equatable {
     /// Initialize a new type example.
     public init(headline: String, code: String, language: String? = "swift") {
       self.headline = headline
-      self.code     = code
+      self.code     = code.replacingOccurrences(of: "\r\n", with: "\n")
       self.language = language
     }
   }

diff --git a/Tests/EntityGenTests/ASTRecordMatcherGenerationTests.swift b/Tests/EntityGenTests/ASTRecordMatcherGenerationTests.swift
@@ -105,7 +105,7 @@ final class ASTRecordMatcherGenerationTests: XCTestCase {
       builder.generateExtension(e)
       return builder.source
     }()
-    print("GOT:\n-----\n\(source)\n-----")
+    //print("GOT:\n-----\n\(source)\n-----")
 
     XCTAssertTrue(source.contains("func registerSwiftMatcher("))
     XCTAssertTrue(source.contains("func unregisterSwiftMatcher("))