Minor

Author: nikitabobko

.github/workflows/build.yml

@@ -18,6 +18,8 @@ jobs:
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
+        #
+        # Xcode version comparison: https://en.wikipedia.org/wiki/Xcode
         os: [macos-13, macos-14, macos-15]
     name: Build
     runs-on: ${{ matrix.os }}

Sources/Common/util/commonUtil.swift

@@ -30,6 +30,7 @@ public func errorT<T>(
         Coordinate: \(file):\(line):\(column) \(function)
         recursionDetectorDuringTermination: \(recursionDetectorDuringTermination.get())
         cli: \(isCli)
+        Monitor count: \(NSScreen.screens.count)
         Displays have separate spaces: \(NSScreen.screensHaveSeparateSpaces)
 
         Stacktrace:

build-debug.sh

@@ -3,8 +3,8 @@ cd "$(dirname "$0")"
 source ./script/setup.sh
 
 ./generate.sh --ignore-xcodeproj
-swift build ${swift_build_args[@]+"${swift_build_args[@]}"} # https://stackoverflow.com/questions/7577052/unbound-variable-error-in-bash-when-expanding-empty-array
-swift build ${swift_build_args[@]+"${swift_build_args[@]}"} --target AppBundleTests # swift build doesn't build test targets by default :(
+swift-build
+swift-build --target AppBundleTests # swift build doesn't build test targets by default :(
 
 rm -rf .debug && mkdir .debug
 cp -r .build/debug/aerospace .debug

build-release.sh

@@ -33,7 +33,7 @@ EOF
 configuration="Release"
 
 generate-git-hash
-swift build ${swift_build_args[@]+"${swift_build_args[@]}"} -c release --arch arm64 --arch x86_64 --product aerospace # CLI
+swift-build -c release --arch arm64 --arch x86_64 --product aerospace # CLI
 xcodebuild clean build \
     -scheme AeroSpace \
     -destination "generic/platform=macOS" \

script/setup.sh

@@ -33,13 +33,15 @@ if /bin/test -z "${NUKE_PATH:-}"; then
     export NUKE_PATH=1
 fi
 
-if test -z "${GITHUB_ACTIONS:-}"; then
-    export swift_build_args=()
-else
-    # Circumvent compiler crash https://github.com/swiftlang/swift/issues/76788
-    # For some reason, it happens only on GH Actions
-    export swift_build_args=(-Xswiftc -disable-round-trip-debug-types)
-fi
+swift-build() {
+    if test -z "${GITHUB_ACTIONS:-}"; then
+        swift build "$@"
+    else
+        # Circumvent compiler crash https://github.com/swiftlang/swift/issues/76788
+        # For some reason, it happens only on GH Actions
+        swift build -Xswiftc -disable-round-trip-debug-types "$@"
+    fi
+}
 
 xcodebuild() {
     # Mute stderr