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

Change usage of endPosOfStartId to startSpan and endSpan

This commit is contained in:
Ng Zhi An 2018-06-12 22:11:11 -07:00
parent 1699c9e9ba
commit e717802de1
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ShellCheck/Parser.hs
View File

@ -209,16 +209,6 @@ zeroWidthSpan = do
id <- endSpan start id <- endSpan start
return id return id
endPosOfStartId s = do
endPos <- getPosition
state <- getState
let setEndPos (start, _) = Just (start, Just endPos)
let newMap = Map.update setEndPos s (positionMap state)
putState $ state {
lastId = s,
positionMap = newMap
}
addToHereDocMap id list = do addToHereDocMap id list = do
state <- getState state <- getState
let map = hereDocMap state let map = hereDocMap state
@ -1100,7 +1090,7 @@ prop_readSingleQuoted6 = isOk readSimpleCommand "foo='bar cow 'arg"
prop_readSingleQuoted7 = isOk readSingleQuoted "'foo\x201C\&bar'" prop_readSingleQuoted7 = isOk readSingleQuoted "'foo\x201C\&bar'"
prop_readSingleQuoted8 = isWarning readSingleQuoted "'foo\x2018\&bar'" prop_readSingleQuoted8 = isWarning readSingleQuoted "'foo\x2018\&bar'"
readSingleQuoted = called "single quoted string" $ do readSingleQuoted = called "single quoted string" $ do
id <- getNextId start <- startSpan
startPos <- getPosition startPos <- getPosition
singleQuote singleQuote
s <- many readSingleQuotedPart s <- many readSingleQuotedPart
@ -1118,7 +1108,7 @@ readSingleQuoted = called "single quoted string" $ do
when ('\n' `elem` string && not ("\n" `isPrefixOf` string)) $ when ('\n' `elem` string && not ("\n" `isPrefixOf` string)) $
suggestForgotClosingQuote startPos endPos "single quoted string" suggestForgotClosingQuote startPos endPos "single quoted string"
endPosOfStartId id id <- endSpan start
return (T_SingleQuoted id string) return (T_SingleQuoted id string)
readSingleQuotedLiteral = do readSingleQuotedLiteral = do
@ -1554,11 +1544,11 @@ prop_readDollarBraced2 = isOk readDollarBraced "${foo/'{cow}'}"
prop_readDollarBraced3 = isOk readDollarBraced "${foo%%$(echo cow\\})}" prop_readDollarBraced3 = isOk readDollarBraced "${foo%%$(echo cow\\})}"
prop_readDollarBraced4 = isOk readDollarBraced "${foo#\\}}" prop_readDollarBraced4 = isOk readDollarBraced "${foo#\\}}"
readDollarBraced = called "parameter expansion" $ do readDollarBraced = called "parameter expansion" $ do
id <- getNextId start <- startSpan
try (string "${") try (string "${")
word <- readDollarBracedWord word <- readDollarBracedWord
char '}' char '}'
endPosOfStartId id id <- endSpan start
return $ T_DollarBraced id word return $ T_DollarBraced id word
prop_readDollarExpansion1= isOk readDollarExpansion "$(echo foo; ls\n)" prop_readDollarExpansion1= isOk readDollarExpansion "$(echo foo; ls\n)"
@ -1579,13 +1569,13 @@ prop_readDollarVariable5 = isWarning (readDollarVariable >> string "[f") "$arr[f
readDollarVariable :: Monad m => SCParser m Token readDollarVariable :: Monad m => SCParser m Token
readDollarVariable = do readDollarVariable = do
id <- getNextId start <- startSpan
pos <- getPosition pos <- getPosition
let singleCharred p = do let singleCharred p = do
n <- p n <- p
value <- wrap [n] value <- wrap [n]
endPosOfStartId id id <- endSpan start
return $ (T_DollarBraced id value) return $ (T_DollarBraced id value)
let positional = do let positional = do
@ -1599,7 +1589,7 @@ readDollarVariable = do
let regular = do let regular = do
name <- readVariableName name <- readVariableName
value <- wrap name value <- wrap name
endPosOfStartId id id <- endSpan start
return (T_DollarBraced id value) `attempting` do return (T_DollarBraced id value) `attempting` do
lookAhead $ char '[' lookAhead $ char '['
parseNoteAt pos ErrorC 1087 "Use braces when expanding arrays, e.g. ${array[idx]} (or ${var}[.. to quiet)." parseNoteAt pos ErrorC 1087 "Use braces when expanding arrays, e.g. ${array[idx]} (or ${var}[.. to quiet)."