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

Merge pull request #2602 from DoxasticFox/issue-2550 

Fix false positive for SC2312 when using `time`
This commit is contained in:
Vidar Holen 2022-10-09 11:55:39 -07:00 committed by GitHub
parent d71d6ff294 43aca62ca7
commit fcba462a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ShellCheck/Analytics.hs
View File

@ -4765,8 +4765,12 @@ prop_checkExtraMaskedReturns32 = verifyNotTree checkExtraMaskedReturns "false <
prop_checkExtraMaskedReturns33 = verifyNotTree checkExtraMaskedReturns "{ false || true; } | true" prop_checkExtraMaskedReturns33 = verifyNotTree checkExtraMaskedReturns "{ false || true; } | true"
prop_checkExtraMaskedReturns34 = verifyNotTree checkExtraMaskedReturns "{ false || :; } | true" prop_checkExtraMaskedReturns34 = verifyNotTree checkExtraMaskedReturns "{ false || :; } | true"
prop_checkExtraMaskedReturns35 = verifyTree checkExtraMaskedReturns "f() { local -r x=$(false); }" prop_checkExtraMaskedReturns35 = verifyTree checkExtraMaskedReturns "f() { local -r x=$(false); }"
prop_checkExtraMaskedReturns36 = verifyNotTree checkExtraMaskedReturns "time false"
prop_checkExtraMaskedReturns37 = verifyNotTree checkExtraMaskedReturns "time $(time false)"
prop_checkExtraMaskedReturns38 = verifyTree checkExtraMaskedReturns "x=$(time time time false) time $(time false)"
checkExtraMaskedReturns params t = runNodeAnalysis findMaskingNodes params t checkExtraMaskedReturns params t =
runNodeAnalysis findMaskingNodes params (removeTransparentCommands t)
where where
findMaskingNodes _ (T_Arithmetic _ list) = findMaskedNodesInList [list] findMaskingNodes _ (T_Arithmetic _ list) = findMaskedNodesInList [list]
findMaskingNodes _ (T_Array _ list) = findMaskedNodesInList $ allButLastSimpleCommands list findMaskingNodes _ (T_Array _ list) = findMaskedNodesInList $ allButLastSimpleCommands list
@ -4799,6 +4803,13 @@ checkExtraMaskedReturns params t = runNodeAnalysis findMaskingNodes params t
where where
simpleCommands = filter containsSimpleCommand cmds simpleCommands = filter containsSimpleCommand cmds
removeTransparentCommands t =
doTransform go t
where
go cmd@(T_SimpleCommand id assigns (_:args)) | isTransparentCommand cmd
= T_SimpleCommand id assigns args
go t = t
inform t = info (getId t) 2312 ("Consider invoking this command " inform t = info (getId t) 2312 ("Consider invoking this command "
++ "separately to avoid masking its return value (or use '|| true' " ++ "separately to avoid masking its return value (or use '|| true' "
++ "to ignore).") ++ "to ignore).")
@ -4831,6 +4842,10 @@ checkExtraMaskedReturns params t = runNodeAnalysis findMaskingNodes params t
,"shopt" ,"shopt"
] ]
isTransparentCommand t = fromMaybe False $ do
basename <- getCommandBasename t
return $ basename == "time"
parentChildPairs t = go $ parents params t parentChildPairs t = go $ parents params t
where where
go (child:parent:rest) = (parent, child):go (parent:rest) go (child:parent:rest) = (parent, child):go (parent:rest)