Add SyntacticCategoryEditor

.github/scripts/tests.sh

@@ -16,6 +16,6 @@ export LC_CTYPE=en_US.UTF-8
 set -o pipefail && arch -"${ARCH}" xcodebuild  \
            -scheme CodeEditSourceEditor \
            -derivedDataPath ".build" \
-           -destination "platform=macos,arch=${ARCH}" \
+           -destination "platform=macOS,arch=${ARCH},name=My Mac" \
            -skipPackagePluginValidation \
            clean test | xcpretty

.github/workflows/CI-pull-request.yml

@@ -1,7 +1,7 @@
 name: CI - Pull Request
 on: 
   pull_request:
-    branches:
+    branches: 
       - 'main'
   workflow_dispatch:
 jobs:

.github/workflows/build-documentation.yml

@@ -14,13 +14,14 @@ jobs:
         run: |
           cd docs
           git init
+          git config http.postBuffer 524288000
           git add -A
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git commit -m 'deploy'
 
       - name: Force push to destination branch
-        uses: ad-m/github-push-action@v0.6.0
+        uses: ad-m/github-push-action@v0.8.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: docs

.github/workflows/swiftlint.yml

@@ -8,4 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: GitHub Action for SwiftLint with --strict
-        run: swiftlint --strict
+        run: swiftlint --reporter github-actions-logging --strict

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.pbxproj

@@ -7,7 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB30C392DAA1C28008058A7 /* IndentPicker.swift */; };
 		61621C612C74FB2200494A4A /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61621C602C74FB2200494A4A /* CodeEditSourceEditor */; };
+		61CE772F2D19BF7D00908C57 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */; };
+		61CE77322D19BFAA00908C57 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */; };
 		6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13652D2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift */; };
 		6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13652F2B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift */; };
 		6C1365322B8A7B94004A1D18 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365312B8A7B94004A1D18 /* ContentView.swift */; };
@@ -17,9 +20,13 @@
 		6C1365462B8A7F2D004A1D18 /* LanguagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */; };
 		6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365472B8A7FBF004A1D18 /* EditorTheme+Default.swift */; };
 		6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13654C2B8A821E004A1D18 /* NSColor+Hex.swift */; };
+		6C730A042E32CA2A00FE1F32 /* MockJumpToDefinitionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C730A032E32CA2A00FE1F32 /* MockJumpToDefinitionDelegate.swift */; };
+		6C8B564C2E3018CC00DC3F29 /* MockCompletionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C8B564B2E3018CC00DC3F29 /* MockCompletionDelegate.swift */; };
+		6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF31D4D2DB6A252006A77FD /* StatusBar.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		1CB30C392DAA1C28008058A7 /* IndentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndentPicker.swift; sourceTree = "<group>"; };
 		6C13652A2B8A7B94004A1D18 /* CodeEditSourceEditorExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CodeEditSourceEditorExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6C13652D2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditSourceEditorExampleApp.swift; sourceTree = "<group>"; };
 		6C13652F2B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditSourceEditorExampleDocument.swift; sourceTree = "<group>"; };
@@ -33,6 +40,9 @@
 		6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguagePicker.swift; sourceTree = "<group>"; };
 		6C1365472B8A7FBF004A1D18 /* EditorTheme+Default.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EditorTheme+Default.swift"; sourceTree = "<group>"; };
 		6C13654C2B8A821E004A1D18 /* NSColor+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSColor+Hex.swift"; sourceTree = "<group>"; };
+		6C730A032E32CA2A00FE1F32 /* MockJumpToDefinitionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockJumpToDefinitionDelegate.swift; sourceTree = "<group>"; };
+		6C8B564B2E3018CC00DC3F29 /* MockCompletionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCompletionDelegate.swift; sourceTree = "<group>"; };
+		6CF31D4D2DB6A252006A77FD /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -41,6 +51,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				61621C612C74FB2200494A4A /* CodeEditSourceEditor in Frameworks */,
+				61CE772F2D19BF7D00908C57 /* CodeEditSourceEditor in Frameworks */,
+				61CE77322D19BFAA00908C57 /* CodeEditSourceEditor in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -108,8 +120,12 @@
 		6C13654A2B8A7FD2004A1D18 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				6C8B564B2E3018CC00DC3F29 /* MockCompletionDelegate.swift */,
 				6C1365312B8A7B94004A1D18 /* ContentView.swift */,
