Fix CRLF line endings correctly when preparing text for insertion

Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme → Example/Example.xcodeproj/xcshareddata/xcschemes/iOSExample.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "ACFDF4AC27983BAA00059A1B"
-               BuildableName = "Example.app"
-               BlueprintName = "Example"
+               BuildableName = "iOSExample.app"
+               BlueprintName = "iOSExample"
                ReferencedContainer = "container:Example.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,8 +45,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "ACFDF4AC27983BAA00059A1B"
-            BuildableName = "Example.app"
-            BlueprintName = "Example"
+            BuildableName = "iOSExample.app"
+            BlueprintName = "iOSExample"
             ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -62,8 +62,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "ACFDF4AC27983BAA00059A1B"
-            BuildableName = "Example.app"
-            BlueprintName = "Example"
+            BuildableName = "iOSExample.app"
+            BlueprintName = "iOSExample"
             ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

Example/Languages/Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "Languages",
-    platforms: [.iOS(.v14)],
+    platforms: [.iOS(.v14), .macOS(.v11)],
     products: [
         .library(name: "RunestoneJavaScriptLanguage", targets: ["RunestoneJavaScriptLanguage"])
     ],

Example/MacExample/AppDelegate.swift

@@ -0,0 +1,12 @@
+import Cocoa
+
+@main
+final class AppDelegate: NSObject, NSApplicationDelegate {
+    func applicationDidFinishLaunching(_ aNotification: Notification) {}
+
+    func applicationWillTerminate(_ aNotification: Notification) {}
+
+    func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+        true
+    }
+}

Example/MacExample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "filename" : "ExampleProjectMac_16x16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "ExampleProjectMac_32x32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "ExampleProjectMac_128x128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "ExampleProjectMac_256x256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "ExampleProjectMac_512x512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Example/MacExample/MacExample.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+</dict>
+</plist>

Example/MacExample/MainViewController.swift

