github/shellcheck
1
0
Fork 0
mirror of https://github.com/koalaman/shellcheck synced 2025-07-11 15:46:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'opqaque-interface' of https://github.com/ngzhian/shellcheck into ngzhian-opqaque-interface

Browse source
This commit is contained in:
Vidar Holen 2018-08-18 20:31:54 -07:00
commit 932e2b3538
8 changed files with 186 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ShellCheck/Parser.hs
View file

@ -3051,11 +3051,11 @@ debugParseScript string =
result {
-- Remove the noisiest parts
prTokenPositions = Map.fromList [
(Id 0, (Position {
(Id 0, (newPosition {
posFile = "removed for clarity",
posLine = -1,
posColumn = -1
}, Position {
}, newPosition {
posFile = "removed for clarity",
posLine = -1,
posColumn = -1
@ -3144,14 +3144,14 @@ parseShell env name contents = do
(result, state) <- runParser env (parseWithNotes readScript) name contents
case result of
Right (script, userstate) ->
return ParseResult {
return newParseResult {
prComments = map toPositionedComment $ nub $ parseNotes userstate ++ parseProblems state,
prTokenPositions = Map.map startEndPosToPos (positionMap userstate),
prRoot = Just $
reattachHereDocs script (hereDocMap userstate)
}
Left err ->
return ParseResult {
return newParseResult {
prComments =
map toPositionedComment $
notesForContext (contextStack state)
@ -3218,10 +3218,18 @@ reattachHereDocs root map =
toPositionedComment :: ParseNote -> PositionedComment
toPositionedComment (ParseNote start end severity code message) =
PositionedComment (posToPos start) (posToPos end) $ Comment severity code message
newPositionedComment {
pcStartPos = (posToPos start)
, pcEndPos = (posToPos end)
, pcComment = newComment {
cSeverity = severity
, cCode = code
, cMessage = message
}
}
posToPos :: SourcePos -> Position
posToPos sp = Position {
posToPos sp = newPosition {
posFile = sourceName sp,
posLine = fromIntegral $ sourceLine sp,
posColumn = fromIntegral $ sourceColumn sp