Skip to content
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

shfmt: state -ln=auto on posix parse errors #867

Merged
merged 2 commits into from
May 27, 2022
Merged

shfmt: state -ln=auto on posix parse errors #867

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
57f7f0c
shfmt: state -ln=auto on posix parse errors
riacataquian May 27, 2022
6f3a94a
shfmt: remove explict -ln=auto on one of the tests
riacataquian May 27, 2022
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
9 changes: 6 additions & 3 deletions cmd/shfmt/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,18 +426,21 @@ func formatPath(path string, checkShebang bool) error {
return formatBytes(readBuf.Bytes(), path, fileLang)
}

func formatBytes(src []byte, path string, lang syntax.LangVariant) error {
func formatBytes(src []byte, path string, fileLang syntax.LangVariant) error {
if useEditorConfig {
props, err := ecQuery.Find(path)
if err != nil {
return err
}
propsOptions(lang, props)
propsOptions(fileLang, props)
} else {
syntax.Variant(lang)(parser)
syntax.Variant(fileLang)(parser)
}
prog, err := parser.Parse(bytes.NewReader(src), path)
if err != nil {
if s, ok := err.(syntax.LangError); ok && lang.val == syntax.LangAuto {
return fmt.Errorf("%w (parsed as %s via -%s=%s)", s, fileLang, lang.short, lang.val)
}
return err
}
if simplify.val {
Expand Down
15 changes: 15 additions & 0 deletions cmd/shfmt/testdata/scripts/flags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ stdin input-mksh
shfmt -ln=auto -filename=input.mksh
stdout 'coprocess'

# Explicitly state language on parse errors
stdin input-bash-arrays
! shfmt -ln=auto -filename=input.sh
stderr 'parsed as posix via -ln=auto'

stdin input-bash-extglobs
! shfmt -filename=input.sh
stderr 'parsed as posix via -ln=auto'
riacataquian marked this conversation as resolved.
Show resolved Hide resolved

stdin flags-input
shfmt -i 2
cmp stdout flags-output.indent-golden
Expand Down Expand Up @@ -151,6 +160,12 @@ coprocess |&
-- input-mksh-shebang --
#!/bin/mksh
coprocess |&
-- input-bash-extglobs --
#!/bin/sh
echo !(a)
-- input-bash-arrays --
#!/bin/sh
foo=(bar)

-- flags-input --
foo() {
Expand Down