@@ -0,0 +1,87 @@
+import Cocoa
+import Runestone
+import RunestoneJavaScriptLanguage
+import RunestoneOneDarkTheme
+import RunestoneThemeCommon
+import RunestoneTomorrowNightTheme
+import RunestoneTomorrowTheme
+
+final class MainViewController: NSViewController {
+    private let theme: EditorTheme = OneDarkTheme()
+    private let textView: TextView = {
+        let this = TextView()
+        this.translatesAutoresizingMaskIntoConstraints = false
+        this.textContainerInset = NSEdgeInsets(top: 0, left: 5, bottom: 0, right: 5)
+        this.showLineNumbers = true
+        this.showTabs = true
+        this.showSpaces = true
+        this.showLineBreaks = true
+        this.showSoftLineBreaks = true
+        this.lineHeightMultiplier = 1.3
+        this.kern = 0.3
+        this.lineSelectionDisplayType = .line
+        this.gutterLeadingPadding = 4
+        this.gutterTrailingPadding = 4
+        this.isLineWrappingEnabled = true
+        this.indentStrategy = .space(length: 2)
+        this.characterPairs = [
+            BasicCharacterPair(leading: "(", trailing: ")"),
+            BasicCharacterPair(leading: "{", trailing: "}"),
+            BasicCharacterPair(leading: "[", trailing: "]"),
+            BasicCharacterPair(leading: "\"", trailing: "\""),
+            BasicCharacterPair(leading: "'", trailing: "'")
+        ]
+        return this
+    }()
+
+    override var acceptsFirstResponder: Bool {
+        true
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.appearance = NSAppearance(named: .vibrantDark)
+        setupTextView()
+        applyTheme(theme)
+        // swiftlint:disable line_length
+        let text = """
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam ante ex, imperdiet in placerat eu, commodo ac dui. Fusce tincidunt facilisis eros condimentum varius. Ut tellus est, luctus pulvinar rutrum ac, semper at eros. Vestibulum et molestie dui. Nulla sagittis ipsum a dolor consectetur, ut ultrices turpis egestas. Quisque eleifend feugiat massa eget egestas. Donec sed ipsum sed lectus sodales sagittis at sit amet ipsum. Ut facilisis, augue vitae feugiat auctor, lacus metus feugiat augue, quis dictum quam ipsum nec felis. Donec nec orci justo. Pellentesque in est eu dui semper pulvinar. Donec at porta augue, a facilisis magna.
+
+Etiam lacinia et erat et luctus. Phasellus sit amet semper nisi. In nec nulla sit amet est elementum consequat eget sed magna. Maecenas tincidunt augue nec diam egestas dapibus. Cras porta vulputate ex ac fringilla. Proin rhoncus turpis sed hendrerit laoreet. Duis faucibus leo non posuere vulputate. Cras blandit dolor nibh, sit amet luctus massa commodo eget. Praesent a tempus leo, vel pretium urna. Quisque et sollicitudin neque. Morbi pellentesque felis pretium lectus molestie egestas. Suspendisse efficitur odio ac metus vehicula, eget cursus elit fermentum. Nunc maximus lectus eu erat volutpat iaculis. In elementum, risus nec commodo sollicitudin, diam est lobortis justo, vitae consequat erat dolor eu tellus. Pellentesque varius diam at urna eleifend maximus.
+
+Sed sagittis lectus id turpis bibendum, nec iaculis libero malesuada. Etiam nec ipsum vel tellus vestibulum sollicitudin ac ac nunc. Mauris non est vel sapien condimentum feugiat vel ullamcorper arcu. Duis a ligula quis justo ultrices feugiat at vel urna. Praesent erat turpis, convallis a feugiat ac, dictum a justo. Suspendisse venenatis tincidunt massa, nec mollis diam pretium lacinia. Cras non erat ut mauris iaculis lacinia. Cras accumsan purus vitae metus semper, non commodo arcu ullamcorper. Pellentesque porttitor lobortis ipsum, porta accumsan enim viverra ut. Duis ut tortor eget libero vulputate porttitor. Nulla bibendum libero tellus, sed mattis turpis feugiat non.
+
+Nunc lacus augue, tempus eu metus non, venenatis blandit massa. Donec consectetur cursus nibh eget iaculis. Pellentesque vel sem non tellus elementum rhoncus tempus quis est. In in neque sed ligula fermentum faucibus egestas in mauris. Vivamus id nunc non enim iaculis venenatis at vitae orci. Cras nec lacus nec nulla cursus rutrum. Donec vitae dui eget tellus tincidunt pharetra pulvinar id lacus.
+
+Sed et metus imperdiet, viverra lectus at, convallis justo. Suspendisse quis massa sodales, blandit ante vitae, mattis diam. Suspendisse potenti. Sed non odio aliquet, viverra purus quis, rhoncus lectus. Integer dignissim scelerisque lectus ut sagittis. Nunc ac nunc elit. Donec ligula nunc, egestas sed purus sed, ultrices dignissim eros. Ut accumsan porta velit, nec condimentum eros pellentesque et. Nunc ut ante eu turpis consectetur euismod sit amet quis urna. Duis nibh elit, dapibus vitae luctus in, placerat a mauris. Curabitur tincidunt venenatis nisl vitae euismod. Sed tristique sapien purus, sit amet auctor urna sodales a.
+"""
+        // swiftlint:enable line_length
+        let state = TextViewState(text: text, theme: theme, language: .javaScript)
+        textView.setState(state)
+    }
+
+    override func viewDidAppear() {
+        super.viewDidAppear()
+        view.window?.backgroundColor = theme.backgroundColor
+    }
+}
+
+private extension MainViewController {
+    private func setupTextView() {
+        view.addSubview(textView)
+        NSLayoutConstraint.activate([
+            textView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            textView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            textView.topAnchor.constraint(equalTo: view.topAnchor),
+            textView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+    }
+
+    private func applyTheme(_ theme: EditorTheme) {
+        textView.theme = theme
+        textView.wantsLayer = true
+        textView.layer?.backgroundColor = theme.backgroundColor.cgColor
+        textView.insertionPointColor = theme.textColor
+        textView.selectionHighlightColor = theme.textColor.withAlphaComponent(0.2)
+    }
+}

Example/Themes/Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "Themes",
-    platforms: [.iOS(.v14)],
+    platforms: [.iOS(.v14), .macOS(.v11)],
     products: [
         .library(name: "RunestoneTomorrowTheme", targets: ["RunestoneTomorrowTheme"]),
         .library(name: "RunestoneTomorrowNightTheme", targets: ["RunestoneTomorrowNightTheme"]),

Example/Themes/Sources/RunestoneOneDarkTheme/OneDarkTheme.swift

@@ -1,55 +1,66 @@
+#if os(macOS)
+import AppKit
+#endif
 import Runestone
 import RunestoneThemeCommon
+#if os(iOS)
 import UIKit
+#endif
 
 public final class OneDarkTheme: EditorTheme {
-    public let backgroundColor = UIColor(namedInModule: "OneDarkBackground")
+    public let backgroundColor = MultiPlatformColor(namedInModule: "OneDarkBackground")
+    #if os(iOS)
     public let userInterfaceStyle: UIUserInterfaceStyle = .dark
+    #endif
 
-    public let font: UIFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
-    public let textColor = UIColor(namedInModule: "OneDarkForeground")
+    public let font: MultiPlatformFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
+    public let textColor = MultiPlatformColor(namedInModule: "OneDarkForeground")
 
-    public let gutterBackgroundColor = UIColor(namedInModule: "OneDarkCurrentLine")
-    public let gutterHairlineColor: UIColor = .opaqueSeparator
+    public let gutterBackgroundColor = MultiPlatformColor(namedInModule: "OneDarkCurrentLine")
+    #if os(iOS)
+    public let gutterHairlineColor: MultiPlatformColor = .opaqueSeparator
+    #else
+    public let gutterHairlineColor: MultiPlatformColor = .separatorColor
+    #endif
 
-    public let lineNumberColor = UIColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.5)
-    public let lineNumberFont: UIFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
+    public let lineNumberColor = MultiPlatformColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.5)
+    public let lineNumberFont: MultiPlatformFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
 
-    public let selectedLineBackgroundColor = UIColor(namedInModule: "OneDarkCurrentLine")
-    public let selectedLinesLineNumberColor = UIColor(namedInModule: "OneDarkForeground")
-    public let selectedLinesGutterBackgroundColor: UIColor = .clear
+    public let selectedLineBackgroundColor = MultiPlatformColor(namedInModule: "OneDarkCurrentLine")
+    public let selectedLinesLineNumberColor = MultiPlatformColor(namedInModule: "OneDarkForeground")
+    public let selectedLinesGutterBackgroundColor: MultiPlatformColor = .clear
 
-    public let invisibleCharactersColor = UIColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.7)
+    public let invisibleCharactersColor = MultiPlatformColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.7)
 
