Skip to content

Fix sourcekit-lsp diagnostics counter #1834

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix sourcekit-lsp diagnostics counter #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37426fd
Fix sourcekit diagnostics counter
award999 Sep 16, 2025
3772aa4
Update changelog
award999 Sep 16, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- Improve error handling when the swift path is misconfigured ([#1801](https://github.com/swiftlang/vscode-swift/pull/1801))
- Fix an error when performing "Run/Debug Tests Multiple Times" on Linux ([#1824](https://github.com/swiftlang/vscode-swift/pull/1824))
- Fix the `> Swift: Run Swift Script` command not running unless a Swift Package folder is open ([#1832](https://github.com/swiftlang/vscode-swift/pull/1832))
- Fix the SourceKit-LSP diagnostics reported progress ([#1799](https://github.com/swiftlang/vscode-swift/pull/1799))

## 2.11.20250806 - 2025-08-06

Expand Down
14 changes: 10 additions & 4 deletions src/commands/captureDiagnostics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,15 @@ async function sourcekitDiagnose(ctx: FolderContext, dir: string) {
},
async progress => {
progress.report({ message: "Diagnosing SourceKit-LSP..." });
const writableStream = progressUpdatingWritable(percent =>
progress.report({ message: `Diagnosing SourceKit-LSP: ${percent}%` })
);
let lastProgress = 0;
const writableStream = progressUpdatingWritable(percentStr => {
const percent = parseInt(percentStr, 10);
progress.report({
message: `Diagnosing SourceKit-LSP: ${percent}%`,
increment: percent - lastProgress,
});
lastProgress = percent;
});

await execFileStreamOutput(
serverPath,
Expand Down Expand Up @@ -362,7 +368,7 @@ function progressUpdatingWritable(updateProgress: (str: string) => void): Writab
return new Writable({
write(chunk, _encoding, callback) {
const str = (chunk as Buffer).toString("utf8").trim();
const percent = /^([0-9])+%/.exec(str);
const percent = /^([0-9]+)%/.exec(str);
if (percent && percent[1]) {
updateProgress(percent[1]);
}
Expand Down
Loading