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

Allow unrecognized directives with warnings.

This commit is contained in:
Vidar Holen 2016-10-14 12:14:20 -07:00
parent 6b62b5bf7e
commit 88c56ecd53
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ShellCheck/Parser.hs
View File

@ -869,10 +869,11 @@ readAnnotationPrefix = do
prop_readAnnotation1 = isOk readAnnotation "# shellcheck disable=1234,5678\n" prop_readAnnotation1 = isOk readAnnotation "# shellcheck disable=1234,5678\n"
prop_readAnnotation2 = isOk readAnnotation "# shellcheck disable=SC1234 disable=SC5678\n" prop_readAnnotation2 = isOk readAnnotation "# shellcheck disable=SC1234 disable=SC5678\n"
prop_readAnnotation3 = isOk readAnnotation "# shellcheck disable=SC1234 source=/dev/null disable=SC5678\n" prop_readAnnotation3 = isOk readAnnotation "# shellcheck disable=SC1234 source=/dev/null disable=SC5678\n"
prop_readAnnotation4 = isWarning readAnnotation "# shellcheck cats=dogs disable=SC1234\n"
readAnnotation = called "shellcheck annotation" $ do readAnnotation = called "shellcheck annotation" $ do
try readAnnotationPrefix try readAnnotationPrefix
many1 linewhitespace many1 linewhitespace
values <- many1 (readDisable <|> readSourceOverride <|> readShellOverride) values <- many1 (readDisable <|> readSourceOverride <|> readShellOverride <|> anyKey)
linefeed linefeed
many linewhitespace many linewhitespace
return $ concat values return $ concat values
@ -904,6 +905,13 @@ readAnnotation = called "shellcheck annotation" $ do
many linewhitespace many linewhitespace
return value return value
anyKey = do
pos <- getPosition
anyChar `reluctantlyTill1` whitespace
many linewhitespace
parseNoteAt pos WarningC 1107 "This directive is unknown. It will be ignored."
return []
readAnnotations = do readAnnotations = do
annotations <- many (readAnnotation `thenSkip` allspacing) annotations <- many (readAnnotation `thenSkip` allspacing)
return $ concat annotations return $ concat annotations