-    public let pageGuideHairlineColor = UIColor(namedInModule: "OneDarkForeground")
-    public let pageGuideBackgroundColor = UIColor(namedInModule: "OneDarkCurrentLine")
+    public let pageGuideHairlineColor = MultiPlatformColor(namedInModule: "OneDarkForeground")
+    public let pageGuideBackgroundColor = MultiPlatformColor(namedInModule: "OneDarkCurrentLine")
 
-    public let markedTextBackgroundColor = UIColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.1)
+    public let markedTextBackgroundColor = MultiPlatformColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.1)
     public let markedTextBackgroundCornerRadius: CGFloat = 4
 
     public init() {}
 
-    public func textColor(for rawHighlightName: String) -> UIColor? {
+    public func textColor(for rawHighlightName: String) -> MultiPlatformColor? {
         guard let highlightName = HighlightName(rawHighlightName) else {
             return nil
         }
         switch highlightName {
         case .comment:
-            return UIColor(namedInModule: "OneDarkComment")
+            return MultiPlatformColor(namedInModule: "OneDarkComment")
         case .operator, .punctuation:
-            return UIColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.75)
+            return MultiPlatformColor(namedInModule: "OneDarkForeground").withAlphaComponent(0.75)
         case .property:
-            return UIColor(namedInModule: "OneDarkAqua")
+            return MultiPlatformColor(namedInModule: "OneDarkAqua")
         case .function:
-            return UIColor(namedInModule: "OneDarkBlue")
+            return MultiPlatformColor(namedInModule: "OneDarkBlue")
         case .string:
-            return UIColor(namedInModule: "OneDarkGreen")
+            return MultiPlatformColor(namedInModule: "OneDarkGreen")
         case .number:
-            return UIColor(namedInModule: "OneDarkYellow")
+            return MultiPlatformColor(namedInModule: "OneDarkYellow")
         case .keyword:
-            return UIColor(namedInModule: "OneDarkPurple")
-        case .variableBuiltin:
-            return UIColor(namedInModule: "OneDarkRed")
+            return MultiPlatformColor(namedInModule: "OneDarkPurple")
+        case .variableBuiltin, .constantBuiltin:
+            return MultiPlatformColor(namedInModule: "OneDarkRed")
         }
     }
 
