Merge pull request #938 from andre-richter/fix-assume-filename

allevato · web-flow · commit 7f3e6b6254de · 2025-02-19T05:00:56.000-08:00
Fix rejected assumeFilename when path argument is '-'
diff --git a/Sources/swift-format/Subcommands/LintFormatOptions.swift b/Sources/swift-format/Subcommands/LintFormatOptions.swift
@@ -107,7 +107,7 @@ struct LintFormatOptions: ParsableArguments {
       throw ValidationError("'--recursive' is only valid when formatting or linting files")
     }
 
-    if assumeFilename != nil && !paths.isEmpty {
+    if assumeFilename != nil && !(paths.isEmpty || paths == ["-"]) {
       throw ValidationError("'--assume-filename' is only valid when reading from stdin")
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ struct LintFormatOptions: ParsableArguments {`
`107`	`107`	`throw ValidationError("'--recursive' is only valid when formatting or linting files")`
`108`	`108`	`}`
`109`	`109`
`110`		`- if assumeFilename != nil && !paths.isEmpty {`
	`110`	`+ if assumeFilename != nil && !(paths.isEmpty \|\| paths == ["-"]) {`
`111`	`111`	`throw ValidationError("'--assume-filename' is only valid when reading from stdin")`
`112`	`112`	`}`
`113`	`113`