CrystalSplitter/ghcitui
1
1
Fork 0
mirror of https://github.com/CrystalSplitter/ghcitui.git synced 2024-08-16 06:30:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow apostraphes interspersed in token names

Browse Source 
It turns out these are also allowed--and thus we need to be
able to match on them.
This commit is contained in:
CrystalSplitter 2024-03-07 00:55:43 -08:00 committed by Jordan R AW
parent b1ef23191e
commit 4987c7a49a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ghcitui-core/Ghcitui/Ghcid/ParseContext.hs
View File

@ -68,9 +68,9 @@ parseFile s
-- | Parse a source range structure into a SourceRange object.
parseSourceRange :: T.Text -> Loc.SourceRange
parseSourceRange s
-- Matches (12,34)-(56,78)
-- Matches (12,34)-(56,78) ... (line 12, column 34 to line 56, column 78)
| Just mr <- matches "\\(([0-9]+),([0-9]+)\\)-\\(([0-9]+),([0-9]+)\\)" = fullRange mr
-- Matches 12:34-56
-- Matches 12:34-56 ... (line 12, columns 34 to 56)
| Just mr <- matches "([0-9]+):([0-9]+)-([0-9]+)" = lineColRange mr
-- Matches 12:34
| Just mr <- matches "([0-9]+):([0-9]+)" = lineColSingle mr
@ -136,7 +136,7 @@ eInfoLine contextText =
mStopLineMatchRes = foldr (\n acc -> acc <|> stopReg n) Nothing splits
-- Match on the "Stopped in ..." line.
stopReg :: T.Text -> Maybe (MatchResult T.Text)
stopReg s = s =~~ ("^[ \t]*Stopped in ([[:alnum:]_.()]+'*),(.*)" :: T.Text)
stopReg s = s =~~ ("^[ \t]*Stopped in ([[:alnum:]_.()']+),(.*)" :: T.Text)
parseBreakResponse :: T.Text -> Either T.Text [Loc.ModuleLoc]
parseBreakResponse t
@ -212,7 +212,7 @@ parseShowModules t
where
stripped = T.strip t
matchingLines = mapMaybe matching . T.lines <$> lastMay (splitBy ghcidPrompt stripped)
reg = "([[:alnum:]_.]+)[ \\t]+\\( *([^,]*),.*\\)" :: T.Text
reg = "([[:alnum:]_.']+)[ \\t]+\\( *([^,]*),.*\\)" :: T.Text
matching :: T.Text -> Maybe (MatchResult T.Text)
matching = (=~~ reg)