Skip to content

Fix --working-directory having no effect #6908

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
haruna-miyamoto wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix --working-directory having no effect #6908

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
2f32743
Fix `--working-directory` having no effect
haruna-miyamoto Sep 14, 2026
15789fd
Merge branch 'main' into fix/working-directory-defer-scope
haruna-miyamoto Sep 28, 2026
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
[Hokila](https://github.com/Hokila)
[#6897](https://github.com/realm/SwiftLint/issues/6897)

* Fix `--working-directory` having no effect. The `defer` restoring the previous
directory was scoped to the `if` block, so it ran before linting started.
[haruna-miyamoto](https://github.com/haruna-miyamoto)
[#6907](https://github.com/realm/SwiftLint/issues/6907)

## 0.65.1: Fresh Folded Fixtures

### Breaking
Expand Down
13 changes: 7 additions & 6 deletions Source/SwiftLintFramework/LintOrAnalyzeCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,14 @@ package struct LintOrAnalyzeOptions {
package struct LintOrAnalyzeCommand {
package static func run(_ options: LintOrAnalyzeOptions) async throws {
Request.disableSourceKitOverride = options.mode == .lint && options.disableSourceKit
if let workingDirectory = options.workingDirectory {
let currentDirectory = FileManager.default.currentDirectoryPath
defer {
if !FileManager.default.changeCurrentDirectoryPath(currentDirectory) {
queuedFatalError("Could not change back to the original directory '\(currentDirectory)'.")
}
var currentDirectory: String?
defer {
if let currentDirectory, !FileManager.default.changeCurrentDirectoryPath(currentDirectory) {
queuedFatalError("Could not change back to the original directory '\(currentDirectory)'.")
}
}
if let workingDirectory = options.workingDirectory {
currentDirectory = FileManager.default.currentDirectoryPath
if !FileManager.default.changeCurrentDirectoryPath(workingDirectory) {
throw SwiftLintError.usageError(
description: """
Expand Down