7x31
/
shellcheck
mirror of https://github.com/koalaman/shellcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite SC2032 warning and mention line number (fixes #2353)

This commit is contained in:
Vidar Holen 2021-11-14 21:34:21 -08:00
parent d9a9d5db86
commit 499c99372e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ShellCheck/Analytics.hs
View File

@ -2297,7 +2297,7 @@ checkFunctionsUsedExternally params t =
let args = skipOver t argv let args = skipOver t argv
let argStrings = map (\x -> (fromMaybe "" $ getLiteralString x, x)) args let argStrings = map (\x -> (fromMaybe "" $ getLiteralString x, x)) args
let candidates = getPotentialCommands name argStrings let candidates = getPotentialCommands name argStrings
mapM_ (checkArg name) candidates mapM_ (checkArg name (getId t)) candidates
_ -> return () _ -> return ()
checkCommand _ _ = return () checkCommand _ _ = return ()
@ -2323,14 +2323,19 @@ checkFunctionsUsedExternally params t =
functionsAndAliases = Map.union (functions t) (aliases t) functionsAndAliases = Map.union (functions t) (aliases t)
checkArg cmd (_, arg) = sequence_ $ do patternContext id =
case posLine . fst <$> Map.lookup id (tokenPositions params) of
Just l -> " on line " <> show l <> "."
_ -> "."
checkArg cmd cmdId (_, arg) = sequence_ $ do
literalArg <- getUnquotedLiteral arg -- only consider unquoted literals literalArg <- getUnquotedLiteral arg -- only consider unquoted literals
definitionId <- Map.lookup literalArg functionsAndAliases definitionId <- Map.lookup literalArg functionsAndAliases
return $ do return $ do
warn (getId arg) 2033 warn (getId arg) 2033
"Shell functions can't be passed to external commands." "Shell functions can't be passed to external commands. Use separate script or sh -c."
info definitionId 2032 $ info definitionId 2032 $
"Use own script or sh -c '..' to run this from " ++ cmd ++ "." "This function can't be invoked via " ++ cmd ++ patternContext cmdId
prop_checkUnused0 = verifyNotTree checkUnusedAssignments "var=foo; echo $var" prop_checkUnused0 = verifyNotTree checkUnusedAssignments "var=foo; echo $var"
prop_checkUnused1 = verifyTree checkUnusedAssignments "var=foo; echo $bar" prop_checkUnused1 = verifyTree checkUnusedAssignments "var=foo; echo $bar"