github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-29 01:42:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into substructural-diffing

Browse Source
This commit is contained in:
Rob Rix 2017-09-25 11:47:26 -04:00 committed by GitHub
commit c7c1161310
5 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
semantic-diff.cabal
View File

@ -17,7 +17,6 @@ library
, Alignment , Alignment
, Category , Category
, Data.Align.Generic , Data.Align.Generic
, Data.Bifunctor.Symmetrical
, Data.Blob , Data.Blob
, Data.Error , Data.Error
, Data.Functor.Both , Data.Functor.Both

18
src/Data/Bifunctor/Symmetrical.hs
View File

@ -1,18 +0,0 @@
module Data.Bifunctor.Symmetrical where
import Data.Bifunctor
import Data.These
import Data.Tuple (swap)
class Bifunctor s => Symmetrical s where
mirror :: s a b -> s b a
instance Symmetrical (,) where
mirror = swap
instance Symmetrical Either where
mirror = either Right Left
instance Symmetrical These where
mirror = these That This (flip These)

5
src/Diff.hs
View File

@ -4,7 +4,6 @@ module Diff where
import Data.Aeson import Data.Aeson
import Data.Bifoldable import Data.Bifoldable
import Data.Bifunctor import Data.Bifunctor
import Data.Bifunctor.Symmetrical
import Data.Bitraversable import Data.Bitraversable
import Data.Foldable (toList) import Data.Foldable (toList)
import Data.Functor.Classes import Data.Functor.Classes
@ -145,10 +144,6 @@ instance (Show1 syntax, Show ann1, Show ann2, Show recur) => Show (DiffF syntax
instance Functor syntax => Bifunctor (Diff syntax) where instance Functor syntax => Bifunctor (Diff syntax) where
bimap f g = go where go = Diff . trimap f g go . unDiff bimap f g = go where go = Diff . trimap f g go . unDiff
instance Functor syntax => Symmetrical (Diff syntax) where
mirror (Diff (Patch p)) = Diff (Patch (mirror (bimap (fmap mirror) (fmap mirror) p)))
mirror (Diff (Merge m)) = Diff (Merge (bimap mirror mirror m))
instance Foldable syntax => Bifoldable (Diff syntax) where instance Foldable syntax => Bifoldable (Diff syntax) where
bifoldMap f g = go where go = trifoldMap f g go . unDiff bifoldMap f g = go where go = trifoldMap f g go . unDiff

4
src/Patch.hs
View File

@ -11,7 +11,6 @@ import Data.Aeson
import Data.Align import Data.Align
import Data.Bifoldable import Data.Bifoldable
import Data.Bifunctor import Data.Bifunctor
import Data.Bifunctor.Symmetrical
import Data.Bitraversable import Data.Bitraversable
import Data.Functor.Classes import Data.Functor.Classes
import Data.JSON.Fields import Data.JSON.Fields
@ -48,9 +47,6 @@ instance Bifunctor Patch where
bimap _ g (Insert b) = Insert (g b) bimap _ g (Insert b) = Insert (g b)
bimap f g (Replace a b) = Replace (f a) (g b) bimap f g (Replace a b) = Replace (f a) (g b)
instance Symmetrical Patch where
mirror = patch Insert Delete (flip Replace)
instance Bifoldable Patch where instance Bifoldable Patch where
bifoldMap f _ (Delete a) = f a bifoldMap f _ (Delete a) = f a
bifoldMap _ g (Insert b) = g b bifoldMap _ g (Insert b) = g b

6
src/Semantic/Task.hs
View File

@ -205,15 +205,15 @@ runParser Options{..} blob@Blob{..} = go
logTiming "ts ast parse" $ logTiming "ts ast parse" $
liftIO ((Right <$> parseToAST language blob) `catchError` (pure . Left . toException)) >>= either throwError pure liftIO ((Right <$> parseToAST language blob) `catchError` (pure . Left . toException)) >>= either throwError pure
AssignmentParser parser assignment -> do AssignmentParser parser assignment -> do
ast <- go parser `catchError` \ err -> writeLog Error "failed parsing" blobFields >> throwError err ast <- go parser `catchError` \ err -> writeLog Error "failed parsing" (("tag", "parse") : blobFields) >> throwError err
logTiming "assign" $ case Assignment.assign blobSource assignment ast of logTiming "assign" $ case Assignment.assign blobSource assignment ast of
Left err -> do Left err -> do
let formatted = Error.formatError optionsPrintSource (optionsIsTerminal && optionsEnableColour) blob err let formatted = Error.formatError optionsPrintSource (optionsIsTerminal && optionsEnableColour) blob err
writeLog Error formatted blobFields writeLog Error formatted (("tag", "assign") : blobFields)
throwError (toException err) throwError (toException err)
Right term -> do Right term -> do
for_ (errors term) $ \ err -> for_ (errors term) $ \ err ->
writeLog Warning (Error.formatError optionsPrintSource (optionsIsTerminal && optionsEnableColour) blob err) blobFields writeLog Warning (Error.formatError optionsPrintSource (optionsIsTerminal && optionsEnableColour) blob err) (("tag", "assign") : blobFields)
pure term pure term
TreeSitterParser tslanguage -> logTiming "ts parse" $ liftIO (treeSitterParser tslanguage blob) TreeSitterParser tslanguage -> logTiming "ts parse" $ liftIO (treeSitterParser tslanguage blob)
MarkdownParser -> logTiming "cmark parse" $ pure (cmarkParser blobSource) MarkdownParser -> logTiming "cmark parse" $ pure (cmarkParser blobSource)