github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-08 08:30:27 +03:00
Code Issues Projects Releases Wiki Activity

Trim out nodes without positions.

Browse Source
This commit is contained in:
Rob Rix 2016-09-14 01:56:25 -04:00
parent 89a769ca35
commit f30fe7b358
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Diffing.hs
View File

@ -22,6 +22,7 @@ import Interpreter
import Language
import Parser
import Patch
import qualified Prelude
import Range
import Renderer
import Renderer.JSON
@ -68,15 +69,16 @@ diffFiles parser renderer sourceBlobs = do
_ -> Nothing)
cmarkParser :: Parser (Syntax Text) (Record '[Range, Category])
cmarkParser blob = pure . toTerm $ commonmarkToNode [ optSourcePos, optSafe ] (toText (source blob))
where toTerm :: Node -> Cofree (Syntax Text) (Record '[Range, Category])
toTerm (Node position t children) = cofree $ (maybe (Range 0 0) (sourceSpanToRange (source blob) . toSpan) position .: toCategory t .: RNil) :< case t of
cmarkParser SourceBlob{..} = pure . fromMaybe errorNode . toTerm $ commonmarkToNode [ optSourcePos, optSafe ] (toText source)
where toTerm :: Node -> Maybe (Cofree (Syntax Text) (Record '[Range, Category]))
toTerm (Node Nothing _ _) = Nothing
toTerm (Node (Just position) t children) = Just . cofree $ (sourceSpanToRange source (toSpan position) .: toCategory t .: RNil) :< case t of
-- Leaves
CODE text -> Leaf text
TEXT text -> Leaf text
CODE_BLOCK _ text -> Leaf text
-- Branches
_ -> Indexed (toTerm <$> children)
_ -> Indexed (catMaybes (toTerm <$> children))
toCategory :: NodeType -> Category
toCategory (TEXT _) = Other "text"
@ -92,6 +94,9 @@ cmarkParser blob = pure . toTerm $ commonmarkToNode [ optSourcePos, optSafe ] (t
toCategory t = Other (show t)
toSpan PosInfo{..} = SourceSpan "" (SourcePos (pred startLine) (pred startColumn)) (SourcePos (pred endLine) (pred endColumn))
errorNode = cofree $ (totalRange source .: Category.Error .: RNil) :< Syntax.Error (SourceSpan (toS path) (SourcePos 0 0) (SourcePos (pred (length ranges)) (end (Prelude.last ranges) - start (Prelude.last ranges)))) []
ranges = actualLineRanges (totalRange source) source
-- | Return a parser based on the file extension (including the ".").
parserForType :: Text -> Parser (Syntax Text) (Record '[Range, Category])
parserForType mediaType = case languageForType mediaType of