diff --git a/.devcontainer/README.md b/.devcontainer/README.md index 97814d7c..0730fdae 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -1,6 +1,6 @@ -# XcodeBuildServer Dev Container +# sourcekit-bsp Dev Container -This Dev Container configuration allows you to develop XcodeBuildServer without needing an Xcode environment, while running code quality tools like SwiftLint and SwiftFormat. +This Dev Container configuration allows you to develop sourcekit-bsp without needing an Xcode environment, while running code quality tools like SwiftLint and SwiftFormat. ## Features @@ -31,7 +31,7 @@ swift build swift test # Run specific target -swift run XcodeBuildServerCLI +swift run sourcekit-bsp # Clean build swift package clean @@ -60,7 +60,7 @@ bsp-build # swift build + success message bsp-test # swift test --parallel # Debug -bsp-debug # BSP_DEBUG=1 swift run XcodeBuildServerCLI +bsp-debug # BSP_DEBUG=1 swift run sourcekit-bsp # Code quality lint # swiftlint && swiftformat --lint . @@ -76,7 +76,7 @@ format # swiftformat . && swiftlint --fix ```bash # Start debug mode -BSP_DEBUG=1 swift run XcodeBuildServerCLI +BSP_DEBUG=1 swift run sourcekit-bsp # Or use alias bsp-debug diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1a3fc21b..86fb0031 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "XcodeBuildServer Swift Development", + "name": "sourcekit-bsp Swift Development", "image": "swift:6.1-noble", "features": { "ghcr.io/devcontainers/features/common-utils:2": { diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index 8471b235..493fd9ee 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -1,13 +1,13 @@ #!/bin/bash -# XcodeBuildServer Dev Container Setup Script +# sourcekit-bsp Dev Container Setup Script SWIFTLINT_VERSION="0.60.0" SWIFTFORMAT_VERSION="0.57.2" set -e -echo "🚀 Setting up XcodeBuildServer development environment..." +echo "🚀 Setting up sourcekit-bsp development environment..." # Update package lists echo "📦 Updating package lists..." @@ -84,7 +84,7 @@ swift package resolve echo "🔧 Setting up aliases..." cat >> ~/.zshrc << 'EOF' -# XcodeBuildServer Development Aliases +# sourcekit-bsp Development Aliases alias swiftbuild='swift build' alias swifttest='swift test' alias swiftrun='swift run' @@ -97,7 +97,7 @@ alias lint='swiftlint && swiftformat --lint .' alias format='swiftformat . && swiftlint --fix' # BSP Development -alias bsp-debug='BSP_DEBUG=1 swift run XcodeBuildServerCLI' +alias bsp-debug='BSP_DEBUG=1 swift run sourcekit-bsp' alias bsp-build='swift build && echo "✅ Build complete!"' alias bsp-test='swift test --parallel' diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 9f95854b..d54135ce 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -43,7 +43,7 @@ body: id: version attributes: label: Version - description: What version of XcodeBuildServer are you running? + description: What version of sourcekit-bsp are you running? placeholder: ex. v1.0.0 validations: required: true diff --git a/.github/TROUBLESHOOTING.md b/.github/TROUBLESHOOTING.md index 7c286c47..ad784820 100644 --- a/.github/TROUBLESHOOTING.md +++ b/.github/TROUBLESHOOTING.md @@ -1,6 +1,6 @@ # GitHub Actions Troubleshooting Guide -This guide helps you resolve common issues with the GitHub Actions workflows in XcodeBuildServer. +This guide helps you resolve common issues with the GitHub Actions workflows in sourcekit-bsp. ## Common Issues and Solutions @@ -98,7 +98,7 @@ This guide helps you resolve common issues with the GitHub Actions workflows in uses: actions/upload-artifact@v4 with: name: xcode-build-server - path: .build/release/XcodeBuildServerCLI + path: .build/release/sourcekit-bsp ``` ### 6. Cache Issues diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 5dcf2b29..5994965f 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -1,6 +1,6 @@ # GitHub Actions Workflows -This directory contains all the GitHub Actions workflows for XcodeBuildServer. Each workflow serves a specific purpose in our CI/CD pipeline. +This directory contains all the GitHub Actions workflows for sourcekit-bsp. Each workflow serves a specific purpose in our CI/CD pipeline. ## Workflows Overview @@ -94,10 +94,10 @@ This directory contains all the GitHub Actions workflows for XcodeBuildServer. E The following badges are available for the README: ```markdown -[![CI](https://github.com/wang.lun/XcodeBuildServer/workflows/CI/badge.svg)](https://github.com/wang.lun/XcodeBuildServer/actions/workflows/ci.yml) -[![Release](https://github.com/wang.lun/XcodeBuildServer/workflows/Release/badge.svg)](https://github.com/wang.lun/XcodeBuildServer/actions/workflows/release.yml) -[![Code Quality](https://github.com/wang.lun/XcodeBuildServer/workflows/Code%20Quality/badge.svg)](https://github.com/wang.lun/XcodeBuildServer/actions/workflows/code-quality.yml) -[![Security](https://github.com/wang.lun/XcodeBuildServer/workflows/Security/badge.svg)](https://github.com/wang.lun/XcodeBuildServer/actions/workflows/security.yml) +[![CI](https://github.com/wang.lun/sourcekit-bsp/workflows/CI/badge.svg)](https://github.com/wang.lun/sourcekit-bsp/actions/workflows/ci.yml) +[![Release](https://github.com/wang.lun/sourcekit-bsp/workflows/Release/badge.svg)](https://github.com/wang.lun/sourcekit-bsp/actions/workflows/release.yml) +[![Code Quality](https://github.com/wang.lun/sourcekit-bsp/workflows/Code%20Quality/badge.svg)](https://github.com/wang.lun/sourcekit-bsp/actions/workflows/code-quality.yml) +[![Security](https://github.com/wang.lun/sourcekit-bsp/workflows/Security/badge.svg)](https://github.com/wang.lun/sourcekit-bsp/actions/workflows/security.yml) ``` ## Workflow Dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d64de9c8..ad43b23a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,28 +40,28 @@ jobs: - name: Create Release Archive run: | mkdir -p release - cp .build/apple/Products/Release/XcodeBuildServerCLI release/XcodeBuildServerCLI + cp .build/apple/Products/Release/sourcekit-bsp release/sourcekit-bsp cp .build/apple/Products/Release/XcodeProjectCLI release/XcodeProjectCLI - chmod +x release/XcodeBuildServerCLI + chmod +x release/sourcekit-bsp chmod +x release/XcodeProjectCLI # Create tar.gz - tar -czf xcode-build-server-macos-universal.tar.gz -C release XcodeBuildServerCLI XcodeProjectCLI + tar -czf sourcekit-bsp-macos-universal.tar.gz -C release sourcekit-bsp XcodeProjectCLI # Create zip - cd release && zip ../xcode-build-server-macos-universal.zip XcodeBuildServerCLI XcodeProjectCLI && cd .. + cd release && zip ../sourcekit-bsp-macos-universal.zip sourcekit-bsp XcodeProjectCLI && cd .. - name: Generate Checksums run: | - shasum -a 256 xcode-build-server-macos-universal.tar.gz > checksums.txt - shasum -a 256 xcode-build-server-macos-universal.zip >> checksums.txt + shasum -a 256 sourcekit-bsp-macos-universal.tar.gz > checksums.txt + shasum -a 256 sourcekit-bsp-macos-universal.zip >> checksums.txt - name: Create Release uses: softprops/action-gh-release@v1 with: files: | - xcode-build-server-macos-universal.tar.gz - xcode-build-server-macos-universal.zip + sourcekit-bsp-macos-universal.tar.gz + sourcekit-bsp-macos-universal.zip checksums.txt generate_release_notes: true prerelease: ${{ contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'rc') }} @@ -73,18 +73,18 @@ jobs: #### Homebrew (Recommended) ```bash # Coming soon - brew install XcodeBuildServerCLI + brew install sourcekit-bsp ``` #### Manual Installation 1. Download the appropriate archive for your platform - 2. Extract the binary: `tar -xzf xcode-build-server-macos-universal.tar.gz` - 3. Move to PATH: `mv XcodeBuildServerCLI /usr/local/bin/` - 4. Make executable: `chmod +x /usr/local/bin/XcodeBuildServerCLI` + 2. Extract the binary: `tar -xzf sourcekit-bsp-macos-universal.tar.gz` + 3. Move to PATH: `mv sourcekit-bsp /usr/local/bin/` + 4. Make executable: `chmod +x /usr/local/bin/sourcekit-bsp` ### Usage ```bash - XcodeBuildServerCLI --help + sourcekit-bsp --help ``` ### Checksums diff --git a/.vscode/launch.json b/.vscode/launch.json index 05886ff2..a98208cc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,40 +4,40 @@ { "type": "lldb", "request": "launch", - "name": "Build Debug XcodeBuildServerCLI", - "program": "${workspaceFolder}/.build/debug/XcodeBuildServerCLI", - "preLaunchTask": "swift: Build Debug XcodeBuildServerCLI" + "name": "Build Debug sourcekit-bsp", + "program": "${workspaceFolder}/.build/debug/sourcekit-bsp", + "preLaunchTask": "swift: Build Debug sourcekit-bsp" }, { "type": "lldb", "request": "attach", "waitFor": true, - "name": "Wait and attach XcodeBuildServerCLI", - "program": "${workspaceFolder}/.build/debug/XcodeBuildServerCLI" + "name": "Wait and attach sourcekit-bsp", + "program": "${workspaceFolder}/.build/debug/sourcekit-bsp" }, { "type": "swift", "request": "launch", "args": [], "cwd": "${workspaceFolder}", - "name": "Release XcodeBuildServerCLI", - "program": "${workspaceFolder}/.build/release/XcodeBuildServerCLI", - "preLaunchTask": "swift: Build Release XcodeBuildServerCLI" + "name": "Release sourcekit-bsp", + "program": "${workspaceFolder}/.build/release/sourcekit-bsp", + "preLaunchTask": "swift: Build Release sourcekit-bsp" }, { "type": "swift", "request": "launch", "args": [], "cwd": "${workspaceFolder}", - "name": "Debug XcodeBuildServerCLI", - "program": "${workspaceFolder}/.build/debug/XcodeBuildServerCLI", - "preLaunchTask": "swift: Build Debug XcodeBuildServerCLI" + "name": "Debug sourcekit-bsp", + "program": "${workspaceFolder}/.build/debug/sourcekit-bsp", + "preLaunchTask": "swift: Build Debug sourcekit-bsp" }, { "type": "lldb", "request": "attach", - "name": "Attach to XcodeBuildServerCLI", - "program": "${workspaceFolder}/.build/debug/XcodeBuildServerCLI", + "name": "Attach to sourcekit-bsp", + "program": "${workspaceFolder}/.build/debug/sourcekit-bsp", "waitFor": true, "preLaunchTask": "" }, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 10d4c76d..1779405d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,7 +2,7 @@ "version": "2.0.0", "tasks": [ { - "label": "swift: Build Debug XcodeBuildServerCLI", + "label": "swift: Build Debug sourcekit-bsp", "type": "shell", "command": "swift build -c debug", "group": { diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38fea19d..d4ddc190 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to XcodeBuildServer +# Contributing to sourcekit-bsp -Thank you for your interest in contributing to XcodeBuildServer! This document provides guidelines and information for contributors. +Thank you for your interest in contributing to sourcekit-bsp! This document provides guidelines and information for contributors. ## Code of Conduct @@ -38,8 +38,8 @@ This project adheres to a [Code of Conduct](CODE_OF_CONDUCT.md). By participatin 1. **Fork and clone** the repository: ```bash - git clone https://github.com/yourusername/XcodeBuildServer.git - cd XcodeBuildServer + git clone https://github.com/yourusername/sourcekit-bsp.git + cd sourcekit-bsp ``` 2. **Install dependencies**: @@ -257,4 +257,4 @@ Contributors are recognized in: - Release notes - GitHub contributors page -Thank you for contributing to XcodeBuildServer! \ No newline at end of file +Thank you for contributing to sourcekit-bsp! \ No newline at end of file diff --git a/Docs/BSP-Implementation-Guide.md b/Docs/BSP-Implementation-Guide.md index 6a66e28d..3a6601ce 100644 --- a/Docs/BSP-Implementation-Guide.md +++ b/Docs/BSP-Implementation-Guide.md @@ -1,4 +1,4 @@ -# BSP服务器实现指南 - XcodeBuildServer +# BSP服务器实现指南 - sourcekit-bsp 基于 [SourceKit-LSP官方BSP服务器实现指南](https://github.com/swiftlang/sourcekit-lsp/blob/56a91e90212400f20bb9d3f2e563ea8cda7634f6/Contributor%20Documentation/Implementing%20a%20BSP%20server.md) 的完整实现文档。 @@ -15,7 +15,7 @@ SourceKit-LSP可以通过[Build Server Protocol (BSP)](https://build-server-prot - **必需响应字段**： ```json { - "displayName": "XcodeBuildServer", + "displayName": "sourcekit-bsp", "version": "1.0.0", "bspVersion": "2.2.0", "capabilities": { @@ -248,7 +248,7 @@ public struct Result: Codable, Hashable, Sendable { - **用途**：处理SourceKit-LSP发送的用户消息 - **实现状态**：✅ 已实现 -## XcodeBuildServer特有实现 +## sourcekit-bsp特有实现 ### 项目发现和解析 ```swift @@ -286,11 +286,11 @@ let toolchainURI = URI(string: "file://\(toolchainPath)") ```json { - "name": "XcodeBuildServer", + "name": "sourcekit-bsp", "version": "1.0.0", "bspVersion": "2.2.0", "languages": ["swift", "objective-c", "objective-cpp", "c", "cpp"], - "argv": ["/path/to/XcodeBuildServerCLI"], + "argv": ["/path/to/sourcekit-bsp"], "rootUri": "file:///path/to/project" } ``` diff --git a/Docs/XcodeProjects-to-BuildTargets.md b/Docs/XcodeProjects-to-BuildTargets.md index 272a8fa8..d714dfc0 100644 --- a/Docs/XcodeProjects-to-BuildTargets.md +++ b/Docs/XcodeProjects-to-BuildTargets.md @@ -2,7 +2,7 @@ ## 概览 -本文档描述了XcodeBuildServer如何扫描和解析工作目录，获取BSP目标和构建设置索引（编译参数）以供LSP使用。 +本文档描述了sourcekit-bsp如何扫描和解析工作目录，获取BSP目标和构建设置索引（编译参数）以供LSP使用。 ## 目录结构支持的情况 @@ -26,7 +26,7 @@ ## 配置文件 ### 配置路径 -`.XcodeBuildServer/project.json` +`.sourcekit-bsp/project.json` ### 配置格式 ```json diff --git a/Package.swift b/Package.swift index aab658e8..90ad56bd 100644 --- a/Package.swift +++ b/Package.swift @@ -39,7 +39,7 @@ let multiPlatformTargets: [Target] = [ ] ), .executableTarget( - name: "XcodeBuildServerCLI", + name: "sourcekit-bsp", dependencies: [ "BSPServer", "Logger", @@ -95,8 +95,8 @@ let multiPlatformProducts: [Product] = [ ), .library(name: "BSPServer", targets: ["BSPServer"]), .executable( - name: "XcodeBuildServerCLI", - targets: ["XcodeBuildServerCLI"] + name: "sourcekit-bsp", + targets: ["sourcekit-bsp"] ), ] @@ -217,7 +217,7 @@ let dependencies: [PackageDescription.Package.Dependency] = [ ] let package = Package( - name: "XcodeBuildServer", + name: "sourcekit-bsp", platforms: [.macOS(.v13)], products: products, dependencies: dependencies, diff --git a/README.md b/README.md index b397b3c3..09a447df 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# XcodeBuildServer +# sourcekit-bsp [![Swift](https://img.shields.io/badge/swift-6.1+-orange.svg)](https://swift.org) [![Platform](https://img.shields.io/badge/platform-macOS-lightgrey.svg)](https://developer.apple.com/macos/) -[![Build Status](https://github.com/aelam/XcodeBuildServer/workflows/CI/badge.svg)](https://github.com/aelam/XcodeBuildServer/actions) -[![codecov](https://codecov.io/github/aelam/XcodeBuildServer/graph/badge.svg?token=SUL2UI5FQD)](https://codecov.io/github/aelam/XcodeBuildServer) +[![Build Status](https://github.com/aelam/sourcekit-bsp/workflows/CI/badge.svg)](https://github.com/aelam/sourcekit-bsp/actions) +[![codecov](https://codecov.io/github/aelam/sourcekit-bsp/graph/badge.svg?token=SUL2UI5FQD)](https://codecov.io/github/aelam/sourcekit-bsp) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) A Build Server Protocol (BSP) implementation for Xcode projects, enabling better IDE integration with Swift and Objective-C codebases. @@ -20,44 +20,44 @@ A Build Server Protocol (BSP) implementation for Xcode projects, enabling better ## Demo -See XcodeBuildServer in action with seamless code navigation and jump-to-definition: +See sourcekit-bsp in action with seamless code navigation and jump-to-definition: ![Navigation Demo](Docs/Navigation.gif) ## Installation ### Manual Installation -1. Download the latest release from [GitHub Releases](https://github.com/wang.lun/XcodeBuildServer/releases) +1. Download the latest release from [GitHub Releases](https://github.com/wang.lun/sourcekit-bsp/releases) 2. Extract and move to your PATH: ```bash - tar -xzf xcode-build-server-macos-universal.tar.gz - sudo mv release/XcodeBuildServerCLI /usr/local/bin/ - chmod +x /usr/local/bin/XcodeBuildServerCLI + tar -xzf sourcekit-bsp-macos-universal.tar.gz + sudo mv release/sourcekit-bsp /usr/local/bin/ + chmod +x /usr/local/bin/sourcekit-bsp ``` ### Build from Source ```shell -git clone https://github.com/wang.lun/XcodeBuildServer.git -cd XcodeBuildServer +git clone https://github.com/wang.lun/sourcekit-bsp.git +cd sourcekit-bsp swift build -c release -cp .build/release/XcodeBuildServerCLI /usr/local/bin/XcodeBuildServerCLI +cp .build/release/sourcekit-bsp /usr/local/bin/sourcekit-bsp ``` ### Homebrew (Coming Soon) ```shell # Not yet available -brew install XcodeBuildServer +brew install sourcekit-bsp ``` ## Configuration ### BSP Configuration - Create a `buildServer.json` ~~`.bsp/XcodeBuildServer.json`~~ file in your project root: + Create a `buildServer.json` ~~`.bsp/sourcekit-bsp.json`~~ file in your project root: ```json { - "name": "XcodeBuildServer", + "name": "sourcekit-bsp", "version": "0.2", "bspVersion": "2.2.0", "languages": [ @@ -66,7 +66,7 @@ brew install XcodeBuildServer "swift" ], "argv": [ - "path/to/XcodeBuildServerCLI" + "path/to/sourcekit-bsp" ] } ``` @@ -81,7 +81,7 @@ NOTE: `vscode-swift` requires the `buildServer.json` file to be located in the r ### Project Configuration -For complex projects, create a `.XcodeBuildServer/project.json` configuration file: +For complex projects, create a `.sourcekit-bsp/project.json` configuration file: ```json { @@ -105,15 +105,15 @@ For complex projects, create a `.XcodeBuildServer/project.json` configuration fi #### When Project Configuration is Required -The `.XcodeBuildServer/project.json` file is required for: +The `.sourcekit-bsp/project.json` file is required for: - Multiple workspaces - Multiple projects without a workspace - Custom build configurations -- Projects/workspaces with multiple schemes for multi iOS apps that XcodeBuildServer can not guess which one is main +- Projects/workspaces with multiple schemes for multi iOS apps that sourcekit-bsp can not guess which one is main ## Quick Start -1. **Install XcodeBuildServer** using one of the installation methods above +1. **Install sourcekit-bsp** using one of the installation methods above 2. **Configure your project** following the configuration section @@ -125,7 +125,7 @@ The `.XcodeBuildServer/project.json` file is required for: 4. **Start the server**: ```shell - XcodeBuildServerCLI + sourcekit-bsp ``` 5. **Connect from your IDE**: Configure your IDE to connect to the BSP server (typically on stdio). @@ -169,7 +169,7 @@ swift test ``` ┌─────────────────┐ JSON-RPC ┌──────────────────┐ -│ IDE │ ◄─────────────► │ XcodeBuildServer │ +│ IDE │ ◄─────────────► │ sourcekit-bsp │ └─────────────────┘ └──────────────────┘ │ ▼ @@ -213,9 +213,9 @@ swift test ### Logging -Logs are written to `/tmp/xcode-build-server.log` +Logs are written to `/tmp/sourcekit-bsp.log` -### Verify if XcodeBuildServer can resolve your project +### Verify if sourcekit-bsp can resolve your project ```sh # See if project can be resolved diff --git a/Sources-MacOS/XcodeProjectCLI/Commands/CompileTargetCommand.swift b/Sources-MacOS/XcodeProjectCLI/Commands/CompileTargetCommand.swift index cbcb4254..a953f1ae 100644 --- a/Sources-MacOS/XcodeProjectCLI/Commands/CompileTargetCommand.swift +++ b/Sources-MacOS/XcodeProjectCLI/Commands/CompileTargetCommand.swift @@ -1,6 +1,6 @@ // // CompileTargetCommand.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/07. // @@ -34,7 +34,7 @@ struct CompileTargetCommand: AsyncParsableCommand { let workspaceFolder = workspaceFolder.absolutePath let rootURL = URL(fileURLWithPath: workspaceFolder) - let preferredProjectInfoURL = rootURL.appendingPathComponent(".XcodeBuildServer/project.json") + let preferredProjectInfoURL = rootURL.appendingPathComponent(".sourcekit-bsp/project.json") let xcodeProjectReference: XcodeProjectReference? = try? JSONDecoder().decode( XcodeProjectReference.self, diff --git a/Sources-MacOS/XcodeProjectCLI/Commands/ResolveProjectCommand.swift b/Sources-MacOS/XcodeProjectCLI/Commands/ResolveProjectCommand.swift index 1356428a..2f44bbdd 100644 --- a/Sources-MacOS/XcodeProjectCLI/Commands/ResolveProjectCommand.swift +++ b/Sources-MacOS/XcodeProjectCLI/Commands/ResolveProjectCommand.swift @@ -1,6 +1,6 @@ // // ResolveProjectCommand.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/04. // @@ -31,7 +31,7 @@ struct ResolveProjectCommand: AsyncParsableCommand { let workspaceFolder = workspaceFolder.absolutePath let rootURL = URL(fileURLWithPath: workspaceFolder) - let preferredProjectInfoURL = rootURL.appendingPathComponent(".XcodeBuildServer/project.json") + let preferredProjectInfoURL = rootURL.appendingPathComponent(".sourcekit-bsp/project.json") let xcodeProjectReference: XcodeProjectReference? = try? JSONDecoder().decode( XcodeProjectReference.self, diff --git a/Sources-MacOS/XcodeProjectCLI/Commands/SharedOptions.swift b/Sources-MacOS/XcodeProjectCLI/Commands/SharedOptions.swift index 903c68d8..ac119827 100644 --- a/Sources-MacOS/XcodeProjectCLI/Commands/SharedOptions.swift +++ b/Sources-MacOS/XcodeProjectCLI/Commands/SharedOptions.swift @@ -1,6 +1,6 @@ // // SharedOptions.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/04. // diff --git a/Sources-MacOS/XcodeProjectCLI/Commands/SourceFileInfo.swift b/Sources-MacOS/XcodeProjectCLI/Commands/SourceFileInfo.swift index 9ce6683f..8d4675ab 100644 --- a/Sources-MacOS/XcodeProjectCLI/Commands/SourceFileInfo.swift +++ b/Sources-MacOS/XcodeProjectCLI/Commands/SourceFileInfo.swift @@ -1,6 +1,6 @@ // // SourceFileInfo.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/04. // diff --git a/Sources-MacOS/XcodeProjectManagement/BuildSettings/BuildSettingKey.swift b/Sources-MacOS/XcodeProjectManagement/BuildSettings/BuildSettingKey.swift index 4d2ca02f..7ddfbdf0 100644 --- a/Sources-MacOS/XcodeProjectManagement/BuildSettings/BuildSettingKey.swift +++ b/Sources-MacOS/XcodeProjectManagement/BuildSettings/BuildSettingKey.swift @@ -1,6 +1,6 @@ // // BuildSettingKey.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/26. // diff --git a/Sources-MacOS/XcodeProjectManagement/CompilerArgumentsProvider/Providers/CompilerOptions/WorkingDirectoryProvider.swift b/Sources-MacOS/XcodeProjectManagement/CompilerArgumentsProvider/Providers/CompilerOptions/WorkingDirectoryProvider.swift index 011c0f85..ffa092be 100644 --- a/Sources-MacOS/XcodeProjectManagement/CompilerArgumentsProvider/Providers/CompilerOptions/WorkingDirectoryProvider.swift +++ b/Sources-MacOS/XcodeProjectManagement/CompilerArgumentsProvider/Providers/CompilerOptions/WorkingDirectoryProvider.swift @@ -1,6 +1,6 @@ // // WorkingDirectoryProvider.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/01. // diff --git a/Sources-MacOS/XcodeProjectManagement/ProjectManager/XcodeProjectManager+SourceKitOptions.swift b/Sources-MacOS/XcodeProjectManagement/ProjectManager/XcodeProjectManager+SourceKitOptions.swift index 20008b27..ce086e57 100644 --- a/Sources-MacOS/XcodeProjectManagement/ProjectManager/XcodeProjectManager+SourceKitOptions.swift +++ b/Sources-MacOS/XcodeProjectManagement/ProjectManager/XcodeProjectManager+SourceKitOptions.swift @@ -1,6 +1,6 @@ // // XcodeProjectManager+SourceKitOptions.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/01. // diff --git a/Sources-MacOS/XcodeProjectManagement/README.md b/Sources-MacOS/XcodeProjectManagement/README.md index 4bd5c22c..c8fdb3f4 100644 --- a/Sources-MacOS/XcodeProjectManagement/README.md +++ b/Sources-MacOS/XcodeProjectManagement/README.md @@ -138,4 +138,4 @@ The module provides comprehensive error handling through `XcodeProjectError`: ## Integration -This module integrates seamlessly with the main XcodeBuildServer for BSP support, but can also be used independently for general Xcode project management tasks. +This module integrates seamlessly with the main sourcekit-bsp for BSP support, but can also be used independently for general Xcode project management tasks. diff --git a/Sources-MacOS/XcodeProjectManagement/Utilities/PathHash.swift b/Sources-MacOS/XcodeProjectManagement/Utilities/PathHash.swift index 0c7c38be..f61555b6 100644 --- a/Sources-MacOS/XcodeProjectManagement/Utilities/PathHash.swift +++ b/Sources-MacOS/XcodeProjectManagement/Utilities/PathHash.swift @@ -1,6 +1,6 @@ // // PathHash.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/23. // diff --git a/Sources-MacOS/XcodeProjectManagerProvider/Conversions/ProjectInfo+XcodeProjectInfo.swift b/Sources-MacOS/XcodeProjectManagerProvider/Conversions/ProjectInfo+XcodeProjectInfo.swift index ef86b75f..562aa18f 100644 --- a/Sources-MacOS/XcodeProjectManagerProvider/Conversions/ProjectInfo+XcodeProjectInfo.swift +++ b/Sources-MacOS/XcodeProjectManagerProvider/Conversions/ProjectInfo+XcodeProjectInfo.swift @@ -1,6 +1,6 @@ // // ProjectInfo+XcodeProjectInfo.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/21. // diff --git a/Sources-MacOS/XcodeProjectManagerProvider/Conversions/SourcesItem+BSP.swift b/Sources-MacOS/XcodeProjectManagerProvider/Conversions/SourcesItem+BSP.swift index 23df5a02..d8f14e33 100644 --- a/Sources-MacOS/XcodeProjectManagerProvider/Conversions/SourcesItem+BSP.swift +++ b/Sources-MacOS/XcodeProjectManagerProvider/Conversions/SourcesItem+BSP.swift @@ -1,6 +1,6 @@ // // SourcesItem+BSP.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/29. // diff --git a/Sources-MacOS/XcodeProjectManagerProvider/Conversions/XcodeProductType+Product.swift b/Sources-MacOS/XcodeProjectManagerProvider/Conversions/XcodeProductType+Product.swift index 0750383b..17c3c452 100644 --- a/Sources-MacOS/XcodeProjectManagerProvider/Conversions/XcodeProductType+Product.swift +++ b/Sources-MacOS/XcodeProjectManagerProvider/Conversions/XcodeProductType+Product.swift @@ -1,6 +1,6 @@ // // XcodeProductType+Product.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/21. // diff --git a/Sources-MacOS/XcodeProjectManagerProvider/XcodeProjectManagerProvider.swift b/Sources-MacOS/XcodeProjectManagerProvider/XcodeProjectManagerProvider.swift index 8896166b..3a82bfc3 100644 --- a/Sources-MacOS/XcodeProjectManagerProvider/XcodeProjectManagerProvider.swift +++ b/Sources-MacOS/XcodeProjectManagerProvider/XcodeProjectManagerProvider.swift @@ -40,7 +40,7 @@ public struct XcodeProjectManagerProvider: ProjectManagerProvider { return toolchain }.value - let preferredProjectInfoURL = rootURL.appendingPathComponent(".XcodeBuildServer/project.json") + let preferredProjectInfoURL = rootURL.appendingPathComponent(".sourcekit-bsp/project.json") let xcodeProjectReference: XcodeProjectReference? = try? JSONDecoder().decode( XcodeProjectReference.self, diff --git a/Sources/BSPServer/BSPConfigurationLoader.swift b/Sources/BSPServer/BSPConfigurationLoader.swift index 1a6e69ac..d39d21be 100644 --- a/Sources/BSPServer/BSPConfigurationLoader.swift +++ b/Sources/BSPServer/BSPConfigurationLoader.swift @@ -17,7 +17,7 @@ import Foundation /// When schemes are specified, only those schemes and their targets will be loaded, /// significantly reducing initialization time for large projects. /// -/// Example .XcodeBuildServer/project.json: +/// Example .sourcekit-bsp/project.json: /// ```json /// { /// "workspace": "MyApp.xcworkspace", @@ -57,7 +57,7 @@ public final class BSPServerConfigurationLoader: Sendable { public func findConfiguration() -> URL? { let configSearchPaths = [ // Standard BSP config location for xcode.json - rootURL.appendingPathComponent(".XcodeBuildServer/project.json"), + rootURL.appendingPathComponent(".sourcekit-bsp/project.json"), ] // First try specific xcode.json path @@ -65,8 +65,8 @@ public final class BSPServerConfigurationLoader: Sendable { return configSearchPaths[0] } - // Check .XcodeBuildServer directory for any JSON files - let bspDir = rootURL.appendingPathComponent(".XcodeBuildServer") + // Check .sourcekit-bsp directory for any JSON files + let bspDir = rootURL.appendingPathComponent(".sourcekit-bsp") if FileManager.default.fileExists(atPath: bspDir.path) { do { let jsonFiles = try FileManager.default @@ -93,7 +93,7 @@ public final class BSPServerConfigurationLoader: Sendable { public func loadConfiguration() throws -> XcodeBSPConfiguration? { let configFileURL: URL - if configurationPath == ".XcodeBuildServer/project.json" { + if configurationPath == ".sourcekit-bsp/project.json" { // Use findConfiguration for default path guard let foundURL = findConfiguration() else { return nil diff --git a/Sources/BSPServer/BSPMessages/buildMessages/BuildInitializeRequest.swift b/Sources/BSPServer/BSPMessages/buildMessages/BuildInitializeRequest.swift index 25d803e2..db6262e5 100644 --- a/Sources/BSPServer/BSPMessages/buildMessages/BuildInitializeRequest.swift +++ b/Sources/BSPServer/BSPMessages/buildMessages/BuildInitializeRequest.swift @@ -8,7 +8,7 @@ import Foundation import JSONRPCConnection import Logger -/// Languages supported by XcodeBuildServer for Xcode projects +/// Languages supported by sourcekit-bsp for Xcode projects public let buildServerSupportedLanguages: Set = [.swift, .objective_c, .objective_cpp, .c, .cpp] public struct BuildInitializeRequest: ContextualRequestType, Sendable { @@ -134,7 +134,7 @@ public struct BuildInitializeRequest: ContextualRequestType, Sendable { rootUri: self.params.rootUri, bspVersion: "2.2.0", version: "1.0", - displayName: "XcodeBuildServerCLI" + displayName: "sourcekit-bsp" ) ) return response diff --git a/Sources/BSPServer/BSPMessages/buildMessages/BuildLogMessageRequest.swift b/Sources/BSPServer/BSPMessages/buildMessages/BuildLogMessageRequest.swift index 0828f79f..428bd738 100644 --- a/Sources/BSPServer/BSPMessages/buildMessages/BuildLogMessageRequest.swift +++ b/Sources/BSPServer/BSPMessages/buildMessages/BuildLogMessageRequest.swift @@ -1,6 +1,6 @@ // // BuildLogMessageRequest.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/24. // diff --git a/Sources/BSPServer/BSPMessages/buildMessages/BuildShutdownRequest.swift b/Sources/BSPServer/BSPMessages/buildMessages/BuildShutdownRequest.swift index 0420a8c6..f97b00dd 100644 --- a/Sources/BSPServer/BSPMessages/buildMessages/BuildShutdownRequest.swift +++ b/Sources/BSPServer/BSPMessages/buildMessages/BuildShutdownRequest.swift @@ -1,6 +1,6 @@ // // BuildShutdownRequest.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/09. // diff --git a/Sources/BSPServer/BSPMessages/buildMessages/OnBuildExitNotification.swift b/Sources/BSPServer/BSPMessages/buildMessages/OnBuildExitNotification.swift index dc24fcfc..e6c54c53 100644 --- a/Sources/BSPServer/BSPMessages/buildMessages/OnBuildExitNotification.swift +++ b/Sources/BSPServer/BSPMessages/buildMessages/OnBuildExitNotification.swift @@ -1,6 +1,6 @@ // // OnBuildExitNotification.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/09. // diff --git a/Sources/BSPServer/BSPMessages/buildMessages/OnBuildInitializedNotification.swift b/Sources/BSPServer/BSPMessages/buildMessages/OnBuildInitializedNotification.swift index ceab4e2c..59bf126f 100644 --- a/Sources/BSPServer/BSPMessages/buildMessages/OnBuildInitializedNotification.swift +++ b/Sources/BSPServer/BSPMessages/buildMessages/OnBuildInitializedNotification.swift @@ -1,6 +1,6 @@ // // OnBuildInitializedNotification.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/17. // diff --git a/Sources/BSPServer/BSPMessages/buildTarget/BuildTargetDidChangeNotification.swift b/Sources/BSPServer/BSPMessages/buildTarget/BuildTargetDidChangeNotification.swift index 6dd2ffce..ef826f61 100644 --- a/Sources/BSPServer/BSPMessages/buildTarget/BuildTargetDidChangeNotification.swift +++ b/Sources/BSPServer/BSPMessages/buildTarget/BuildTargetDidChangeNotification.swift @@ -1,6 +1,6 @@ // // BuildTargetDidChangeNotification.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/23. // diff --git a/Sources/BSPServer/BSPMessages/window/WindowWorkDoneProgressCreateRequest.swift b/Sources/BSPServer/BSPMessages/window/WindowWorkDoneProgressCreateRequest.swift index 681920bc..a60738fa 100644 --- a/Sources/BSPServer/BSPMessages/window/WindowWorkDoneProgressCreateRequest.swift +++ b/Sources/BSPServer/BSPMessages/window/WindowWorkDoneProgressCreateRequest.swift @@ -1,6 +1,6 @@ // // WindowWorkDoneProgressCreateRequest.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/23. // diff --git a/Sources/BSPServer/BSPServerService/BSPServerService+BuildTargetSources.swift b/Sources/BSPServer/BSPServerService/BSPServerService+BuildTargetSources.swift index d30be5f8..78f4acdd 100644 --- a/Sources/BSPServer/BSPServerService/BSPServerService+BuildTargetSources.swift +++ b/Sources/BSPServer/BSPServerService/BSPServerService+BuildTargetSources.swift @@ -1,6 +1,6 @@ // // BSPServerService+BuildTargetSources.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/21. // diff --git a/Sources/BSPServer/BSPServerService/BSPServerService+Initialize.swift b/Sources/BSPServer/BSPServerService/BSPServerService+Initialize.swift index 9d612fa8..dabbabbe 100644 --- a/Sources/BSPServer/BSPServerService/BSPServerService+Initialize.swift +++ b/Sources/BSPServer/BSPServerService/BSPServerService+Initialize.swift @@ -1,6 +1,6 @@ // // BSPServerService+Initialize.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/21. // diff --git a/Sources/BSPServer/BSPServerService/BSPServerService+SourceKitOptions.swift b/Sources/BSPServer/BSPServerService/BSPServerService+SourceKitOptions.swift index d698c572..f652b5ef 100644 --- a/Sources/BSPServer/BSPServerService/BSPServerService+SourceKitOptions.swift +++ b/Sources/BSPServer/BSPServerService/BSPServerService+SourceKitOptions.swift @@ -1,6 +1,6 @@ // // BSPServerService+SourceKitOptions.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/21. // diff --git a/Sources/BSPServer/ContextualRequestType+BSPServerService.swift b/Sources/BSPServer/ContextualRequestType+BSPServerService.swift index 03955b32..9381f4bc 100644 --- a/Sources/BSPServer/ContextualRequestType+BSPServerService.swift +++ b/Sources/BSPServer/ContextualRequestType+BSPServerService.swift @@ -1,6 +1,6 @@ // // ContextualRequestType+BSPServerService.swift -// XcodeBuildServer +// sourcekit-bsp // // Copyright © 2024 Wang Lun. // @@ -9,7 +9,7 @@ import JSONRPCConnection // MARK: - Default Implementations for Contextual Protocols -/// Provides default implementations for ContextualRequestType in the XcodeBuildServer context +/// Provides default implementations for ContextualRequestType in the sourcekit-bsp context public extension ContextualRequestType where RequiredContext == BSPServerService { /// Default implementation that bridges from MessageHandler to BSPMessageHandler func handle(handler: MessageHandler, id: RequestID) async -> ResponseType? { @@ -20,7 +20,7 @@ public extension ContextualRequestType where RequiredContext == BSPServerService } } -/// Provides default implementations for ContextualNotificationType in the XcodeBuildServer context +/// Provides default implementations for ContextualNotificationType in the sourcekit-bsp context public extension ContextualNotificationType where RequiredContext == BSPServerService { /// Default implementation that bridges from MessageHandler to BSPMessageHandler func handle(handler: MessageHandler) async throws { diff --git a/Sources/BSPServer/Logger.swift b/Sources/BSPServer/Logger.swift index ac024192..8f527565 100644 --- a/Sources/BSPServer/Logger.swift +++ b/Sources/BSPServer/Logger.swift @@ -1,6 +1,6 @@ // // Logger.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/20. // diff --git a/Sources/BuildServerProtocol/ProjectManager/ProgressToken.swift b/Sources/BuildServerProtocol/ProjectManager/ProgressToken.swift index d1f8027b..cb2a1a52 100644 --- a/Sources/BuildServerProtocol/ProjectManager/ProgressToken.swift +++ b/Sources/BuildServerProtocol/ProjectManager/ProgressToken.swift @@ -1,6 +1,6 @@ // // ProgressToken.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by ST22956 on 2024/11/23. // diff --git a/Sources/Logger/Logger.swift b/Sources/Logger/Logger.swift index 55779d8b..171dee58 100644 --- a/Sources/Logger/Logger.swift +++ b/Sources/Logger/Logger.swift @@ -21,7 +21,7 @@ public final class SwiftyBeaverLogger: @unchecked Sendable { // log.addDestination(console) let file = FileDestination() - file.logFileURL = URL(fileURLWithPath: "/tmp/xcode-build-server.log") + file.logFileURL = URL(fileURLWithPath: "/tmp/sourcekit-bsp.log") file.format = "$Dyyyy-MM-dd HH:mm:ss.SSS$d $L $N.$F:$l $M" log.addDestination(file) } diff --git a/Sources/SwiftPMProjectManagerProvider/SwiftPMProjectManagerProvider.swift b/Sources/SwiftPMProjectManagerProvider/SwiftPMProjectManagerProvider.swift index f877bae8..d2b85648 100644 --- a/Sources/SwiftPMProjectManagerProvider/SwiftPMProjectManagerProvider.swift +++ b/Sources/SwiftPMProjectManagerProvider/SwiftPMProjectManagerProvider.swift @@ -1,6 +1,5 @@ // // SwiftPMProjectManagerProvider.swift -// SwiftPMProjectManagerProvider Module // // Copyright © 2024 Wang Lun. // diff --git a/Sources/XcodeBuildServerCLI/XcodeBuildServerCLI.swift b/Sources/sourcekit-bsp/SourceKitBSP.swift similarity index 89% rename from Sources/XcodeBuildServerCLI/XcodeBuildServerCLI.swift rename to Sources/sourcekit-bsp/SourceKitBSP.swift index 5ff9a83a..c8280c6b 100644 --- a/Sources/XcodeBuildServerCLI/XcodeBuildServerCLI.swift +++ b/Sources/sourcekit-bsp/SourceKitBSP.swift @@ -1,5 +1,5 @@ // -// XcodeBuildServerCLI.swift +// SourceKitBSP.swift // // Copyright © 2024 Wang Lun. @@ -15,7 +15,7 @@ import XcodeProjectManagerProvider import SwiftPMProjectManagerProvider @main -struct XcodeBuildServerCLI { +struct SourceKitBSP { static func main() async { // 获取环境信息 let processID = ProcessInfo.processInfo.processIdentifier @@ -23,7 +23,7 @@ struct XcodeBuildServerCLI { // Log startup message logger.info( - "XcodeBuildServer started successfully - PID: \(processID) - Environment: \(environment)" + "sourcekit-bsp started successfully - PID: \(processID) - Environment: \(environment)" ) let arguments = CommandLine.arguments @@ -73,10 +73,10 @@ struct XcodeBuildServerCLI { } private static func printUsage() { - print("Usage: XcodeBuildServerCLI") + print("Usage: sourcekit-bsp") print("") print("Description:") - print(" Starts an XcodeBuildServerCLI Protocol (BSP) server that communicates") + print(" Starts an sourcekit-bsp Protocol (BSP) server that communicates") print(" via JSON-RPC over stdin/stdout. The server waits for BSP requests") print(" from compatible IDEs or tools.") print("") @@ -91,8 +91,8 @@ struct XcodeBuildServerCLI { print(" See: https://build-server-protocol.github.io/") print("") print("Examples:") - print(" XcodeBuildServerCLI # Start BSP server") - print(" echo '{\"id\":1,\"method\":\"build/initialize\"...}' | XcodeBuildServerCLI") + print(" sourcekit-bsp # Start BSP server") + print(" echo '{\"id\":1,\"method\":\"build/initialize\"...}' | sourcekit-bsp") } private static func killSelfIfParentIsNull() { diff --git a/Tests-MacOS/XcodeProjectManagementTests/CompileTests.swift b/Tests-MacOS/XcodeProjectManagementTests/CompileTests.swift index 9e578dfd..bed56448 100644 --- a/Tests-MacOS/XcodeProjectManagementTests/CompileTests.swift +++ b/Tests-MacOS/XcodeProjectManagementTests/CompileTests.swift @@ -1,6 +1,6 @@ // // CompileTests.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/09/07. // diff --git a/Tests-MacOS/XcodeProjectManagementTests/Resources/DemoProjects/HelloProject/.bsp/config.json b/Tests-MacOS/XcodeProjectManagementTests/Resources/DemoProjects/HelloProject/.bsp/config.json index 2a30600f..55862661 100644 --- a/Tests-MacOS/XcodeProjectManagementTests/Resources/DemoProjects/HelloProject/.bsp/config.json +++ b/Tests-MacOS/XcodeProjectManagementTests/Resources/DemoProjects/HelloProject/.bsp/config.json @@ -1,5 +1,5 @@ { - "name": "XcodeBuildServerCLI", + "name": "sourcekit-bsp", "version": "0.2", "bspVersion": "2.2.0", "languages": [ @@ -10,7 +10,7 @@ "swift" ], "argv": [ - "../../../../.build/debug/XcodeBuildServerCLI" + "../../../../.build/debug/sourcekit-bsp" ], "kind": "xcode", "env": { diff --git a/Tests-MacOS/XcodeProjectManagementTests/Resources/TestScheme.xcscheme b/Tests-MacOS/XcodeProjectManagementTests/Resources/TestScheme.xcscheme index c33959bb..ca612b77 100644 --- a/Tests-MacOS/XcodeProjectManagementTests/Resources/TestScheme.xcscheme +++ b/Tests-MacOS/XcodeProjectManagementTests/Resources/TestScheme.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "sourcekit-bsp" + BlueprintName = "sourcekit-bsp" + ReferencedContainer = "container:sourcekit-bsp.xcodeproj"> + BuildableName = "sourcekit-bspTests.xctest" + BlueprintName = "sourcekit-bspTests" + ReferencedContainer = "container:sourcekit-bsp.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "sourcekit-bspTests.xctest" + BlueprintName = "sourcekit-bspTests" + ReferencedContainer = "container:sourcekit-bsp.xcodeproj"> @@ -69,9 +69,9 @@ + BuildableName = "sourcekit-bsp" + BlueprintName = "sourcekit-bsp" + ReferencedContainer = "container:sourcekit-bsp.xcodeproj"> @@ -86,9 +86,9 @@ + BuildableName = "sourcekit-bsp" + BlueprintName = "sourcekit-bsp" + ReferencedContainer = "container:sourcekit-bsp.xcodeproj"> diff --git a/Tests-MacOS/XcodeProjectManagementTests/XcodeProjectLocatorTests.swift b/Tests-MacOS/XcodeProjectManagementTests/XcodeProjectLocatorTests.swift index b25f9c9b..cca2188f 100644 --- a/Tests-MacOS/XcodeProjectManagementTests/XcodeProjectLocatorTests.swift +++ b/Tests-MacOS/XcodeProjectManagementTests/XcodeProjectLocatorTests.swift @@ -1,6 +1,6 @@ // // XcodeProjectLocatorTests.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/04. // diff --git a/Tests-MacOS/XcodeProjectManagerProviderTests/XcodeProjectManagerProviderTests.swift b/Tests-MacOS/XcodeProjectManagerProviderTests/XcodeProjectManagerProviderTests.swift index 365ca970..84898cce 100644 --- a/Tests-MacOS/XcodeProjectManagerProviderTests/XcodeProjectManagerProviderTests.swift +++ b/Tests-MacOS/XcodeProjectManagerProviderTests/XcodeProjectManagerProviderTests.swift @@ -1,6 +1,6 @@ // // XcodeProjectManagerProviderTests.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/22. // diff --git a/Tests/BSPServerTests/BSPServerTests.swift b/Tests/BSPServerTests/BSPServerTests.swift index 5b1f62c5..815f790b 100644 --- a/Tests/BSPServerTests/BSPServerTests.swift +++ b/Tests/BSPServerTests/BSPServerTests.swift @@ -1,6 +1,6 @@ // // BSPServerTests.swift -// XcodeBuildServer +// sourcekit-bsp // // Created by wang.lun on 2025/08/28. // diff --git a/Tests/XcodeBuildServerTests/Messages/BSPMessageTests.swift b/Tests/XcodeBuildServerTests/Messages/BSPMessageTests.swift index fa463795..1c6fbc7f 100644 --- a/Tests/XcodeBuildServerTests/Messages/BSPMessageTests.swift +++ b/Tests/XcodeBuildServerTests/Messages/BSPMessageTests.swift @@ -6,7 +6,7 @@ import XCTest @testable import JSONRPCConnection -@testable import XcodeBuildServer +@testable import SourceKitBSP final class BSPMessageTests: XCTestCase { func testBuildInitialize() throws { diff --git a/Tests/XcodeBuildServerTests/Messages/build/BuildInitializeRequestTests.swift b/Tests/XcodeBuildServerTests/Messages/build/BuildInitializeRequestTests.swift index dcec412f..9578160b 100644 --- a/Tests/XcodeBuildServerTests/Messages/build/BuildInitializeRequestTests.swift +++ b/Tests/XcodeBuildServerTests/Messages/build/BuildInitializeRequestTests.swift @@ -1,13 +1,13 @@ // // BuildInitializeRequestTests.swift -// XcodeBuildServer +// sourcekit-bsp // // Copyright © 2024 Wang Lun. // import Foundation import Testing -@testable import XcodeBuildServer +@testable import sourcekit - bsp struct BuildInitializeRequestTests { @Test @@ -199,7 +199,7 @@ struct BuildInitializeRequestTests { #expect(decoded.jsonrpc == "2.0") #expect(decoded.id == .int(1)) - #expect(decoded.result.displayName == "XcodeBuildServerCLI") + #expect(decoded.result.displayName == "sourcekit-bsp") #expect(decoded.result.bspVersion == "2.2.0") #expect(decoded.result.capabilities.compileProvider?.languageIds.contains(.swift) == true) } @@ -239,7 +239,7 @@ extension BuildInitializeRequestTests { rootUri: "file:///Users/test/project/", bspVersion: "2.2.0", version: "0.1", - displayName: "XcodeBuildServerCLI" + displayName: "sourcekit-bsp" ) return BuildInitializeResponse( diff --git a/Tests/XcodeBuildServerTests/Messages/textDocument/TextDocumentSourceKitOptionsRequestTests.swift b/Tests/XcodeBuildServerTests/Messages/textDocument/TextDocumentSourceKitOptionsRequestTests.swift index 60e73f9f..868ff934 100644 --- a/Tests/XcodeBuildServerTests/Messages/textDocument/TextDocumentSourceKitOptionsRequestTests.swift +++ b/Tests/XcodeBuildServerTests/Messages/textDocument/TextDocumentSourceKitOptionsRequestTests.swift @@ -6,7 +6,7 @@ import Foundation import Testing -@testable import XcodeBuildServer +@testable import sourcekit - bsp struct TextDocumentSourceKitOptionsRequestTests { // MARK: - Test Data diff --git a/Tests/XcodeBuildServerTests/WorkspaceBuildTargetsRequestTests.swift b/Tests/XcodeBuildServerTests/WorkspaceBuildTargetsRequestTests.swift index be291b41..2bf4d3fb 100644 --- a/Tests/XcodeBuildServerTests/WorkspaceBuildTargetsRequestTests.swift +++ b/Tests/XcodeBuildServerTests/WorkspaceBuildTargetsRequestTests.swift @@ -6,7 +6,7 @@ import Foundation import Testing -@testable import XcodeBuildServer +@testable import sourcekit - bsp struct WorkspaceBuildTargetsRequestTests { @Test