github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 14:21:31 +03:00
Code Issues Projects Releases Wiki Activity

Show up to three lines of context.

Browse Source
This commit is contained in:
Rob Rix 2017-05-01 11:04:49 -04:00
parent 91e9e59488
commit 1dabf3c9d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Data/Syntax/Assignment.hs
View File

@ -22,7 +22,8 @@ import Control.Monad.Free.Freer
import Data.Functor.Classes import Data.Functor.Classes
import Data.Functor.Foldable hiding (Nil) import Data.Functor.Foldable hiding (Nil)
import qualified Data.IntMap.Lazy as IntMap import qualified Data.IntMap.Lazy as IntMap
import Data.List ((!!)) import Data.Ix (inRange)
import Data.List.NonEmpty (nonEmpty)
import Data.Record import Data.Record
import qualified Info import qualified Info
import Prologue hiding (Alt, get, Location, state) import Prologue hiding (Alt, get, Location, state)
@ -100,7 +101,7 @@ showError source Error{..}
([], Nothing) -> showString "no rule to match at end of input nodes" ([], Nothing) -> showString "no rule to match at end of input nodes"
(symbols, Nothing) -> showString "expected " . showSymbols symbols . showString " at end of input nodes" (symbols, Nothing) -> showString "expected " . showSymbols symbols . showString " at end of input nodes"
(symbols, Just a) -> showString "expected " . showSymbols symbols . showString ", but got " . shows a (symbols, Just a) -> showString "expected " . showSymbols symbols . showString ", but got " . shows a
context = toS (Source.sourceText (Source.actualLines source !! Info.line errorPos)) context = maybe "\n" (toS . Source.sourceText . sconcat) (nonEmpty [ l | (i, l) <- zip [0..] (Source.actualLines source), inRange (Info.line errorPos - 2, Info.line errorPos) i ])
showSymbols :: Show symbol => [symbol] -> ShowS showSymbols :: Show symbol => [symbol] -> ShowS
showSymbols [] = showString "end of input nodes" showSymbols [] = showString "end of input nodes"