1
1
mirror of https://github.com/github/semantic.git synced 2024-11-24 08:54:07 +03:00

Merge branch 'master' into language-assignment-rename

This commit is contained in:
Rick Winfrey 2017-10-10 17:17:58 -07:00 committed by GitHub
commit 8a3f4f7e33

View File

@ -224,7 +224,8 @@ runParser Options{..} blob@Blob{..} = go
liftIO (treeSitterParser tslanguage blob) liftIO (treeSitterParser tslanguage blob)
MarkdownParser -> MarkdownParser ->
time "parse.cmark_parse" languageTag $ time "parse.cmark_parse" languageTag $
pure (cmarkParser blobSource) let term = cmarkParser blobSource
in length term `seq` pure term
blobFields = ("path", blobPath) : languageTag blobFields = ("path", blobPath) : languageTag
languageTag = maybe [] (pure . (,) ("language" :: String) . show) blobLanguage languageTag = maybe [] (pure . (,) ("language" :: String) . show) blobLanguage
errors :: (Syntax.Error :< fs, Apply Foldable fs, Apply Functor fs) => Term (Union fs) (Record Assignment.Location) -> [Error.Error String] errors :: (Syntax.Error :< fs, Apply Foldable fs, Apply Functor fs) => Term (Union fs) (Record Assignment.Location) -> [Error.Error String]