github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-26 16:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Add defaultPlainBlob

Browse Source
This commit is contained in:
joshvera 2016-03-08 16:04:44 -05:00
parent 54c86748ad
commit 8ddc5eb000
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Source.hs
View File

@ -17,6 +17,10 @@ modeToDigits (SymlinkBlob mode) = showOct mode ""
data SourceBlob = SourceBlob { source :: Source Char, oid :: String, path :: FilePath, blobKind :: Maybe SourceKind } data SourceBlob = SourceBlob { source :: Source Char, oid :: String, path :: FilePath, blobKind :: Maybe SourceKind }
deriving (Show, Eq) deriving (Show, Eq)
-- | The default plain blob mode
defaultPlainBlob :: SourceKind
defaultPlainBlob = PlainBlob 0o100644
-- | The contents of a source file, backed by a vector for efficient slicing. -- | The contents of a source file, backed by a vector for efficient slicing.
newtype Source a = Source { getVector :: Vector.Vector a } newtype Source a = Source { getVector :: Vector.Vector a }
deriving (Eq, Show, Functor, Traversable) deriving (Eq, Show, Functor, Traversable)

2
test/CorpusSpec.hs
View File

@ -79,7 +79,7 @@ testDiff :: Renderer T.Text String -> Both FilePath -> Maybe FilePath -> (String
testDiff renderer paths diff matcher = do testDiff renderer paths diff matcher = do
let parser = parserForFilepath (fst paths) let parser = parserForFilepath (fst paths)
sources <- sequence $ readAndTranscodeFile <$> paths sources <- sequence $ readAndTranscodeFile <$> paths
let sourceBlobs = Both (S.SourceBlob, S.SourceBlob) <*> sources <*> pure mempty <*> paths <*> pure (Just (S.PlainBlob 0o100644) let sourceBlobs = Both (S.SourceBlob, S.SourceBlob) <*> sources <*> pure mempty <*> paths <*> pure (Just S.defaultPlainBlob
actual <- diffFiles parser renderer sourceBlobs actual <- diffFiles parser renderer sourceBlobs
case diff of case diff of
Nothing -> matcher actual actual Nothing -> matcher actual actual

2
test/PatchOutputSpec.hs
View File

@ -13,4 +13,4 @@ spec :: Spec
spec = parallel $ spec = parallel $
describe "hunks" $ describe "hunks" $
it "empty diffs have empty hunks" $ it "empty diffs have empty hunks" $
hunks (Free . Annotated (pure (Info (Range 0 0) mempty)) $ Leaf "") (Both (SourceBlob (fromList "") "abcde" "path2.txt" (Just (PlainBlob 0o100644)), SourceBlob (fromList "") "xyz" "path2.txt" (Just (PlainBlob 0o100644)))) `shouldBe` [Hunk {offset = Both (0, 0), changes = [], trailingContext = []}] hunks (Free . Annotated (pure (Info (Range 0 0) mempty)) $ Leaf "") (Both (SourceBlob (fromList "") "abcde" "path2.txt" (Just defaultPlainBlob), SourceBlob (fromList "") "xyz" "path2.txt" (Just defaultPlainBlob))) `shouldBe` [Hunk {offset = Both (0, 0), changes = [], trailingContext = []}]