all: port changes from swift-opus repo

Author: ydnar

.github/workflows/swift.yaml

@@ -5,51 +5,30 @@ on:
     branches:
       - main
     paths:
-      - ".github/workflows/swift.yaml"
       - "**.swift"
-      - "**/Package.resolved"
+      - "Package.resolved"
   pull_request:
     paths:
-      - ".github/workflows/swift.yaml"
       - "**.swift"
-      - "**/Package.resolved"
+      - "Package.resolved"
 
 jobs:
   format:
-    name: Check SwiftFormat
+    name: Format
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Install SwiftFormat
+      - name: Install swift-format
         uses: Cyberbeni/install-swift-tool@v2
         with:
-          url: https://github.com/nicklockwood/SwiftFormat
+          url: https://github.com/apple/swift-format
 
       - name: Format Swift code
-        run: swiftformat --verbose .
+        run: swift-format -r -i ./
 
       - name: Verify formatted code is unchanged
         run: git diff --exit-code HEAD -w -G'(^[^# /])|(^#\w)|(^\s+[^#/])' # Ignore whitespace and comments
-
-  test:
-    name: Test Swift packages
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
-    strategy:
-      matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Run tests
-        run: swift test --enable-test-discovery

.github/workflows/test.yaml

@@ -0,0 +1,34 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/test.yaml"
+      - ".gitmodules"
+      - "**.swift"
+      - "Package.resolved"
+  pull_request:
+    paths:
+      - ".github/workflows/test.yaml"
+      - ".gitmodules"
+      - "**.swift"
+      - "Package.resolved"
+
+jobs:
+  test:
+    name: Test
+    runs-on: macos-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Test
+        run: swift test
+
+      - name: Generate release build
+        run: swift build -c release

.swift-format

@@ -0,0 +1,13 @@
+{
+	"version": 1,
+	"lineLength": 2048,
+	"indentation": {
+		"tabs": 1
+	},
+	"tabWidth": 4,
+	"maximumBlankLines": 1,
+	"respectsExistingLineBreaks": true,
+	"lineBreakBeforeControlFlowKeywords": true,
+	"lineBreakBeforeEachArgument": false,
+	"prioritizeKeepingFunctionOutputTogether": true
+}

.swiftformat

@@ -1,10 +1,17 @@
 {
+	// List of extensions which should be recommended for users of this workspace.
+	// See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
 	"recommendations": [
+		"davidanson.vscode-markdownlint",
 		"eamodio.gitlens",
 		"eriklynd.json-tools",
 		"foxundermoon.shell-format",
+		"redhat.vscode-yaml",
 		"stkb.rewrap",
-		"vknabel.vscode-swiftformat",
+		"vknabel.vscode-apple-swift-format",
 		"xaver.clang-format",
-	]
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": []
 }

.vscode/extensions.json

@@ -1,33 +1,52 @@
 {
 	// Editor
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"editor.detectIndentation": false,
 	"editor.formatOnSave": true,
 	"editor.insertSpaces": false,
-	"editor.tabSize": 8,
+	"editor.tabSize": 4,
 	"files.eol": "\n",
 	//
 	// Files
 	"files.exclude": {
 		"**/.build": true,
 		"**/.git": true,
+		// "Sources/Copus": true,
 	},
+	"files.associations": {},
 	"files.insertFinalNewline": true,
 	"files.watcherExclude": {
 		"**/.git/objects/**": true,
 		"**/.git/subtree-cache/**": true,
 	},
 	"files.trimTrailingWhitespace": true,
 	//
+	// HTML
+	"html.format.contentUnformatted": "pre,code,textarea,script",
+	"html.format.unformatted": "pre,code,textarea,script,wbr",
+	//
+	// JSON
+	"[json]": {
+		"editor.defaultFormatter": "vscode.json-language-features",
+	},
+	"[jsonc]": {
+		"editor.defaultFormatter": "vscode.json-language-features",
+	},
+	//
+	// Make
+	"[makefile]": {
+		"editor.tabSize": 4
+	},
+	//
 	// Markdown
 	"[markdown]": {
 		"editor.rulers": [
 			80
 		],
 		"editor.codeActionsOnSave": {
-			"source.fixAll.markdownlint": true
+			"source.fixAll.markdownlint": "explicit"
 		}
 	},
 	"markdown.preview.breaks": true,
@@ -41,7 +60,7 @@
 	// Property Lists
 	"[plist]": {
 		"editor.formatOnSave": true,
-		"editor.tabSize": 8,
+		"editor.tabSize": 4,
 	},
 	//
 	// Shell
@@ -51,8 +70,9 @@
 	//
 	// Swift
 	"[swift]": {
+		"editor.detectIndentation": true,
 		"editor.insertSpaces": false,
-		"editor.tabSize": 8,
+		"editor.tabSize": 4,
 	},
 	//
 	// YAML
@@ -67,4 +87,15 @@
 			"strings": true
 		}
 	},
+	"[github-actions-workflow]": {
+		"editor.autoIndent": "keep",
+		"editor.detectIndentation": true,
+		"editor.insertSpaces": true,
+		"editor.tabSize": 2,
+		"editor.quickSuggestions": {
+			"other": true,
+			"comments": false,
+			"strings": true
+		}
+	}
 }