+				6CF31D4D2DB6A252006A77FD /* StatusBar.swift */,
 				6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */,
+				1CB30C392DAA1C28008058A7 /* IndentPicker.swift */,
+				6C730A032E32CA2A00FE1F32 /* MockJumpToDefinitionDelegate.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -140,6 +156,8 @@
 			name = CodeEditSourceEditorExample;
 			packageProductDependencies = (
 				61621C602C74FB2200494A4A /* CodeEditSourceEditor */,
+				61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */,
+				61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */,
 			);
 			productName = CodeEditSourceEditorExample;
 			productReference = 6C13652A2B8A7B94004A1D18 /* CodeEditSourceEditorExample.app */;
@@ -197,11 +215,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6C730A042E32CA2A00FE1F32 /* MockJumpToDefinitionDelegate.swift in Sources */,
 				6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */,
 				6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */,
 				6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */,
+				6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */,
 				6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */,
 				6C1365442B8A7EED004A1D18 /* String+Lines.swift in Sources */,
+				6C8B564C2E3018CC00DC3F29 /* MockCompletionDelegate.swift in Sources */,
+				1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */,
 				6C1365322B8A7B94004A1D18 /* ContentView.swift in Sources */,
 				6C1365462B8A7F2D004A1D18 /* LanguagePicker.swift in Sources */,
 			);
@@ -412,6 +434,14 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = CodeEditSourceEditor;
 		};
+		61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CodeEditSourceEditor;
+		};
+		61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CodeEditSourceEditor;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 6C1365222B8A7B94004A1D18 /* Project object */;

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

@@ -1,58 +1,68 @@
 {
   "images" : [
     {
+      "size" : "16x16",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
+      "filename" : "CodeEditSourceEditor-Icon-16.png",
+      "scale" : "1x"
     },
     {
+      "size" : "16x16",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
+      "filename" : "CodeEditSourceEditor-Icon-32.png",
+      "scale" : "2x"
     },
     {
+      "size" : "32x32",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
+      "filename" : "CodeEditSourceEditor-Icon-32.png",
+      "scale" : "1x"
     },
     {
+      "size" : "32x32",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
+      "filename" : "CodeEditSourceEditor-Icon-64.png",
+      "scale" : "2x"
     },
     {
+      "size" : "128x128",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
+      "filename" : "CodeEditSourceEditor-Icon-128.png",
+      "scale" : "1x"
     },
     {
+      "size" : "128x128",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
+      "filename" : "CodeEditSourceEditor-Icon-256.png",
+      "scale" : "2x"
     },
     {
+      "size" : "256x256",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
+      "filename" : "CodeEditSourceEditor-Icon-256.png",
+      "scale" : "1x"
     },
     {
+      "size" : "256x256",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
+      "filename" : "CodeEditSourceEditor-Icon-512.png",
+      "scale" : "2x"
     },
     {
+      "size" : "512x512",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
+      "filename" : "CodeEditSourceEditor-Icon-512.png",
+      "scale" : "1x"
     },
     {
+      "size" : "512x512",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
+      "filename" : "CodeEditSourceEditor-Icon-1024.png",
+      "scale" : "2x"
     }
   ],
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/CodeEditSourceEditorExampleApp.swift

@@ -13,5 +13,6 @@ struct CodeEditSourceEditorExampleApp: App {
         DocumentGroup(newDocument: CodeEditSourceEditorExampleDocument()) { file in
             ContentView(document: file.$document, fileURL: file.fileURL)
         }
+        .windowToolbarStyle(.unifiedCompact)
     }
 }

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Documents/CodeEditSourceEditorExampleDocument.swift

