Skip to content

Commit 07e0a31

Browse files
authored
Merge pull request swiftlang#315 from benlangmuir/master-to-main
Update references to 'master' to 'main'
2 parents 5d596eb + 70d5c6d commit 07e0a31

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ license](https://swift.org/LICENSE.txt).
66
---
77

88
Before submitting the pull request, please make sure you have [tested your
9-
changes](https://github.com/apple/swift/blob/master/docs/ContinuousIntegration.md)
9+
changes](https://github.com/apple/swift/blob/main/docs/ContinuousIntegration.md)
1010
and that they follow the Swift project [guidelines for contributing
1111
code](https://swift.org/contributing/#contributing-code).

Documentation/Development.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This document contains notes about development and testing of SourceKit-LSP.
1414

1515
For maximum compatibility with toolchain components such as the Swift Package Manager, the only supported way to develop SourceKit-LSP is with the latest toolchain snapshot. We make an effort to keep the build and tests working with the latest release of Swift, but this is not always possible.
1616

17-
1. Install the latest master toolchain snapshot from https://swift.org/download/#snapshots. **If you're looking for swift-5.x**, use the `swift-5.x-branch` of SourceKit-LSP with the latest swift-5.x toolchain snapshot. See [Toolchains](#toolchains) for more information.
17+
1. Install the latest "Trunk Development (main)" toolchain snapshot from https://swift.org/download/#snapshots. **If you're looking for swift-5.x**, use the `swift-5.x-branch` of SourceKit-LSP with the latest swift-5.x toolchain snapshot. See [Toolchains](#toolchains) for more information.
1818

1919
2. Build the language server executable `sourcekit-lsp` using `swift build`. See [Building](#building-sourcekit-lsp) for more information.
2020

@@ -24,7 +24,7 @@ For maximum compatibility with toolchain components such as the Swift Package Ma
2424

2525
## Building SourceKit-LSP
2626

27-
Install the latest snapshot from https://swift.org/download/#snapshots. SourceKit-LSP builds with the latest toolchain snapshot of the corresponding branch (e.g. to build the *master* branch, use the latest *master* snapshot of the toolchain). See [Toolchains](#toolchains) for more information about supported toolchains.
27+
Install the latest snapshot from https://swift.org/download/#snapshots. SourceKit-LSP builds with the latest toolchain snapshot of the corresponding branch (e.g. to build the *main* branch, use the latest *main* snapshot of the toolchain). See [Toolchains](#toolchains) for more information about supported toolchains.
2828

2929
SourceKit-LSP is built using the [Swift Package Manager](https://github.com/apple/swift-package-manager). For a standard debug build on the command line:
3030

@@ -58,7 +58,7 @@ Use the latest toolchain snapshot from https://swift.org/download/#snapshots. So
5858

5959
| SourceKit-LSP branch | Toolchain |
6060
|:---------------------|:----------|
61-
| master | Trunk Development (master) |
61+
| main | Trunk Development (main) |
6262
| swift-5.2-branch | Swift 5.2 Development |
6363
| swift-5.1-branch | Swift 5.1.1+ |
6464

@@ -178,4 +178,4 @@ Position(ws.testLoc("aaa:call"))
178178
## Tibs
179179

180180
We use Tibs, the "Test Index Build System" from the IndexStoreDB project to provide build system support for test projects, including getting compiler arguments and building an index.
181-
For much more information about Tibs, see [IndexStoreDB/Documentation/Tibs.md](https://github.com/apple/indexstore-db/blob/master/Documentation/Tibs.md).
181+
For much more information about Tibs, see [IndexStoreDB/Documentation/Tibs.md](https://github.com/apple/indexstore-db/blob/main/Documentation/Tibs.md).

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ import Darwin.C
229229
if getenv("SWIFTCI_USE_LOCAL_DEPS") == nil {
230230
// Building standalone.
231231
package.dependencies += [
232-
.package(url: "https://github.com/apple/indexstore-db.git", .branch("master")),
233-
.package(url: "https://github.com/apple/swift-package-manager.git", .branch("master")),
234-
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("master")),
232+
.package(url: "https://github.com/apple/indexstore-db.git", .branch("main")),
233+
.package(url: "https://github.com/apple/swift-package-manager.git", .branch("main")),
234+
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("main")),
235235
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.0")),
236236
]
237237
} else {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SourceKit-LSP
22

3-
SourceKit-LSP is an implementation of the [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) (LSP) for Swift and C-based languages. It provides features like code-completion and jump-to-definition to editors that support LSP. SourceKit-LSP is built on top of [sourcekitd](https://github.com/apple/swift/tree/master/tools/SourceKit) and [clangd](https://clang.llvm.org/extra/clangd.html) for high-fidelity language support, and provides a powerful source code index as well as cross-language support. SourceKit-LSP supports projects that use the Swift Package Manager.
3+
SourceKit-LSP is an implementation of the [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) (LSP) for Swift and C-based languages. It provides features like code-completion and jump-to-definition to editors that support LSP. SourceKit-LSP is built on top of [sourcekitd](https://github.com/apple/swift/tree/main/tools/SourceKit) and [clangd](https://clang.llvm.org/extra/clangd.html) for high-fidelity language support, and provides a powerful source code index as well as cross-language support. SourceKit-LSP supports projects that use the Swift Package Manager.
44

55
## Getting Started
66

Sources/SourceKitLSP/Swift/CursorInfo.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct CursorInfo {
3030
var annotatedDeclaration: String?
3131

3232
/// The documentation comment XML string. The schema is at
33-
/// https://github.com/apple/swift/blob/master/bindings/xml/comment-xml-schema.rng
33+
/// https://github.com/apple/swift/blob/main/bindings/xml/comment-xml-schema.rng
3434
var documentationXML: String?
3535

3636
/// The refactor actions available at this position.

0 commit comments

Comments
 (0)