Skip to content

Commit 96f6e69

Browse files
authored
Merge pull request #1513 from ahoppen/swiftlang-migration
Update links for repositories moved to the swiftlang org on GitHub
2 parents 4822385 + da1f6da commit 96f6e69

13 files changed

+28
-28
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ To enable more verbose logging on non-macOS platforms, launch sourcekit-lsp with
109109
110110
## Formatting
111111
112-
SourceKit-LSP is formatted using [swift-format](http://github.com/apple/swift-format) to ensure a consistent style.
112+
SourceKit-LSP is formatted using [swift-format](http://github.com/swiftlang/swift-format) to ensure a consistent style.
113113
114114
To format your changes run the formatter using the following command
115115
```bash
@@ -156,7 +156,7 @@ In order for a pull request to be considered for inclusion in a release branch (
156156
```
157157
158158
> [!TIP]
159-
> The PR description can be generated using the [release_branch.md](https://github.com/apple/sourcekit-lsp/blob/main/.github/PULL_REQUEST_TEMPLATE/release_branch.md) [pull request template](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates). To use this template when creating a PR, you need to add the query parameter:
159+
> The PR description can be generated using the [release_branch.md](https://github.com/swiftlang/sourcekit-lsp/blob/main/.github/PULL_REQUEST_TEMPLATE/release_branch.md) [pull request template](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates). To use this template when creating a PR, you need to add the query parameter:
160160
> ```
161161
> ?expand=1&template=release_branch.md
162162
> ```

Documentation/Enable Experimental Background Indexing.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ Background indexing in SourceKit-LSP is available as an experimental feature. Th
1515

1616
## Known issues
1717

18-
- Background Indexing is only supported for SwiftPM projects [#1269](https://github.com/apple/sourcekit-lsp/issues/1269), [#1271](https://github.com/apple/sourcekit-lsp/issues/1271)
19-
- If a module or one of its dependencies has a compilation error, it cannot be properly prepared for indexing because we are running a regular `swift build` to generate its modules [#1254](https://github.com/apple/sourcekit-lsp/issues/1254) rdar://128683404
18+
- Background Indexing is only supported for SwiftPM projects [#1269](https://github.com/swiftlang/sourcekit-lsp/issues/1269), [#1271](https://github.com/swiftlang/sourcekit-lsp/issues/1271)
19+
- If a module or one of its dependencies has a compilation error, it cannot be properly prepared for indexing because we are running a regular `swift build` to generate its modules [#1254](https://github.com/swiftlang/sourcekit-lsp/issues/1254) rdar://128683404
2020
- Workaround 1: Ensure that your files dependencies are in a buildable state to get an up-to-date index and proper cross-module functionality
2121
- Workaround 2: Enable the `swiftpm-prepare-for-indexing` experimental feature, which continues to build Swift module even in the presence of errors.
22-
- If you change a function in a way that changes its USR but keeps it API compatible (such as adding a defaulted parameter), references to it will be lost and not re-indexed automatically [#1264](https://github.com/apple/sourcekit-lsp/issues/1264)
22+
- If you change a function in a way that changes its USR but keeps it API compatible (such as adding a defaulted parameter), references to it will be lost and not re-indexed automatically [#1264](https://github.com/swiftlang/sourcekit-lsp/issues/1264)
2323
- Workaround: Make some edit to the files that had references to re-index them
24-
- The index build is currently completely separate from the command line build generated using `swift build`. Building *does not* update the index (break your habits of always building!) [#1270](https://github.com/apple/sourcekit-lsp/issues/1270)
25-
- The initial indexing might take 2-3x more time than a regular build [#1254](https://github.com/apple/sourcekit-lsp/issues/1254), [#1262](https://github.com/apple/sourcekit-lsp/issues/1262), [#1268](https://github.com/apple/sourcekit-lsp/issues/1268)
24+
- The index build is currently completely separate from the command line build generated using `swift build`. Building *does not* update the index (break your habits of always building!) [#1270](https://github.com/swiftlang/sourcekit-lsp/issues/1270)
25+
- The initial indexing might take 2-3x more time than a regular build [#1254](https://github.com/swiftlang/sourcekit-lsp/issues/1254), [#1262](https://github.com/swiftlang/sourcekit-lsp/issues/1262), [#1268](https://github.com/swiftlang/sourcekit-lsp/issues/1268)
2626
- Spurious re-indexing of ~10-20 source files when `swift build` writes a header to the build directory [rdar://128573306](rdar://128573306)
2727

2828
## Filing issues
2929

30-
If you hit any issues that are not mentioned above, please [file a GitHub issue](https://github.com/apple/sourcekit-lsp/issues/new/choose) and attach the following information, if possible:
30+
If you hit any issues that are not mentioned above, please [file a GitHub issue](https://github.com/swiftlang/sourcekit-lsp/issues/new/choose) and attach the following information, if possible:
3131
- A diagnostic bundle generated by running `path/to/sourcekit-lsp diagnose`.
3232
- Your project including the `.index-build` folder, if possible.

Documentation/Overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ After the message has been decoded, the `SourceKitLSPServer` handles it on its `
1212

1313
To provide language-specific functionality `SourceKitLSPServer` delegates to the types that implement `LanguageService`. This is either `SwiftLanguageService`, which implements language functionality for Swift files based on sourcekitd and swift-syntax, or `ClangLanguageService`, which launches a `clangd` process to provide functionality for C, C++, Objective-C and Objective-C++.
1414

15-
For requests that require knowledge about the project’s index, like call hierarchy or rename of global symbols, `SourceKitLSPServer` enriches the information returned from the language service with information from the [index](http://github.com/apple/indexstore-db/).
15+
For requests that require knowledge about the project’s index, like call hierarchy or rename of global symbols, `SourceKitLSPServer` enriches the information returned from the language service with information from the [index](http://github.com/swiftlang/indexstore-db/).
1616

1717
### sourcekitd
1818

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,14 +467,14 @@ var dependencies: [Package.Dependency] {
467467
let relatedDependenciesBranch = "main"
468468

469469
return [
470-
.package(url: "https://github.com/apple/indexstore-db.git", branch: relatedDependenciesBranch),
471-
.package(url: "https://github.com/apple/swift-package-manager.git", branch: relatedDependenciesBranch),
470+
.package(url: "https://github.com/swiftlang/indexstore-db.git", branch: relatedDependenciesBranch),
471+
.package(url: "https://github.com/swiftlang/swift-package-manager.git", branch: relatedDependenciesBranch),
472472
.package(url: "https://github.com/apple/swift-tools-support-core.git", branch: relatedDependenciesBranch),
473473
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
474-
.package(url: "https://github.com/apple/swift-syntax.git", branch: relatedDependenciesBranch),
474+
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: relatedDependenciesBranch),
475475
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),
476476
// Not a build dependency. Used so the "Format Source Code" command plugin can be used to format sourcekit-lsp
477-
.package(url: "https://github.com/apple/swift-format.git", branch: relatedDependenciesBranch),
477+
.package(url: "https://github.com/swiftlang/swift-format.git", branch: relatedDependenciesBranch),
478478
]
479479
}
480480
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ https://www.swift.org/tools has a list of popular editors that support LSP and c
88

99
## Reporting Issues
1010

11-
If you should hit any issues while using SourceKit-LSP, we appreciate bug reports on [GitHub Issue](https://github.com/apple/sourcekit-lsp/issues/new/choose).
11+
If you should hit any issues while using SourceKit-LSP, we appreciate bug reports on [GitHub Issue](https://github.com/swiftlang/sourcekit-lsp/issues/new/choose).
1212

1313
> [!IMPORTANT]
1414
> SourceKit-LSP does not update its global index in the background or build Swift modules in the background. Thus, a lot of cross-module or global functionality is limited if the project hasn't been built recently. To update the index or rebuild the Swift modules, build the project.

Sources/Diagnose/DiagnoseCommand.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public struct DiagnoseCommand: AsyncParsableCommand {
399399
"""
400400
401401
Bundle created.
402-
When filing an issue at https://github.com/apple/sourcekit-lsp/issues/new,
402+
When filing an issue at https://github.com/swiftlang/sourcekit-lsp/issues/new,
403403
please attach the bundle located at
404404
\(bundlePath.path)
405405
"""

Sources/SKCore/BuildServerBuildSystem.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,13 @@ extension BuildServerBuildSystem: BuildSystem {
355355

356356
public func sourceFiles() async -> [SourceFileInfo] {
357357
// BuildServerBuildSystem does not support syntactic test discovery or background indexing.
358-
// (https://github.com/apple/sourcekit-lsp/issues/1173).
358+
// (https://github.com/swiftlang/sourcekit-lsp/issues/1173).
359359
return []
360360
}
361361

362362
public func addSourceFilesDidChangeCallback(_ callback: @escaping () async -> Void) {
363363
// BuildServerBuildSystem does not support syntactic test discovery or background indexing.
364-
// (https://github.com/apple/sourcekit-lsp/issues/1173).
364+
// (https://github.com/swiftlang/sourcekit-lsp/issues/1173).
365365
}
366366
}
367367

Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
501501

502502
public func defaultLanguage(for document: DocumentURI) -> Language? {
503503
// TODO (indexing): Query The SwiftPM build system for the document's language.
504-
// https://github.com/apple/sourcekit-lsp/issues/1267
504+
// https://github.com/swiftlang/sourcekit-lsp/issues/1267
505505
return nil
506506
}
507507

@@ -557,7 +557,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
557557

558558
// Files that occur before the target in the topological sorting don't depend on it.
559559
// Ideally, we should consult the dependency graph here for more accurate dependency analysis instead of relying on
560-
// a flattened list (https://github.com/apple/sourcekit-lsp/issues/1312).
560+
// a flattened list (https://github.com/swiftlang/sourcekit-lsp/issues/1312).
561561
return self.targets.compactMap { (configuredTarget, value) -> ConfiguredTarget? in
562562
if let minimumTargetIndex, value.index <= minimumTargetIndex {
563563
return nil
@@ -571,7 +571,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
571571
logMessageToIndexLog: @escaping @Sendable (_ taskID: IndexTaskID, _ message: String) -> Void
572572
) async throws {
573573
// TODO (indexing): Support preparation of multiple targets at once.
574-
// https://github.com/apple/sourcekit-lsp/issues/1262
574+
// https://github.com/swiftlang/sourcekit-lsp/issues/1262
575575
for target in targets {
576576
await orLog("Preparing") { try await prepare(singleTarget: target, logMessageToIndexLog: logMessageToIndexLog) }
577577
}
@@ -589,7 +589,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
589589
}
590590

591591
// TODO (indexing): Add a proper 'prepare' job in SwiftPM instead of building the target.
592-
// https://github.com/apple/sourcekit-lsp/issues/1254
592+
// https://github.com/swiftlang/sourcekit-lsp/issues/1254
593593
guard let swift = toolchain.swift else {
594594
logger.error(
595595
"Not preparing because toolchain at \(self.toolchain.identifier) does not contain a Swift compiler"
@@ -761,7 +761,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
761761
public func sourceFiles() -> [SourceFileInfo] {
762762
return fileToTargets.compactMap { (uri, targets) -> SourceFileInfo? in
763763
// We should only set mayContainTests to `true` for files from test targets
764-
// (https://github.com/apple/sourcekit-lsp/issues/1174).
764+
// (https://github.com/swiftlang/sourcekit-lsp/issues/1174).
765765
return SourceFileInfo(
766766
uri: uri,
767767
isPartOfRootProject: targets.contains(where: \.isPartOfRootPackage),

Sources/SKTestSupport/SkipUnless.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public actor SkipUnless {
207207
}
208208

209209
/// SwiftPM moved the location where it stores Swift modules to a subdirectory in
210-
/// https://github.com/apple/swift-package-manager/pull/7103.
210+
/// https://github.com/swiftlang/swift-package-manager/pull/7103.
211211
public static func swiftpmStoresModulesInSubdirectory(
212212
file: StaticString = #filePath,
213213
line: UInt = #line

Sources/SemanticIndex/SemanticIndexManager.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ public final actor SemanticIndexManager {
602602

603603
// TODO (indexing): When we can index multiple targets concurrently in SwiftPM, increase the batch size to half the
604604
// processor count, so we can get parallelism during preparation.
605-
// https://github.com/apple/sourcekit-lsp/issues/1262
605+
// https://github.com/swiftlang/sourcekit-lsp/issues/1262
606606
for targetsBatch in sortedTargets.partition(intoBatchesOfSize: 1) {
607607
let preparationTaskID = UUID()
608608
let indexTask = Task(priority: priority) {
@@ -614,7 +614,7 @@ public final actor SemanticIndexManager {
614614
for target in targetsBatch {
615615
// TODO (indexing): Once swiftc supports indexing of multiple files in a single invocation, increase the
616616
// batch size to allow it to share AST builds between multiple files within a target.
617-
// https://github.com/apple/sourcekit-lsp/issues/1268
617+
// https://github.com/swiftlang/sourcekit-lsp/issues/1268
618618
for fileBatch in filesByTarget[target]!.partition(intoBatchesOfSize: 1) {
619619
taskGroup.addTask {
620620
await self.updateIndexStore(

Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public struct UpdateIndexStoreTaskDescription: IndexTaskDescription {
169169
let filesToIndex = filesToIndex.sorted(by: { $0.file.sourceFile.stringValue < $1.file.sourceFile.stringValue })
170170
// TODO (indexing): Once swiftc supports it, we should group files by target and index files within the same
171171
// target together in one swiftc invocation.
172-
// https://github.com/apple/sourcekit-lsp/issues/1268
172+
// https://github.com/swiftlang/sourcekit-lsp/issues/1268
173173
for file in filesToIndex {
174174
await updateIndexStore(forSingleFile: file.file, in: file.target)
175175
}

Tests/SourceKitLSPTests/PullDiagnosticsTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ final class PullDiagnosticsTests: XCTestCase {
4242
XCTAssertEqual(diagnostic.range, Position(line: 1, utf16index: 2)..<Position(line: 1, utf16index: 9))
4343
}
4444

45-
/// Test that we can get code actions for pulled diagnostics (https://github.com/apple/sourcekit-lsp/issues/776)
45+
/// Test that we can get code actions for pulled diagnostics (https://github.com/swiftlang/sourcekit-lsp/issues/776)
4646
func testCodeActions() async throws {
4747
let testClient = try await TestSourceKitLSPClient(
4848
capabilities: ClientCapabilities(

Tests/SourceKitLSPTests/WorkspaceSymbolsTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class WorkspaceSymbolsTests: XCTestCase {
6868
let response = try await project.testClient.send(WorkspaceSymbolsRequest(query: "funcFrom"))
6969

7070
// Ideally, the item from the current package (PackageB) should be returned before the item from PackageA
71-
// https://github.com/apple/sourcekit-lsp/issues/1094
71+
// https://github.com/swiftlang/sourcekit-lsp/issues/1094
7272
XCTAssertEqual(
7373
response,
7474
[

0 commit comments

Comments
 (0)