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

Add a unit test and separate ids for 884eff0c

This commit is contained in:
Vidar Holen 2018-05-23 19:51:36 -07:00
parent d140388bea
commit 467dfe07b6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ShellCheck/Checker.hs
View File

@ -194,5 +194,9 @@ prop_filewideAnnotationBase2 = [2086, 2181] == check "true\n[ $? == 0 ] && echo
prop_filewideAnnotation8 = null $ prop_filewideAnnotation8 = null $
check "# Disable $? warning\n#shellcheck disable=SC2181\n# Disable quoting warning\n#shellcheck disable=2086\ntrue\n[ $? == 0 ] && echo $1" check "# Disable $? warning\n#shellcheck disable=SC2181\n# Disable quoting warning\n#shellcheck disable=2086\ntrue\n[ $? == 0 ] && echo $1"
prop_sourcePartOfOriginalScript = -- #1181: -x disabled posix warning for 'source'
2039 `elem` checkWithIncludes [("./saywhat.sh", "echo foo")] "#!/bin/sh\nsource ./saywhat.sh"
return [] return []
runTests = $quickCheckAll runTests = $quickCheckAll

5
src/ShellCheck/Parser.hs
View File

@ -1918,11 +1918,12 @@ readSource pos t@(T_Redirecting _ _ (T_SimpleCommand _ _ (cmd:file:_))) = do
"Not following: " ++ err "Not following: " ++ err
return t return t
Right script -> do Right script -> do
id <- getNextIdAt pos id1 <- getNextIdAt pos
id2 <- getNextIdAt pos
let included = do let included = do
src <- subRead filename script src <- subRead filename script
return $ T_SourceCommand id t (T_Include id src) return $ T_SourceCommand id1 t (T_Include id2 src)
let failed = do let failed = do
parseNoteAt pos WarningC 1094 parseNoteAt pos WarningC 1094