@@ -8,10 +8,14 @@
 import SwiftUI
 import UniformTypeIdentifiers
 
-struct CodeEditSourceEditorExampleDocument: FileDocument {
-    var text: String
+struct CodeEditSourceEditorExampleDocument: FileDocument, @unchecked Sendable {
+    enum DocumentError: Error {
+        case failedToEncode
+    }
+
+    var text: NSTextStorage
 
-    init(text: String = "") {
+    init(text: NSTextStorage = NSTextStorage(string: "")) {
         self.text = text
     }
 
@@ -25,11 +29,31 @@ struct CodeEditSourceEditorExampleDocument: FileDocument {
         guard let data = configuration.file.regularFileContents else {
             throw CocoaError(.fileReadCorruptFile)
         }
-        text = String(decoding: data, as: UTF8.self)
+        var nsString: NSString?
+        NSString.stringEncoding(
+            for: data,
+            encodingOptions: [
+                // Fail if using lossy encoding.
+                .allowLossyKey: false,
+                // In a real app, you'll want to handle more than just this encoding scheme. Check out CodeEdit's
+                // implementation for a more involved solution.
+                .suggestedEncodingsKey: [NSUTF8StringEncoding],
+                .useOnlySuggestedEncodingsKey: true
+            ],
+            convertedString: &nsString,
+            usedLossyConversion: nil
+        )
+        if let nsString {
+            self.text = NSTextStorage(string: nsString as String)
+        } else {
+            fatalError("Failed to read file")
+        }
     }
 
     func fileWrapper(configuration: WriteConfiguration) throws -> FileWrapper {
-        let data = Data(text.utf8)
+        guard let data = (text.string as NSString?)?.data(using: NSUTF8StringEncoding) else {
+            throw DocumentError.failedToEncode
+        }
         return .init(regularFileWithContents: data)
     }
 }

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Extensions/EditorTheme+Default.swift

@@ -10,7 +10,7 @@ import AppKit
 import CodeEditSourceEditor
 
 extension EditorTheme {
-    static var standard: EditorTheme {
+    static var light: EditorTheme {
         EditorTheme(
             text: Attribute(color: NSColor(hex: "000000")),
             insertionPoint: NSColor(hex: "000000"),
@@ -25,9 +25,29 @@ extension EditorTheme {
             variables: Attribute(color: NSColor(hex: "0F68A0")),
             values: Attribute(color: NSColor(hex: "6C36A9")),
             numbers: Attribute(color: NSColor(hex: "1C00CF")),
-            strings: Attribute(color: NSColor(hex: "C41A16"), bold: true, italic: true),
+            strings: Attribute(color: NSColor(hex: "C41A16")),
             characters: Attribute(color: NSColor(hex: "1C00CF")),
-            comments: Attribute(color: NSColor(hex: "267507"), italic: true)
+            comments: Attribute(color: NSColor(hex: "267507"))
+        )
+    }
+    static var dark: EditorTheme {
+        EditorTheme(
+            text: Attribute(color: NSColor(hex: "FFFFFF")),
+            insertionPoint: NSColor(hex: "007AFF"),
+            invisibles: Attribute(color: NSColor(hex: "53606E")),
+            background: NSColor(hex: "292A30"),
+            lineHighlight: NSColor(hex: "2F3239"),
+            selection: NSColor(hex: "646F83"),
+            keywords: Attribute(color: NSColor(hex: "FF7AB2"), bold: true),
+            commands: Attribute(color: NSColor(hex: "78C2B3")),
+            types: Attribute(color: NSColor(hex: "6BDFFF")),
+            attributes: Attribute(color: NSColor(hex: "CC9768")),
+            variables: Attribute(color: NSColor(hex: "4EB0CC")),
+            values: Attribute(color: NSColor(hex: "B281EB")),
+            numbers: Attribute(color: NSColor(hex: "D9C97C")),
+            strings: Attribute(color: NSColor(hex: "FF8170")),
+            characters: Attribute(color: NSColor(hex: "D9C97C")),
+            comments: Attribute(color: NSColor(hex: "7F8C98"))
         )
     }
 }