Skip to content

. #1817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

. #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac79ea2
Added `fba` scheme to the list of supported schemes.
elongl Sep 1, 2025
4be43ad
Updated the default `diagnosticsCollection`.
elongl Sep 1, 2025
82c4c87
Supporting FBA URIs by conversion.
elongl Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
},
"swift.diagnosticsCollection": {
"type": "string",
"default": "keepSourceKit",
"default": "onlySwiftc",
"markdownDescription": "Controls how diagnostics from the various providers are merged into the collection of `swift` errors and warnings shown in the Problems pane.",
"enum": [
"onlySwiftc",
Expand Down
2 changes: 1 addition & 1 deletion src/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ const configuration = {
get diagnosticsCollection(): DiagnosticCollectionOptions {
return vscode.workspace
.getConfiguration("swift")
.get<DiagnosticCollectionOptions>("diagnosticsCollection", "keepSourceKit");
.get<DiagnosticCollectionOptions>("diagnosticsCollection", "onlySwiftc");
},
/** set the -diagnostic-style option when running `swift` tasks */
get diagnosticsStyle(): DiagnosticStyle {
Expand Down
1 change: 1 addition & 0 deletions src/sourcekit-lsp/LanguageClientConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ export class LanguagerClientDocumentSelectors {
{ scheme: "sourcekit-lsp", language: "swift" },
{ scheme: "file", language: "swift" },
{ scheme: "untitled", language: "swift" },
{ scheme: "fba", language: "swift" },
{ scheme: "file", language: "objective-c" },
{ scheme: "untitled", language: "objective-c" },
{ scheme: "file", language: "objective-cpp" },
Expand Down
8 changes: 8 additions & 0 deletions src/sourcekit-lsp/uriConverters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import * as vscode from "vscode";

export const uriConverters = {
protocol2Code: (value: string): vscode.Uri => {
if (value.startsWith("fba:")) {
// SourceKit-LSP does not support non-file schemes, so we need to convert it.
return vscode.Uri.file(vscode.Uri.parse(value).fsPath);
}
if (!value.startsWith("sourcekit-lsp:")) {
// Use the default implementation for all schemes other than sourcekit-lsp, as defined here:
// https://github.com/microsoft/vscode-languageserver-node/blob/14ddabfc22187b698e83ecde072247aa40727308/client/src/common/protocolConverter.ts#L286
Expand Down Expand Up @@ -69,6 +73,10 @@ export const uriConverters = {
});
},
code2Protocol: (value: vscode.Uri): string => {
if (value.scheme === "fba") {
// SourceKit-LSP does not support non-file schemes, so we need to convert it.
return vscode.Uri.file(value.fsPath).toString();
}
if (value.scheme !== "sourcekit-lsp") {
// Use the default implementation for all schemes other than sourcekit-lsp, as defined here:
// https://github.com/microsoft/vscode-languageserver-node/blob/14ddabfc22187b698e83ecde072247aa40727308/client/src/common/codeConverter.ts#L155
Expand Down