From 467dfe07b684cf0d00b97cf3d9a212def167a1df Mon Sep 17 00:00:00 2001 From: Vidar Holen Date: Wed, 23 May 2018 19:51:36 -0700 Subject: [PATCH] Add a unit test and separate ids for 884eff0c --- src/ShellCheck/Checker.hs | 4 ++++ src/ShellCheck/Parser.hs | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ShellCheck/Checker.hs b/src/ShellCheck/Checker.hs index 5b0134c..72259ad 100644 --- a/src/ShellCheck/Checker.hs +++ b/src/ShellCheck/Checker.hs @@ -194,5 +194,9 @@ prop_filewideAnnotationBase2 = [2086, 2181] == check "true\n[ $? == 0 ] && echo prop_filewideAnnotation8 = null $ 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 [] runTests = $quickCheckAll diff --git a/src/ShellCheck/Parser.hs b/src/ShellCheck/Parser.hs index edfb2e2..2e198d3 100644 --- a/src/ShellCheck/Parser.hs +++ b/src/ShellCheck/Parser.hs @@ -1918,11 +1918,12 @@ readSource pos t@(T_Redirecting _ _ (T_SimpleCommand _ _ (cmd:file:_))) = do "Not following: " ++ err return t Right script -> do - id <- getNextIdAt pos + id1 <- getNextIdAt pos + id2 <- getNextIdAt pos let included = do 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 parseNoteAt pos WarningC 1094