@@ -62,8 +73,16 @@ public final class OneDarkTheme: EditorTheme {
     }
 }
 
-private extension UIColor {
+#if os(iOS)
+public extension UIColor {
     convenience init(namedInModule name: String) {
         self.init(named: name, in: .module, compatibleWith: nil)!
     }
 }
+#else
+public extension NSColor {
+    convenience init(namedInModule name: String) {
+        self.init(named: name, bundle: .module)!
+    }
+}
+#endif

Example/Themes/Sources/RunestonePlainTextTheme/PlainTextTheme.swift

@@ -1,35 +1,42 @@
+#if os(macOS)
+import AppKit
+#endif
 import Runestone
 import RunestoneThemeCommon
+#if os(iOS)
 import UIKit
+#endif
 
 public final class PlainTextTheme: EditorTheme {
-    public let backgroundColor: UIColor = .white
+    public let backgroundColor: MultiPlatformColor = .white
+    #if os(iOS)
     public let userInterfaceStyle: UIUserInterfaceStyle = .light
+    #endif
 
-    public let font: UIFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
-    public let textColor: UIColor = .black
+    public let font: MultiPlatformFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
+    public let textColor: MultiPlatformColor = .black
 
-    public let gutterBackgroundColor: UIColor = .white
-    public let gutterHairlineColor: UIColor = .white
+    public let gutterBackgroundColor: MultiPlatformColor = .white
+    public let gutterHairlineColor: MultiPlatformColor = .white
 
-    public let lineNumberColor: UIColor = .black.withAlphaComponent(0.5)
-    public let lineNumberFont: UIFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
+    public let lineNumberColor: MultiPlatformColor = .black.withAlphaComponent(0.5)
+    public let lineNumberFont: MultiPlatformFont = .monospacedSystemFont(ofSize: 14, weight: .regular)
 
-    public let selectedLineBackgroundColor: UIColor = .black.withAlphaComponent(0.07)
-    public let selectedLinesLineNumberColor: UIColor = .black
-    public let selectedLinesGutterBackgroundColor: UIColor = .black.withAlphaComponent(0.07)
+    public let selectedLineBackgroundColor: MultiPlatformColor = .black.withAlphaComponent(0.07)
+    public let selectedLinesLineNumberColor: MultiPlatformColor = .black
+    public let selectedLinesGutterBackgroundColor: MultiPlatformColor = .black.withAlphaComponent(0.07)
 
-    public let invisibleCharactersColor: UIColor = .black.withAlphaComponent(0.5)
+    public let invisibleCharactersColor: MultiPlatformColor = .black.withAlphaComponent(0.5)
 
-    public let pageGuideHairlineColor: UIColor = .black.withAlphaComponent(0.1)
-    public let pageGuideBackgroundColor: UIColor = .black.withAlphaComponent(0.06)
+    public let pageGuideHairlineColor: MultiPlatformColor = .black.withAlphaComponent(0.1)
+    public let pageGuideBackgroundColor: MultiPlatformColor = .black.withAlphaComponent(0.06)
 
-    public let markedTextBackgroundColor: UIColor = .black.withAlphaComponent(0.1)
+    public let markedTextBackgroundColor: MultiPlatformColor = .black.withAlphaComponent(0.1)
     public let markedTextBackgroundCornerRadius: CGFloat = 4
 
     public init() {}
 
-    public func textColor(for rawHighlightName: String) -> UIColor? {
+    public func textColor(for rawHighlightName: String) -> MultiPlatformColor? {
         nil
     }