Skip to content

Fix panic when passing @ response file argument to CLI #3859

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

Merged
RyanCavanaugh merged 6 commits into from
May 21, 2026
+28 −3
Merged

Fix panic when passing @ response file argument to CLI #3859

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc46d95
Initial plan
Copilot May 15, 2026
730dcde
Fix @ response file crash by normalizing path to absolute before reading
Copilot May 15, 2026
d8554e2
Change ParseCommandLineTestWorker currentDirectory from variadic to p…
Copilot May 15, 2026
d7cda1e
Merge branch 'main' into copilot/fix-file-argument-crash
RyanCavanaugh May 15, 2026
155f409
Use "/" as CWD instead of empty string in test call site
Copilot May 15, 2026
4d5e296
Merge remote-tracking branch 'origin/main' into copilot/fix-file-argu…
Copilot May 20, 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
8 changes: 6 additions & 2 deletions internal/tsoptions/commandlineparser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type commandLineParser struct {
workerDiagnostics *ParseCommandLineWorkerDiagnostics
optionsMap *NameMap
fs vfs.FS
currentDirectory string
options *collections.OrderedMap[string, any]
fileNames []string
errors []*ast.Diagnostic
Expand All @@ -45,7 +46,7 @@ func ParseCommandLine(
if commandLine == nil {
commandLine = []string{}
}
parser := parseCommandLineWorker(CompilerOptionsDidYouMeanDiagnostics, commandLine, host.FS())
parser := parseCommandLineWorker(CompilerOptionsDidYouMeanDiagnostics, commandLine, host.FS(), host.GetCurrentDirectory())
optionsWithAbsolutePaths := convertToOptionsWithAbsolutePaths(parser.options.Clone(), CommandLineCompilerOptionsMap, host.GetCurrentDirectory())
compilerOptions := convertMapToOptions(optionsWithAbsolutePaths, &compilerOptionsParser{&core.CompilerOptions{}}).CompilerOptions
watchOptions := convertMapToOptions(optionsWithAbsolutePaths, &watchOptionsParser{&core.WatchOptions{}}).WatchOptions
Expand All @@ -66,7 +67,7 @@ func ParseBuildCommandLine(
if commandLine == nil {
commandLine = []string{}
}
parser := parseCommandLineWorker(buildOptionsDidYouMeanDiagnostics, commandLine, host.FS())
parser := parseCommandLineWorker(buildOptionsDidYouMeanDiagnostics, commandLine, host.FS(), host.GetCurrentDirectory())
compilerOptions := &core.CompilerOptions{}
for key, value := range parser.options.Entries() {
buildOption := BuildNameMap.Get(key)
Expand Down Expand Up @@ -114,9 +115,11 @@ func parseCommandLineWorker(
parseCommandLineWithDiagnostics *ParseCommandLineWorkerDiagnostics,
commandLine []string,
fs vfs.FS,
currentDirectory string,
) *commandLineParser {
parser := &commandLineParser{
fs: fs,
currentDirectory: currentDirectory,
workerDiagnostics: parseCommandLineWithDiagnostics,
fileNames: []string{},
options: &collections.OrderedMap[string, any]{},
Expand Down Expand Up @@ -163,6 +166,7 @@ func getInputOptionName(input string) string {
}

func (p *commandLineParser) parseResponseFile(fileName string) {
fileName = tspath.GetNormalizedAbsolutePath(fileName, p.currentDirectory)
fileContents, errors := tryReadFile(fileName, func(fileName string) (string, bool) {
if p.fs == nil {
return "", false
Expand Down
18 changes: 18 additions & 0 deletions internal/tsoptions/commandlineparser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,24 @@ func TestCommandLineParseResult(t *testing.T) {
}
}

func TestResponseFileDoesNotPanic(t *testing.T) {
t.Parallel()

// Passing `@` with an empty or relative filename should not panic.
// It should produce a diagnostic error instead.
t.Run("empty response file", func(t *testing.T) {
t.Parallel()
parsed := tsoptions.ParseCommandLineTestWorker(nil, []string{"@"}, osvfs.FS(), "/")
assert.Assert(t, len(parsed.Errors) > 0, "expected an error for empty response file name")
})

t.Run("relative response file", func(t *testing.T) {
t.Parallel()
parsed := tsoptions.ParseCommandLineTestWorker(nil, []string{"@blah"}, osvfs.FS(), "/")
assert.Assert(t, len(parsed.Errors) > 0, "expected an error for non-existent response file")
})
}

func TestCustomConditionsNullOverride(t *testing.T) {
t.Parallel()

Expand Down
6 changes: 6 additions & 0 deletions internal/tsoptions/export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ func ParseCommandLineTestWorker(
decls []*CommandLineOption,
commandLine []string,
fs vfs.FS,
currentDirectory ...string,
Copy link
Copy Markdown
Member

@DanielRosenwasser DanielRosenwasser May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot why is this ...string instead of just a singular parameter?

Copy link
Copy Markdown
Contributor Author

Copilot AI May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No good reason — I used variadic to avoid updating the existing call site that omitted it, but that's not worth the indirection. Changed to a plain string parameter and added the "" argument at the existing call site.

) *TestCommandLineParser {
cwd := ""
if len(currentDirectory) > 0 {
cwd = currentDirectory[0]
}
parser := &commandLineParser{
fs: fs,
currentDirectory: cwd,
workerDiagnostics: CompilerOptionsDidYouMeanDiagnostics,
fileNames: []string{},
options: &collections.OrderedMap[string, any]{},
Expand Down