switch statements

app/GenerateTestCases.hs

@@ -142,7 +142,7 @@ runInitialCommitForSyntax metaRepo@JSONMetaRepo{..} metaSyntax@JSONMetaSyntax{..
   Prelude.putStrLn $ "Generating initial commit for " <> syntax <> " syntax."
 
   let repoFilePath' = repoFilePath metaRepo metaSyntax
-  
+
   result <- try . executeCommand (repoPath language) $ touchCommand repoFilePath' <> commitCommand syntax "Initial commit"
   case ( result :: Either Prelude.IOError String) of
     Left error -> Prelude.putStrLn $ "Initializing the " <> repoFilePath metaRepo metaSyntax <> " failed with: " <> show error <> ". " <> "Possible reason: file already initialized. \nProceeding to the next step."
@@ -192,14 +192,16 @@ runGenerateCommitAndTestCase opts JSONMetaRepo{..} testCaseFilePath (JSONMetaSyn
   _ <- executeCommand (repoPath language) command
   afterSha <- executeCommand (repoPath language) getLastCommitShaCommand
 
+  patch <- executeCommand (repoPath language) (gitDiffCommand beforeSha afterSha)
+
   expectedResult' <- runExpectedResult (repoPath language) beforeSha afterSha (syntax <> fileExt) opts
 
   let jsonTestCase = encodePretty JSONTestCase {
     gitDir = extractGitDir (repoPath language),
     testCaseDescription = language <> "-" <> syntax <> "-" <> description <> "-" <> "test",
     filePaths = [syntax <> fileExt],
-    sha1 = beforeSha,
-    sha2 = afterSha,
+    shas = beforeSha <> ".." <> afterSha,
+    patch = lines patch,
     expectedResult = expectedResult'
     }
 
@@ -255,27 +257,37 @@ generateJSON args = do
   let rows = fromMaybe (fromList [("rows", "")]) headResult ! "rows"
   pure $ JSONResult ( Map.fromList [ ("oids", oids), ("paths", paths), ("rows", rows) ] )
 
--- | Commands represent the various combination of patches (insert, delete, replacement)
--- | for a given syntax.
-commands :: JSONMetaRepo -> JSONMetaSyntax -> [(JSONMetaSyntax, String, String, String)]
-commands metaRepo@JSONMetaRepo{..} metaSyntax@JSONMetaSyntax{..} =
-  [ (metaSyntax, "insert", commaSeperator, fileAppendCommand repoFilePath' insert <> commitCommand syntax "insert")
-  , (metaSyntax, "replacement-insert", commaSeperator, fileWriteCommand repoFilePath' templateText' <> fileAppendCommand repoFilePath' (Prologue.intercalate "\n" [replacement, insert, insert]) <> commitCommand syntax "replacement + insert + insert")
-  , (metaSyntax, "delete-insert", commaSeperator, fileWriteCommand repoFilePath' templateText' <> fileAppendCommand repoFilePath' (Prologue.intercalate "\n" [insert, insert, insert]) <> commitCommand syntax "delete + insert")
-  , (metaSyntax, "replacement", commaSeperator, fileWriteCommand repoFilePath' templateText' <> fileAppendCommand repoFilePath' (Prologue.intercalate "\n" [replacement, insert, insert]) <> commitCommand syntax "replacement")
-  , (metaSyntax, "delete-replacement", commaSeperator, fileWriteCommand repoFilePath' templateText' <> fileAppendCommand repoFilePath' (Prologue.intercalate "\n" [insert, replacement]) <> commitCommand syntax "delete + replacement")
-  , (metaSyntax, "delete", commaSeperator, fileWriteCommand repoFilePath' templateText' <> fileAppendCommand repoFilePath' replacement <> commitCommand syntax "delete")
-  , (metaSyntax, "delete-rest", spaceSeperator, fileWriteCommand repoFilePath' templateText' <> commitCommand syntax "delete rest")
-  ]
-  where
-    commaSeperator = "\n,"
-    spaceSeperator = ""
-    templateText' = fromMaybe "" templateText
-    repoFilePath' = repoFilePath metaRepo metaSyntax
 
 repoFilePath :: JSONMetaRepo -> JSONMetaSyntax -> String
 repoFilePath metaRepo metaSyntax = syntax metaSyntax <> fileExt metaRepo
 
+-- | Commands represent the various combination of patches (insert, delete, replacement)
+-- | for a given syntax.
+commands :: JSONMetaRepo -> JSONMetaSyntax -> [(JSONMetaSyntax, String, String, String)]
+commands JSONMetaRepo{..} metaSyntax@JSONMetaSyntax{..} = case template of
+  (Just _) -> [ (metaSyntax, "setup", commaSeperator, fileWriteCommand repoFilePath (withTemplate "") <> commitCommand syntax "setup")
+              , (metaSyntax, "insert", commaSeperator, fileWriteCommand repoFilePath (withTemplate insert) <> commitCommand syntax "insert")
+              , (metaSyntax, "replacement", commaSeperator, fileWriteCommand repoFilePath (withTemplate replacement) <> commitCommand syntax "replacement")
+              , (metaSyntax, "delete-replacement", commaSeperator, fileWriteCommand repoFilePath (withTemplate insert) <> commitCommand syntax "delete replacement")
+              , (metaSyntax, "delete-insert", commaSeperator, fileWriteCommand repoFilePath (withTemplate "") <> commitCommand syntax "delete insert")
+              , (metaSyntax, "teardown", spaceSeperator, removeCommand repoFilePath <> touchCommand repoFilePath <> commitCommand syntax "teardown")
+              ]
+  Nothing -> [ (metaSyntax, "insert", commaSeperator, fileWriteCommand repoFilePath insert <> commitCommand syntax "insert")
+             , (metaSyntax, "replacement-insert", commaSeperator, fileWriteCommand repoFilePath (Prologue.intercalate "\n" [replacement, insert, insert]) <> commitCommand syntax "replacement + insert + insert")
+             , (metaSyntax, "delete-insert", commaSeperator, fileWriteCommand repoFilePath (Prologue.intercalate "\n" [insert, insert, insert]) <> commitCommand syntax "delete + insert")
+             , (metaSyntax, "replacement", commaSeperator, fileWriteCommand repoFilePath (Prologue.intercalate "\n" [replacement, insert, insert]) <> commitCommand syntax "replacement")
+             , (metaSyntax, "delete-replacement", commaSeperator, fileWriteCommand repoFilePath (Prologue.intercalate "\n" [insert, replacement]) <> commitCommand syntax "delete + replacement")
+             , (metaSyntax, "delete", commaSeperator, fileWriteCommand repoFilePath replacement <> commitCommand syntax "delete")
+             , (metaSyntax, "delete-rest", spaceSeperator, removeCommand repoFilePath <> touchCommand repoFilePath <> commitCommand syntax "delete rest")
+             ]
+  where commaSeperator = "\n,"
+        spaceSeperator = ""
+        repoFilePath = syntax <> fileExt
+        withTemplate = contentsWithTemplate template
+        contentsWithTemplate :: Maybe String -> String -> String
+        contentsWithTemplate (Just template) contents = DT.unpack $ DT.replace "{0}" (toS contents) (toS template)
+        contentsWithTemplate Nothing contents = contents
+
 -- | Attempts to pull from the git repository's remote repository.
 -- | If the pull fails, the exception is caught and continues to the next step.
 runPullGitRemote :: String -> FilePath -> IO ()
@@ -321,6 +333,9 @@ addSubmoduleCommand repoUrl repoPath = "git submodule add " <> repoUrl <> " " <>
 getLastCommitShaCommand :: String
 getLastCommitShaCommand = "git log --pretty=format:\"%H\" -n 1;"
 
+gitDiffCommand :: String -> String -> String
+gitDiffCommand sha1 sha2 = "git diff " <> sha1 <> ".." <> sha2 <> ";"
+
 checkoutMasterCommand :: String
 checkoutMasterCommand = "git checkout master;"
 

semantic-diff.cabal

@@ -197,6 +197,7 @@ test-suite integration-test
                      , hspec >= 2.1.10
                      , hspec-expectations-pretty-diff
                      , semantic-diff
+                     , split
                      , MissingH
                      , unordered-containers
   ghc-options:       -threaded -rtsopts -with-rtsopts=-N -j -pgml=script/g++

src/Category.hs

@@ -128,6 +128,15 @@ data Category
   | Until
   -- | A unless/else expression.
   | Unless
+  | Begin
+  | Else
+  | Elsif
+  | Ensure
+  | Rescue
+  | RescueModifier
+  | When
+  | RescuedException
+  | Negate
   deriving (Eq, Generic, Ord, Show)
 
 -- Instances
@@ -188,6 +197,15 @@ instance Arbitrary Category where
     , pure Yield
     , pure Until
     , pure Unless
+    , pure Begin
+    , pure Else
+    , pure Elsif
+    , pure Ensure
+    , pure Rescue
+    , pure RescueModifier
+    , pure When
+    , pure RescuedException
+    , pure Negate
     , Other <$> arbitrary
     ]
 

src/DiffSummary.hs

@@ -47,12 +47,19 @@ identifiable term = isIdentifiable (unwrap term) term
           S.MathAssignment{} -> Identifiable
           S.VarAssignment{} -> Identifiable
           S.SubscriptAccess{} -> Identifiable
+          S.Module{} -> Identifiable
           S.Class{} -> Identifiable
           S.Method{} -> Identifiable
           S.Leaf{} -> Identifiable
           S.DoWhile{} -> Identifiable
           S.Import{} -> Identifiable
           S.Export{} -> Identifiable
+          S.Ternary{} -> Identifiable
+          S.If{} -> Identifiable
+          S.Try{} -> Identifiable
+          S.Switch{} -> Identifiable
+          S.Case{} -> Identifiable
+          S.Rescue{} -> Identifiable
           _ -> Unidentifiable
 
 data JSONSummary summary span = JSONSummary { summary :: summary, span :: span }
@@ -139,6 +146,10 @@ determiner :: DiffInfo -> Doc
 determiner (LeafInfo "number" _ _) = ""
 determiner (LeafInfo "integer" _ _) = ""
 determiner (LeafInfo "boolean" _ _) = ""
+determiner (LeafInfo "begin statement" _ _) = "a"
+determiner (LeafInfo "else block" _ _) = "an"
+determiner (LeafInfo "ensure block" _ _) = "an"
+determiner (LeafInfo "when block" _ _) = "a"
 determiner (LeafInfo "anonymous function" _ _) = "an"
 determiner (BranchInfo bs _ _) = determiner (last bs)
 determiner _ = "the"
@@ -152,6 +163,10 @@ toLeafInfos leaf = pure . flip JSONSummary (sourceSpan leaf) $ case leaf of
   (LeafInfo "integer" termName _) -> squotes $ toDoc termName
   (LeafInfo "boolean" termName _) -> squotes $ toDoc termName
   (LeafInfo "anonymous function" termName _) -> toDoc termName <+> "function"
+  (LeafInfo cName@"begin statement" _ _) -> toDoc cName
+  (LeafInfo cName@"else block" _ _) -> toDoc cName
+  (LeafInfo cName@"ensure block" _ _) -> toDoc cName
+  (LeafInfo cName@"when block" _ _) -> toDoc cName
   (LeafInfo cName@"string" termName _) -> toDoc termName <+> toDoc cName
   (LeafInfo cName@"export statement" termName _) -> toDoc termName <+> toDoc cName
   (LeafInfo cName@"import statement" termName _) -> toDoc termName <+> toDoc cName
@@ -192,12 +207,9 @@ toTermName source term = case unwrap term of
     (_, _) -> toTermName' base <> "[" <> toTermName' element <> "]"
   S.VarAssignment varId _ -> toTermName' varId
   S.VarDecl decl -> toTermName' decl
-  -- TODO: We should remove Args from Syntax since I don't think we should ever
-  -- evaluate Args as a single toTermName Text - joshvera
-  S.Args args -> mconcat $ toTermName' <$> args
   -- TODO: We should remove Case from Syntax since I don't think we should ever
   -- evaluate Case as a single toTermName Text - joshvera
-  S.Case expr _ -> toTermName' expr
+  S.Case expr _ -> termNameFromSource expr
   S.Switch expr _ -> toTermName' expr
   S.Ternary expr _ -> toTermName' expr
   S.MathAssignment id _ -> toTermName' id
@@ -213,10 +225,10 @@ toTermName source term = case unwrap term of
   S.DoWhile _ expr -> toTermName' expr
   S.Throw expr -> termNameFromSource expr
   S.Constructor expr -> toTermName' expr
-  S.Try expr _ _ -> termNameFromSource expr
+  S.Try clauses _ _ _ -> termNameFromChildren term clauses
   S.Array _ -> termNameFromSource term
   S.Class identifier _ _ -> toTermName' identifier
-  S.Method identifier _ _ -> toTermName' identifier
+  S.Method identifier args _ -> toTermName' identifier <> paramsToArgNames args
   S.Comment a -> toCategoryName a
   S.Commented _ _ -> termNameFromChildren term (toList $ unwrap term)
   S.Module identifier _ -> toTermName' identifier
@@ -226,8 +238,8 @@ toTermName source term = case unwrap term of
   S.Export (Just identifier) [] -> "{ " <> toTermName' identifier <> " }"
   S.Export (Just identifier) expr -> "{ " <> intercalate ", " (termNameFromSource <$> expr) <> " }" <> " from " <> toTermName' identifier
   S.ConditionalAssignment id _ -> toTermName' id
-  S.Until expr _ -> toTermName' expr
-  S.Unless expr _ -> termNameFromSource expr
+  S.Negate expr -> toTermName' expr
+  S.Rescue args _ -> intercalate ", " $ toTermName' <$> args
   where toTermName' = toTermName source
         termNameFromChildren term children = termNameFromRange (unionRangesFrom (range term) (range <$> children))
         termNameFromSource term = termNameFromRange (range term)
@@ -244,6 +256,20 @@ parentContexts contexts = hsep $ either identifiableDoc annotatableDoc <$> conte
   where
     identifiableDoc (c, t) = case c of
       C.Assignment -> "in an" <+> catName c <+> "to" <+> termName t
+      C.Begin -> "in a" <+> catName c
+      C.Else -> "in an" <+> catName c
+      C.Elsif -> "in the" <+> squotes (termName t) <+> catName c
+      C.Method -> "in the" <+> squotes (termName t) <+> catName c
+      C.Ternary -> "in the" <+> squotes (termName t) <+> catName c
+      C.Ensure -> "in an" <+> catName c
+      C.Rescue -> case t of
+        "" -> "in a" <+> catName c
+        _ -> "in the" <+> squotes (termName t) <+> catName c
+      C.RescueModifier -> "in the" <+> squotes ("rescue" <+> termName t) <+> "modifier"
+      C.If -> "in the" <+> squotes (termName t) <+> catName c
+      C.Case -> "in the" <+> squotes (termName t) <+> catName c
+      C.Switch -> "in the" <+> squotes (termName t) <+> catName c
+      C.When -> "in a" <+> catName c
       _ -> "in the" <+> termName t <+> catName c
     annotatableDoc (c, t) = "of the" <+> squotes (termName t) <+> catName c
     catName = toDoc . toCategoryName
@@ -324,7 +350,7 @@ instance HasCategory Category where
     NumberLiteral -> "number"
     Other s -> s
     C.Pair -> "pair"
-    Params -> "params"
+    C.Params -> "params"
     Program -> "top level"
     Regex -> "regex"
     StringLiteral -> "string"
@@ -355,6 +381,15 @@ instance HasCategory Category where
     C.Yield -> "yield statement"
     C.Until -> "until statement"
     C.Unless -> "unless statement"
+    C.Begin -> "begin statement"
+    C.Else -> "else block"
+    C.Elsif -> "elsif block"
+    C.Ensure -> "ensure block"
+    C.Rescue -> "rescue block"
+    C.RescueModifier -> "rescue modifier"
+    C.When -> "when comparison"
+    C.RescuedException -> "last exception"
+    C.Negate -> "negate"
 
 instance HasField fields Category => HasCategory (SyntaxTerm leaf fields) where
   toCategoryName = toCategoryName . category . extract

src/Language/Go.hs

@@ -35,6 +35,12 @@ termConstructor source sourceSpan name range children = case (name, children) of
       [rangeClause, body] | category (extract rangeClause) == Other "range_clause" ->
         S.For (toList $ unwrap rangeClause) (toList $ unwrap body)
       other -> S.Error other
+  ("expression_switch_statement", children) -> case Prologue.break isCaseClause children of
+    (clauses, cases) -> do
+      clauses' <- withDefaultInfo $ S.Indexed clauses
+      withDefaultInfo $ S.Switch clauses' cases
+    where isCaseClause = (== Other "expression_case_clause") . category . extract
+
   -- TODO: Handle multiple var specs
   ("var_declaration", varSpecs) -> withDefaultInfo . S.Indexed =<< mapM toVarDecl varSpecs
   ("short_var_declaration", children) -> listToVarDecls children
@@ -126,5 +132,6 @@ categoryForGoName = \case
   "const_declaration" -> VarDecl
   "if_statement" -> If
   "for_statement" -> For
+  "expression_switch_statement" -> Switch
   s -> Other (toS s)
 

src/Language/JavaScript.hs

@@ -41,21 +41,20 @@ termConstructor source sourceSpan name range children
       S.Indexed rest -> S.Indexed $ a : rest
       _ -> S.Indexed children
     ("comma_op", _ ) -> S.Error children
-    ("function_call", _) -> case runCofree <$> children of
-      [ _ :< S.MemberAccess{..}, _ :< S.Args args ] -> S.MethodCall memberId property args
-      [ _ :< S.MemberAccess{..} ] -> S.MethodCall memberId property []
-      [ function, _ :< S.Args args ] -> S.FunctionCall (cofree function) args
-      (x:xs) -> S.FunctionCall (cofree x) (cofree <$> xs)
+    ("function_call", _) -> case children of
+      member : args | category (extract member) == MemberAccess -> case toList (unwrap member) of
+        [target, method] -> S.MethodCall target method (toList . unwrap =<< args)
+        _ -> S.Error children
+      function : args -> S.FunctionCall function (toList . unwrap =<< args)
       _ -> S.Error children
     ("ternary", condition : cases) -> S.Ternary condition cases
     ("ternary", _ ) -> S.Error children
-    ("arguments", _) -> S.Args children
     ("var_assignment", [ x, y ]) -> S.VarAssignment x y
     ("var_assignment", _ ) -> S.Error children
     ("var_declaration", _) -> S.Indexed $ toVarDecl <$> children
     ("switch_statement", expr : rest) -> S.Switch expr rest
     ("switch_statement", _ ) -> S.Error children
-    ("case", [ expr, body ]) -> S.Case expr body
+    ("case", [ expr, body ]) -> S.Case expr [body]
     ("case", _ ) -> S.Error children
     ("object", _) -> S.Object $ foldMap toTuple children
     ("pair", _) -> S.Fixed children
@@ -70,13 +69,14 @@ termConstructor source sourceSpan name range children
     ("throw_statment", _ ) -> S.Error children
     ("new_expression", [ expr ]) -> S.Constructor expr
     ("new_expression", _ ) -> S.Error children
-    ("try_statement", [ body ]) -> S.Try body Nothing Nothing
-    ("try_statement", [ body, catch ]) | Catch <- category (extract catch) -> S.Try body (Just catch) Nothing
-    ("try_statement", [ body, finally ]) | Finally <- category (extract finally) -> S.Try body Nothing (Just finally)
-    ("try_statement", [ body, catch, finally ])
-      | Catch <- category (extract catch)
-      , Finally <- category (extract finally) -> S.Try body (Just catch) (Just finally)
-    ("try_statement", _ ) -> S.Error children
+    ("try_statement", _) -> case children of
+      [ body ] -> S.Try [body] [] Nothing Nothing
+      [ body, catch ] | Catch <- category (extract catch) -> S.Try [body] [catch] Nothing Nothing
+      [ body, finally ] | Finally <- category (extract finally) -> S.Try [body] [] Nothing (Just finally)
+      [ body, catch, finally ]
+        | Catch <- category (extract catch)
+        , Finally <- category (extract finally) -> S.Try [body] [catch] Nothing (Just finally)
+      _ -> S.Error children
     ("array", _) -> S.Array children
     ("method_definition", [ identifier, params, exprs ]) -> S.Method identifier (toList (unwrap params)) (toList (unwrap exprs))
     ("method_definition", [ identifier, exprs ]) -> S.Method identifier [] (toList (unwrap exprs))

src/Language/Ruby.hs

@@ -2,6 +2,7 @@
 module Language.Ruby where
 
 import Data.Record
+import Data.List (partition)
 import Info
 import Prologue
 import Source
@@ -10,7 +11,7 @@ import qualified Syntax as S
 import Term
 
 operators :: [Text]
-operators = ["and", "boolean_and", "or", "boolean_or", "bitwise_or", "bitwise_and", "shift", "relational", "comparison"]
+operators = [ "and", "boolean_and", "or", "boolean_or", "bitwise_or", "bitwise_and", "shift", "relational", "comparison" ]
 
 functions :: [Text]
 functions = [ "lambda_literal", "lambda_expression" ]
@@ -24,59 +25,96 @@ termConstructor
   -> IO (Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])) -- ^ The resulting term, in IO.
 termConstructor source sourceSpan name range children
   | name == "ERROR" = withDefaultInfo (S.Error children)
+  | name == "unless_modifier" = case children of
+    [ lhs, rhs ] -> do
+      condition <- withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)
+      withDefaultInfo $ S.If condition [lhs]
+    _ -> withDefaultInfo $ S.Error children
+  | name == "unless_statement" = case children of
+    ( expr : rest ) -> do
+      condition <- withRecord (setCategory (extract expr) Negate) (S.Negate expr)
+      withDefaultInfo $ S.If condition rest
+    _ -> withDefaultInfo $ S.Error children
+  | name == "until_modifier" = case children of
+    [ lhs, rhs ] -> do
+      condition <- withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)
+      withDefaultInfo $ S.While condition [lhs]
+    _ -> withDefaultInfo $ S.Error children
+  | name == "until_statement" = case children of
+    ( expr : rest ) -> do
+      condition <- withRecord (setCategory (extract expr) Negate) (S.Negate expr)
+      withDefaultInfo $ S.While condition rest
+    _ -> withDefaultInfo $ S.Error children
   | otherwise = withDefaultInfo $ case (name, children) of
-    ("argument_list", _) -> S.Args children
-    ("array", _) -> S.Array children
+    ("array", _ ) -> S.Array children
     ("assignment", [ identifier, value ]) -> S.Assignment identifier value
     ("assignment", _ ) -> S.Error children
-    ("case_statement", expr : rest) -> S.Switch expr rest
+    ("begin_statement", _ ) -> case partition (\x -> category (extract x) == Rescue) children of
+      (rescues, rest) -> case partition (\x -> category (extract x) == Ensure || category (extract x) == Else) rest of
+        (ensureElse, body) -> case ensureElse of
+          [ elseBlock, ensure ]
+            | Else <- category (extract elseBlock)
+            , Ensure <- category (extract ensure) -> S.Try body rescues (Just elseBlock) (Just ensure)
+          [ ensure, elseBlock ]
+            | Ensure <- category (extract ensure)
+            , Else <- category (extract elseBlock) -> S.Try body rescues (Just elseBlock) (Just ensure)
+          [ elseBlock ] | Else <- category (extract elseBlock) -> S.Try body rescues (Just elseBlock) Nothing
+          [ ensure ] | Ensure <- category (extract ensure) -> S.Try body rescues Nothing (Just ensure)
+          _ -> S.Try body rescues Nothing Nothing
+    ("case_statement", expr : body ) -> S.Switch expr body
     ("case_statement", _ ) -> S.Error children
+    ("when_block", condition : body ) -> S.Case condition body
+    ("when_block", _ ) -> S.Error children
     ("class_declaration", [ identifier, superclass, definitions ]) -> S.Class identifier (Just superclass) (toList (unwrap definitions))
     ("class_declaration", [ identifier, definitions ]) -> S.Class identifier Nothing (toList (unwrap definitions))
     ("class_declaration", _ ) -> S.Error children
-    ("comment", _) -> S.Comment . toText $ slice range source
+    ("comment", _ ) -> S.Comment . toText $ slice range source
     ("conditional_assignment", [ identifier, value ]) -> S.ConditionalAssignment identifier value
     ("conditional_assignment", _ ) -> S.Error children
     ("conditional", condition : cases) -> S.Ternary condition cases
     ("conditional", _ ) -> S.Error children
-    ("function_call", _) -> case runCofree <$> children of
-      [ _ :< S.MemberAccess{..}, _ :< S.Args args ] -> S.MethodCall memberId property args
-      [ _ :< S.MemberAccess{..} ] -> S.MethodCall memberId property []
-      [ function, _ :< S.Args args ] -> S.FunctionCall (cofree function) args
-      (x:xs) -> S.FunctionCall (cofree x) (cofree <$> xs)
+    ("function_call", _ ) -> case children of
+      member : args | category (extract member) == MemberAccess -> case toList (unwrap member) of
+        [target, method] -> S.MethodCall target method (toList . unwrap =<< args)
+        _ -> S.Error children
+      function : args -> S.FunctionCall function (toList . unwrap =<< args)
       _ -> S.Error children
-    ("hash", _) -> S.Object $ foldMap toTuple children
+    ("hash", _ ) -> S.Object $ foldMap toTuple children
     ("if_modifier", [ lhs, condition ]) -> S.If condition [lhs]
     ("if_modifier", _ ) -> S.Error children
-    ("if_statement", expr : rest ) -> S.If expr rest
+    ("if_statement", condition : body ) -> S.If condition body
     ("if_statement", _ ) -> S.Error children
+    ("elsif_block", condition : body ) -> S.If condition body
+    ("elsif_block", _ ) -> S.Error children
     ("element_reference", [ base, element ]) -> S.SubscriptAccess base element
     ("element_reference", _ ) -> S.Error children
+    ("for_statement", lhs : expr : rest ) -> S.For [lhs, expr] rest
+    ("for_statement", _ ) -> S.Error children
     ("math_assignment", [ identifier, value ]) -> S.MathAssignment identifier value
     ("math_assignment", _ ) -> S.Error children
     ("member_access", [ base, property ]) -> S.MemberAccess base property
     ("member_access", _ ) -> S.Error children
-    ("method_declaration", [ identifier, params, exprs ]) -> S.Method identifier (toList (unwrap params)) (toList (unwrap exprs))
-    ("method_declaration", [ identifier, exprs ]) -> S.Method identifier [] (toList (unwrap exprs))
-    ("method_declaration", _ ) -> S.Error children
+    ("method_declaration", _ ) -> case children of
+      identifier : params : body | Params <- category (extract params) -> S.Method identifier (toList (unwrap params)) body
+      identifier : body -> S.Method identifier [] body
+      _ -> S.Error children
     ("module_declaration", identifier : body ) -> S.Module identifier body
     ("module_declaration", _ ) -> S.Error children
+    ("rescue_block", _ ) -> case children of
+      args : lastException : rest
+        | Args <- category (extract args)
+        , RescuedException <- category (extract lastException) -> S.Rescue (toList (unwrap args) <> [lastException]) rest
+      lastException : rest | RescuedException <- category (extract lastException) -> S.Rescue [lastException] rest
+      args : body | Args <- category (extract args) -> S.Rescue (toList (unwrap args)) body
+      body -> S.Rescue [] body
+    ("rescue_modifier", [lhs, rhs] ) -> S.Rescue [lhs] [rhs]
+    ("rescue_modifier", _ ) -> S.Error children
     ("return_statement", _ ) -> S.Return (listToMaybe children)
-    ("unless_modifier", [ lhs, condition ]) -> S.Unless condition [lhs]
-    ("unless_modifier", _ ) -> S.Error children
-    ("unless_statement", expr : rest ) -> S.Unless expr rest
-    ("unless_statement", _ ) -> S.Error children
-    ("until_modifier", [ lhs, condition ]) -> S.Until condition [lhs]
-    ("until_modifier", _ ) -> S.Error children
-    ("until_statement", expr : rest ) -> S.Until expr rest
-    ("until_statement", _ ) -> S.Error children
     ("while_modifier", [ lhs, condition ]) -> S.While condition [lhs]
     ("while_modifier", _ ) -> S.Error children
     ("while_statement", expr : rest ) -> S.While expr rest
     ("while_statement", _ ) -> S.Error children
-    ("yield", _) -> S.Yield (listToMaybe children)
-    ("for_statement", lhs : expr : rest ) -> S.For [lhs, expr] rest
-    ("for_statement", _ ) -> S.Error children
+    ("yield", _ ) -> S.Yield (listToMaybe children)
     _ | name `elem` operators -> S.Operator children
     _ | name `elem` functions -> case children of
           [ body ] -> S.AnonymousFunction [] [body]
@@ -85,9 +123,13 @@ termConstructor source sourceSpan name range children
     (_, []) -> S.Leaf . toText $ slice range source
     _  -> S.Indexed children
   where
-    withDefaultInfo syntax = do
+    withRecord record syntax = pure $! cofree (record :< syntax)
+    withCategory category syntax = do
       sourceSpan' <- sourceSpan
-      pure $! cofree ((range .: categoryForRubyName name .: sourceSpan' .: RNil) :< syntax)
+      pure $! cofree ((range .: category .: sourceSpan' .: RNil) :< syntax)
+    withDefaultInfo syntax = case syntax of
+      S.MethodCall{} -> withCategory MethodCall syntax
+      _ -> withCategory (categoryForRubyName name) syntax
 
 categoryForRubyName :: Text -> Category
 categoryForRubyName = \case
@@ -95,22 +137,22 @@ categoryForRubyName = \case
   "argument_list" -> Args
   "array" -> ArrayLiteral
   "assignment" -> Assignment
-  "begin_statement" -> ExpressionStatements
+  "begin_statement" -> Begin
   "bitwise_and" -> BitwiseOperator -- bitwise and, e.g &.
   "bitwise_or" -> BitwiseOperator -- bitwise or, e.g. ^, |.
   "boolean_and" -> BooleanOperator -- boolean and, e.g. &&.
   "boolean_or" -> BooleanOperator -- boolean or, e.g. &&.
   "boolean" -> Boolean
-  "case_statement" -> Switch
+  "case_statement" -> Case
   "class_declaration"  -> Class
   "comment" -> Comment
   "comparison" -> RelationalOperator -- comparison operator, e.g. <, <=, >=, >.
   "conditional_assignment" -> ConditionalAssignment
   "conditional" -> Ternary
   "element_reference" -> SubscriptAccess
-  "else_block" -> ExpressionStatements
-  "elsif_block" -> ExpressionStatements
-  "ensure_block" -> ExpressionStatements
+  "else_block" -> Else
+  "elsif_block" -> Elsif
+  "ensure_block" -> Ensure
   "ERROR" -> Error
   "float" -> NumberLiteral
   "for_statement" -> For
@@ -123,6 +165,7 @@ categoryForRubyName = \case
   "if_statement" -> If
   "integer" -> IntegerLiteral
   "interpolation" -> Interpolation
+  "rescued_exception" -> RescuedException
   "math_assignment" -> MathAssignment
   "member_access" -> MemberAccess
   "method_declaration" -> Method
@@ -132,18 +175,18 @@ categoryForRubyName = \case
   "program" -> Program
   "regex" -> Regex
   "relational" -> RelationalOperator -- relational operator, e.g. ==, !=, ===, <=>, =~, !~.
-  "rescue_block" -> ExpressionStatements
+  "rescue_block" -> Rescue
+  "rescue_modifier" -> RescueModifier
   "return_statement" -> Return
   "shift" -> BitwiseOperator -- bitwise shift, e.g <<, >>.
   "string" -> StringLiteral
   "subshell" -> Subshell
   "symbol" -> SymbolLiteral
-  "then_block" -> ExpressionStatements
   "unless_modifier" -> Unless
   "unless_statement" -> Unless
   "until_modifier" -> Until
   "until_statement" -> Until
-  "when_block" -> ExpressionStatements
+  "when_block" -> When
   "while_modifier" -> While
   "while_statement" -> While
   "yield" -> Yield

src/Renderer/JSON.hs

@@ -100,7 +100,6 @@ syntaxToTermField syntax = case syntax of
   S.MathAssignment identifier value -> [ "identifier" .= identifier ] <> [ "value" .= value ]
   S.MemberAccess identifier value -> [ "identifier" .= identifier ] <> [ "value" .= value ]
   S.MethodCall identifier methodIdentifier parameters -> [ "identifier" .= identifier ] <> [ "methodIdentifier" .= methodIdentifier ] <> [ "parameters" .= parameters ]
-  S.Args c -> childrenFields c
   S.Operator syntaxes -> [ "operatorSyntaxes" .= syntaxes ]
   S.VarDecl declaration -> [ "declaration" .= declaration ]
   S.VarAssignment identifier value -> [ "identifier" .= identifier ] <> [ "value" .= value ]
@@ -118,7 +117,7 @@ syntaxToTermField syntax = case syntax of
   S.Return expression -> [ "expression" .= expression ]
   S.Throw c -> [ "expression" .= c ]
   S.Constructor expression -> [ "expression" .= expression ]
-  S.Try body catchExpression finallyExpression -> [ "body" .= body ] <> [ "catchExpression" .= catchExpression ] <> [ "finallyExpression" .= finallyExpression ]
+  S.Try body catchExpression elseExpression finallyExpression -> [ "body" .= body ] <> [ "catchExpression" .= catchExpression ] <> [ "elseExpression" .= elseExpression ] <> [ "finallyExpression" .= finallyExpression ]
   S.Array c -> childrenFields c
   S.Class identifier superclass definitions -> [ "identifier" .= identifier ] <> [ "superclass" .= superclass ] <> [ "definitions" .= definitions ]
   S.Method identifier parameters definitions -> [ "identifier" .= identifier ] <> [ "parameters" .= parameters ] <> [ "definitions" .= definitions ]
@@ -128,6 +127,6 @@ syntaxToTermField syntax = case syntax of
   S.Export identifier statements -> [ "identifier" .= identifier ] <> [ "statements" .= statements ]
   S.ConditionalAssignment id value -> [ "conditionalIdentifier" .= id ] <> [ "value" .= value ]
   S.Yield expr -> [ "yieldExpression" .= expr ]
-  S.Until expr body -> [ "untilExpr" .= expr ]  <> [ "untilBody" .= body ]
-  S.Unless expr clauses -> [ "unless" .= expr ] <> childrenFields clauses
+  S.Negate expr -> [ "negate" .= expr ]
+  S.Rescue args expressions -> [ "args" .= args ] <> childrenFields expressions
   where childrenFields c = [ "children" .= c ]

src/Renderer/Split.hs

@@ -57,7 +57,7 @@ styleName category = "category-" <> case category of
   TemplateString -> "template_string"
   Regex -> "regex"
   Identifier -> "identifier"
-  Params -> "parameters"
+  C.Params -> "parameters"
   ExpressionStatements -> "expression_statements"
   C.MathAssignment -> "math_assignment"
   C.SubscriptAccess -> "subscript_access"
@@ -90,6 +90,15 @@ styleName category = "category-" <> case category of
   C.Yield -> "yield_statement"
   C.Until -> "until"
   C.Unless -> "unless_statement"
+  C.Begin -> "begin_statement"
+  C.Else -> "else_block"
+  C.Elsif -> "elsif_block"
+  C.Ensure -> "ensure_block"
+  C.Rescue -> "rescue_block"
+  C.RescueModifier -> "rescue_modifier"
+  C.When -> "when_block"
+  C.RescuedException -> "last_exception"
+  C.Negate -> "negate"
 
 -- | Pick the class name for a split patch.
 splitPatchToClassName :: SplitPatch a -> AttributeValue

src/Syntax.hs

@@ -36,9 +36,6 @@ data Syntax a f
   -- | A method call consisting of its target, the method name, and the parameters passed to the method.
   -- | e.g. in Javascript console.log('hello') represents a method call.
   | MethodCall { targetId :: f, methodId :: f, methodParams :: [f] }
-  -- | The list of arguments to a method call.
-  -- | TODO: It might be worth removing this and using Fixed instead.
-  | Args [f]
   -- | An operator can be applied to a list of syntaxes.
   | Operator [f]
   -- | A variable declaration. e.g. var foo;
@@ -49,7 +46,7 @@ data Syntax a f
   -- | e.g. in Javascript x["y"] represents a subscript access syntax.
   | SubscriptAccess { subscriptId :: f, subscriptElement :: f }
   | Switch { switchExpr :: f, cases :: [f] }
-  | Case { caseExpr :: f, caseStatements :: f }
+  | Case { caseExpr :: f, caseStatements :: [f] }
   | Object { keyValues :: [f] }
   -- | A pair in an Object. e.g. foo: bar or foo => bar
   | Pair f f
@@ -65,7 +62,8 @@ data Syntax a f
   | Return (Maybe f)
   | Throw f
   | Constructor f
-  | Try f (Maybe f) (Maybe f)
+  -- | TODO: Is it a problem that in Ruby, this pattern can work for method def too?
+  | Try { tryBegin :: [f], catchRescue :: [f], beginElse :: Maybe f, finallyEnsure :: Maybe f }
   -- | An array literal with list of children.
   | Array [f]
   -- | A class with an identifier, superclass, and a list of definitions.
@@ -81,9 +79,10 @@ data Syntax a f
   -- | A conditional assignment represents expressions whose operator classifies as conditional (e.g. ||= or &&=).
   | ConditionalAssignment { conditionalAssignmentId :: f, value :: f }
   | Yield (Maybe f)
-  | Until { untilExpr :: f, untilBody :: [f] }
-  -- | An unless statement with an expression and maybe more expression clauses.
-  | Unless f [f]
+  -- | A negation of a single expression.
+  | Negate f
+  -- | A rescue block has a list of arguments to rescue and a list of expressions.
+  | Rescue [f] [f]
   deriving (Eq, Foldable, Functor, Generic, Generic1, Mergeable, Ord, Show, Traversable, ToJSON)
 
 

test/IntegrationFormatSpec.hs

@@ -2,6 +2,7 @@ module IntegrationFormatSpec where
 
 import Arguments
 import Data.Aeson
+import Data.List.Split
 import Control.Exception
 import qualified Data.ByteString.Lazy as DL
 import JSONTestCase
@@ -21,10 +22,11 @@ catchException = handle errorHandler
 
 assertDiffSummary :: JSONTestCase -> Format -> (Either String ExpectedResult -> Either String ExpectedResult -> Expectation) -> Expectation
 assertDiffSummary JSONTestCase {..} format matcher = do
-  diffs <- fetchDiffs $ args gitDir sha1 sha2 filePaths format
+  diffs <- fetchDiffs $ args gitDir (Prelude.head shas') (Prelude.last shas') filePaths format
   result <- catchException . pure . pure . concatOutputs $ diffs
   let actual = eitherDecode . DL.fromStrict . encodeUtf8 . fromJust . listToMaybe $ result
   matcher actual (Right expectedResult)
+  where shas' = splitOn ".." shas
 
 runTestsIn :: [FilePath] -> Format -> (Either String ExpectedResult -> Either String ExpectedResult -> Expectation) -> SpecWith ()
 runTestsIn filePaths format matcher = do

test/JSONTestCase.hs

@@ -15,7 +15,8 @@ data JSONMetaRepo = JSONMetaRepo { repoUrl :: !String
                                  , templateText :: !(Maybe String)
                                  } deriving (Show, Generic, FromJSON)
 
-data JSONMetaSyntax = JSONMetaSyntax { syntax :: !String
+data JSONMetaSyntax = JSONMetaSyntax { template :: !(Maybe String)
+                                     , syntax :: !String
                                      , insert :: !String
                                      , replacement :: !String
                                      } deriving (Show, Generic, FromJSON)
@@ -23,8 +24,8 @@ data JSONMetaSyntax = JSONMetaSyntax { syntax :: !String
 data JSONTestCase = JSONTestCase { gitDir :: !String
                                  , testCaseDescription :: !String
                                  , filePaths :: ![String]
-                                 , sha1 :: !String
-                                 , sha2 :: !String
+                                 , shas :: !String
+                                 , patch :: ![String]
                                  , expectedResult :: !ExpectedResult
                                  } deriving (Show, Generic, FromJSON)
 

test/corpus/diff-summaries-todo/javascript/boolean-operator.json

@@ -9,9 +9,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "c57d91166c3246b8e352252024dc21de6a42f707",
+    "patch": [],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "244097ce5a74d6275f249d5159a6a14696a1eddf"
+    "shas": "c57d91166c3246b8e352252024dc21de6a42f707..244097ce5a74d6275f249d5159a6a14696a1eddf"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-test",
@@ -24,7 +24,7 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "244097ce5a74d6275f249d5159a6a14696a1eddf",
+    "patch": [],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0abfc815d9c5912259cfc25becb398a8f1444d40"
+    "shas": "244097ce5a74d6275f249d5159a6a14696a1eddf..0abfc815d9c5912259cfc25becb398a8f1444d40"
 }]

test/corpus/diff-summaries-todo/javascript/relational-operator.json

@@ -9,9 +9,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "f79a619c0277b82bb45cb1510847b78ba44ea31b",
+    "patch": [],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1fc7441b1fb64b171cf7892e3ce25bc55e25d754"
+    "shas": "f79a619c0277b82bb45cb1510847b78ba44ea31b..1fc7441b1fb64b171cf7892e3ce25bc55e25d754"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-test",
@@ -24,7 +24,7 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "1fc7441b1fb64b171cf7892e3ce25bc55e25d754",
+    "patch": [],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e1d768da1e35b8066276dc5b5f9653442345948d"
+    "shas": "1fc7441b1fb64b171cf7892e3ce25bc55e25d754..e1d768da1e35b8066276dc5b5f9653442345948d"
 }]

test/corpus/diff-summaries-todo/ruby/control-statements.json

@@ -1,241 +0,0 @@
-[{
-    "testCaseDescription": "ruby-control-statements-insert-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                2,
-                                2
-                            ],
-                            "end": [
-                                2,
-                                5
-                            ]
-                        }
-                    },
-                    "summary": "Added a begin block"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "0afd2cfcf489061cc131d9970716bb04bb5cb203",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "703d5515f05e02ad93d56987b520328f4a351265"
-}
-,{
-    "testCaseDescription": "ruby-control-statements-replacement-insert-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                1,
-                                1
-                            ],
-                            "end": [
-                                2,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Added a begin block"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "703d5515f05e02ad93d56987b520328f4a351265",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "554242b8ed778be509d72c90b71381c7a49c5bf4"
-}
-,{
-    "testCaseDescription": "ruby-control-statements-delete-insert-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    2,
-                                    4
-                                ]
-                            },
-                            {
-                                "start": [
-                                    2,
-                                    2
-                                ],
-                                "end": [
-                                    2,
-                                    5
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced a begin block with a begin block"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "554242b8ed778be509d72c90b71381c7a49c5bf4",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "bd0b46ca0ec2510b867cc5670fbafb0068db0d9c"
-}
-,{
-    "testCaseDescription": "ruby-control-statements-replacement-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    2,
-                                    2
-                                ],
-                                "end": [
-                                    2,
-                                    5
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    2,
-                                    4
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced a begin block with a begin block"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "bd0b46ca0ec2510b867cc5670fbafb0068db0d9c",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "3a174f29f8c703fdb1ebf05ef9ef856550f3b968"
-}
-,{
-    "testCaseDescription": "ruby-control-statements-delete-replacement-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                1,
-                                1
-                            ],
-                            "end": [
-                                2,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Deleted a begin block"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "3a174f29f8c703fdb1ebf05ef9ef856550f3b968",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "5dc5bafea85edc0573668d9b80192e910150caf3"
-}
-,{
-    "testCaseDescription": "ruby-control-statements-delete-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                3
-                            ],
-                            "end": [
-                                8,
-                                6
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'baz' identifier"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "5dc5bafea85edc0573668d9b80192e910150caf3",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "8cde2cc96f0eef72794161e18540bbb43a24937d"
-}
-,{
-    "testCaseDescription": "ruby-control-statements-delete-rest-test",
-    "expectedResult": {
-        "changes": {
-            "control-statements.rb": [
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                1,
-                                1
-                            ],
-                            "end": [
-                                2,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Deleted a begin block"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "control-statements.rb"
-    ],
-    "sha1": "8cde2cc96f0eef72794161e18540bbb43a24937d",
-    "gitDir": "test/corpus/repos/ruby",
-    "sha2": "457dc7fc963751d0adf0ea4eb8934e39ef717e32"
-}]

test/corpus/diff-summaries/go/array-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 9
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 11
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -52,11 +52,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -70,9 +70,16 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "6d7202f99aff5a0fefda7df058917f141335424f",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index e69de29..f9c11b8 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -0,0 +1 @@",
+        "+type a [2+2]x"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e22dc38811887835cdba8d7d0f0e3edfa6930c56"
+    "shas": "96ee23366cb8e34e0b1aef14810c83f5066a6f3b..f25c42f9d50f3a4f670ca6d82cb7120feb42e472"
 }
 ,{
     "testCaseDescription": "go-array-types-replacement-insert-test",
@@ -83,11 +90,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -98,11 +105,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 9
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -113,11 +120,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 11
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -128,11 +135,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -143,11 +150,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -158,11 +165,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 9
                             ],
                             "end": [
-                                4,
+                                2,
                                 10
                             ]
                         }
@@ -173,11 +180,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 11
                             ],
                             "end": [
-                                4,
+                                2,
                                 12
                             ]
                         }
@@ -188,11 +195,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 13
                             ],
                             "end": [
-                                4,
+                                2,
                                 14
                             ]
                         }
@@ -206,9 +213,18 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "e22dc38811887835cdba8d7d0f0e3edfa6930c56",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index f9c11b8..d2b8166 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -1 +1,3 @@",
+        "+type a [1+1]y",
+        "+type a [2+2]x",
+        " type a [2+2]x"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "31d6f9d239697a44741a23a1b37e6c2de4d70ddb"
+    "shas": "f25c42f9d50f3a4f670ca6d82cb7120feb42e472..159e876dd37dd92c673a5d42908dd4e39437c427"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-insert-test",
@@ -220,21 +236,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
@@ -247,21 +263,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     11
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     12
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     11
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     12
                                 ]
                             }
@@ -274,21 +290,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     14
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     14
                                 ]
                             }
@@ -303,9 +319,19 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "31d6f9d239697a44741a23a1b37e6c2de4d70ddb",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index d2b8166..823c5f1 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-type a [1+1]y",
+        "+type a [2+2]x",
+        " type a [2+2]x",
+        " type a [2+2]x"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5f10f74b19bad493aea3a99c580e80e024e036fc"
+    "shas": "159e876dd37dd92c673a5d42908dd4e39437c427..d1f1827268467008a98150e05dbd55c35a6c158a"
 }
 ,{
     "testCaseDescription": "go-array-types-replacement-test",
@@ -317,21 +343,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
@@ -344,21 +370,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     11
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     12
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     11
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     12
                                 ]
                             }
@@ -371,21 +397,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     14
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     14
                                 ]
                             }
@@ -400,9 +426,19 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "5f10f74b19bad493aea3a99c580e80e024e036fc",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index 823c5f1..d2b8166 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-type a [2+2]x",
+        "+type a [1+1]y",
+        " type a [2+2]x",
+        " type a [2+2]x"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c79b560d124a946f56465001dc8f25492ec14de6"
+    "shas": "d1f1827268467008a98150e05dbd55c35a6c158a..1458fd09e1ef2e04e8b8ef9f689c2c1c97f51537"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-replacement-test",
@@ -413,11 +449,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -428,11 +464,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 9
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -443,11 +479,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 11
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -458,11 +494,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -473,11 +509,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -488,11 +524,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 9
                             ],
                             "end": [
-                                4,
+                                2,
                                 10
                             ]
                         }
@@ -503,11 +539,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 11
                             ],
                             "end": [
-                                4,
+                                2,
                                 12
                             ]
                         }
@@ -518,11 +554,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 13
                             ],
                             "end": [
-                                4,
+                                2,
                                 14
                             ]
                         }
@@ -533,11 +569,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -548,11 +584,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 9
                             ],
                             "end": [
-                                4,
+                                2,
                                 10
                             ]
                         }
@@ -563,11 +599,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 11
                             ],
                             "end": [
-                                4,
+                                2,
                                 12
                             ]
                         }
@@ -578,11 +614,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 13
                             ],
                             "end": [
-                                4,
+                                2,
                                 14
                             ]
                         }
@@ -596,9 +632,19 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "c79b560d124a946f56465001dc8f25492ec14de6",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index d2b8166..5b93d14 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -1,3 +1,2 @@",
+        "-type a [1+1]y",
+        "-type a [2+2]x",
+        " type a [2+2]x",
+        "+type a [1+1]y"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "eada01132d5a174337533994662482da20adf753"
+    "shas": "1458fd09e1ef2e04e8b8ef9f689c2c1c97f51537..c9e35d61508072dac51659d61f747dbb40ed1409"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-test",
@@ -609,11 +655,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -624,11 +670,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 9
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -639,11 +685,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 11
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -654,11 +700,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -672,9 +718,17 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "eada01132d5a174337533994662482da20adf753",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index 5b93d14..967447e 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -1,2 +1 @@",
+        "-type a [2+2]x",
+        " type a [1+1]y"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "28132de0b90eb8588e880b7237e7242e3195076c"
+    "shas": "c9e35d61508072dac51659d61f747dbb40ed1409..c6480a6cc44a0b8d54aec67dda72e6a765acace9"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-rest-test",
@@ -685,11 +739,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -700,11 +754,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 9
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -715,11 +769,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 11
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -730,11 +784,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -748,7 +802,14 @@
     "filePaths": [
         "array-types.go"
     ],
-    "sha1": "28132de0b90eb8588e880b7237e7242e3195076c",
+    "patch": [
+        "diff --git a/array-types.go b/array-types.go",
+        "index 967447e..e69de29 100644",
+        "--- a/array-types.go",
+        "+++ b/array-types.go",
+        "@@ -1 +0,0 @@",
+        "-type a [1+1]y"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "4c8c99e5a735f66e43d41e65a75a75272a162c8c"
+    "shas": "c6480a6cc44a0b8d54aec67dda72e6a765acace9..338fc2d73f62d9c316e48cf2390c1052834d4985"
 }]

test/corpus/diff-summaries/go/array-with-implicit-length.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 29
                             ]
                         }
@@ -25,9 +25,16 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "ac21f9d0ee6f7ef2a5a607b08fe2b95f3a6470c8",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index e69de29..96bef76 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -0,0 +1 @@",
+        "+const a1 = [...]int{1, 2, 3}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b2003e760af2573de2e6b858f19cfdf65c60e100"
+    "shas": "5b7d43722e8258820bec8f43f32d77913026fbd1..edcc037141ca5e780da35e91b330a260a8f79838"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-replacement-insert-test",
@@ -38,11 +45,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 27
                             ]
                         }
@@ -53,11 +60,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 29
                             ]
                         }
@@ -71,9 +78,18 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "b2003e760af2573de2e6b858f19cfdf65c60e100",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index 96bef76..f49bee5 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -1 +1,3 @@",
+        "+const a1 = [...]int{4,5,6}",
+        "+const a1 = [...]int{1, 2, 3}",
+        " const a1 = [...]int{1, 2, 3}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b9540f341273e90a488fdfb2bbd606bccf787d36"
+    "shas": "edcc037141ca5e780da35e91b330a260a8f79838..7d1007d97d728e64ee552482159b4198342facfe"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-insert-test",
@@ -85,84 +101,84 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     21
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     21
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '4' with '1' in the a1 variable of the 'main' module"
+                    "summary": "Replaced '4' with '1' in the a1 variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 24
                             ],
                             "end": [
-                                3,
+                                1,
                                 25
                             ]
                         }
                     },
-                    "summary": "Added '2' in the a1 variable of the 'main' module"
+                    "summary": "Added '2' in the a1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     23
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     24
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     27
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     28
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '5' with '3' in the a1 variable of the 'main' module"
+                    "summary": "Replaced '5' with '3' in the a1 variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 25
                             ],
                             "end": [
-                                3,
+                                1,
                                 26
                             ]
                         }
                     },
-                    "summary": "Deleted '6' in the a1 variable of the 'main' module"
+                    "summary": "Deleted '6' in the a1 variable"
                 }
             ]
         },
@@ -171,9 +187,19 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "b9540f341273e90a488fdfb2bbd606bccf787d36",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index f49bee5..9dcd627 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -1,3 +1,3 @@",
+        "-const a1 = [...]int{4,5,6}",
+        "+const a1 = [...]int{1, 2, 3}",
+        " const a1 = [...]int{1, 2, 3}",
+        " const a1 = [...]int{1, 2, 3}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "06870e4f83b7bd64b0d91a7087c1969a1672c48f"
+    "shas": "7d1007d97d728e64ee552482159b4198342facfe..88d19b7c4c4bf31b65d977c10679944f9f88d95b"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-replacement-test",
@@ -185,84 +211,84 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     21
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     21
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '4' in the a1 variable of the 'main' module"
+                    "summary": "Replaced '1' with '4' in the a1 variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 23
                             ],
                             "end": [
-                                3,
+                                1,
                                 24
                             ]
                         }
                     },
-                    "summary": "Added '5' in the a1 variable of the 'main' module"
+                    "summary": "Added '5' in the a1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     24
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     25
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     25
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     26
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '2' with '6' in the a1 variable of the 'main' module"
+                    "summary": "Replaced '2' with '6' in the a1 variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 27
                             ],
                             "end": [
-                                3,
+                                1,
                                 28
                             ]
                         }
                     },
-                    "summary": "Deleted '3' in the a1 variable of the 'main' module"
+                    "summary": "Deleted '3' in the a1 variable"
                 }
             ]
         },
@@ -271,9 +297,19 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "06870e4f83b7bd64b0d91a7087c1969a1672c48f",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index 9dcd627..f49bee5 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -1,3 +1,3 @@",
+        "-const a1 = [...]int{1, 2, 3}",
+        "+const a1 = [...]int{4,5,6}",
+        " const a1 = [...]int{1, 2, 3}",
+        " const a1 = [...]int{1, 2, 3}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "78f16bf51a9b1140330341e26e8511bca810e7c4"
+    "shas": "88d19b7c4c4bf31b65d977c10679944f9f88d95b..905f1a72deb7cec5e88cefc93e9628cad1d4e2bc"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-replacement-test",
@@ -284,11 +320,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 27
                             ]
                         }
@@ -299,11 +335,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 29
                             ]
                         }
@@ -314,11 +350,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 27
                             ]
                         }
@@ -332,9 +368,19 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "78f16bf51a9b1140330341e26e8511bca810e7c4",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index f49bee5..47b9eed 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -1,3 +1,2 @@",
+        "-const a1 = [...]int{4,5,6}",
+        "-const a1 = [...]int{1, 2, 3}",
+        " const a1 = [...]int{1, 2, 3}",
+        "+const a1 = [...]int{4,5,6}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e5ebc6a85298ceed84d950d738938506f90d50f1"
+    "shas": "905f1a72deb7cec5e88cefc93e9628cad1d4e2bc..fa1469f02d461361ba3454f261e10a6997fd8018"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-test",
@@ -345,11 +391,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 29
                             ]
                         }
@@ -363,9 +409,17 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "e5ebc6a85298ceed84d950d738938506f90d50f1",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index 47b9eed..4a8295f 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -1,2 +1 @@",
+        "-const a1 = [...]int{1, 2, 3}",
+        " const a1 = [...]int{4,5,6}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f94dc6ba5ee00ec4ec8aeea305dc3e0cedfa95ec"
+    "shas": "fa1469f02d461361ba3454f261e10a6997fd8018..474494799fa1d5404e6f73a5a5c8511431985ee2"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-rest-test",
@@ -376,11 +430,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 27
                             ]
                         }
@@ -394,7 +448,14 @@
     "filePaths": [
         "array-with-implicit-length.go"
     ],
-    "sha1": "f94dc6ba5ee00ec4ec8aeea305dc3e0cedfa95ec",
+    "patch": [
+        "diff --git a/array-with-implicit-length.go b/array-with-implicit-length.go",
+        "index 4a8295f..e69de29 100644",
+        "--- a/array-with-implicit-length.go",
+        "+++ b/array-with-implicit-length.go",
+        "@@ -1 +0,0 @@",
+        "-const a1 = [...]int{4,5,6}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3003ac02afb103f388ce64e485de8c028c6eb629"
+    "shas": "474494799fa1d5404e6f73a5a5c8511431985ee2..02421320cce3bcbcdb5d7bd248eb1aa0ef8aff93"
 }]

test/corpus/diff-summaries/go/const-declarations-with-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 19
                             ]
                         }
@@ -25,9 +25,16 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "c21d0b27e7c59d7774df63523503c3bc468e4b03",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index e69de29..da3bfc4 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -0,0 +1 @@",
+        "+const zero int = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "037b01f87e93e196246e7510a572960226d334c2"
+    "shas": "7c6671fbbc34d7ffd6c48ceafe5d7cb701952070..583d971ed03f04fe46711e9e2954e1fd8967ed9f"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-replacement-insert-test",
@@ -38,11 +45,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -53,11 +60,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -68,11 +75,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -86,9 +93,18 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "037b01f87e93e196246e7510a572960226d334c2",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index da3bfc4..86f010e 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -1 +1,3 @@",
+        "+const one, two uiint64 = 1, 2",
+        "+const zero int = 0",
+        " const zero int = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6361df62903f4e062984bdc670ce10de3dde2f40"
+    "shas": "583d971ed03f04fe46711e9e2954e1fd8967ed9f..6524d42fc14ef16ee8b4182d5ca6aa3b40c0ef22"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-insert-test",
@@ -100,64 +116,64 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero variable of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     26
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     27
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     18
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     19
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '0' in the zero variable of the 'main' module"
+                    "summary": "Replaced '1' with '0' in the zero variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -171,9 +187,19 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "6361df62903f4e062984bdc670ce10de3dde2f40",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index 86f010e..049ca7f 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-const one, two uiint64 = 1, 2",
+        "+const zero int = 0",
+        " const zero int = 0",
+        " const zero int = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a15739d174f2a8ca5ca6e7c06384933ef0c70f97"
+    "shas": "6524d42fc14ef16ee8b4182d5ca6aa3b40c0ef22..0ed9143e58bc31164f36886a75e832881432cc87"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-replacement-test",
@@ -185,64 +211,64 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one variable of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     18
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     19
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     26
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     27
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '0' with '1' in the one variable of the 'main' module"
+                    "summary": "Replaced '0' with '1' in the one variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -256,9 +282,19 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "a15739d174f2a8ca5ca6e7c06384933ef0c70f97",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index 049ca7f..86f010e 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-const zero int = 0",
+        "+const one, two uiint64 = 1, 2",
+        " const zero int = 0",
+        " const zero int = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "8458f0603f7f4fc15b6252185d5e735a91c8e2a0"
+    "shas": "0ed9143e58bc31164f36886a75e832881432cc87..d9db413fa87de51e109abeb31a69d648fc8414c2"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-replacement-test",
@@ -269,11 +305,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -284,11 +320,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -299,11 +335,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -314,11 +350,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 30
                             ]
                         }
@@ -329,11 +365,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 30
                             ]
                         }
@@ -347,9 +383,19 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "8458f0603f7f4fc15b6252185d5e735a91c8e2a0",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index 86f010e..f035105 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -1,3 +1,2 @@",
+        "-const one, two uiint64 = 1, 2",
+        "-const zero int = 0",
+        " const zero int = 0",
+        "+const one, two uiint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6ceaa758df5e705335778d863e4a000325a7188f"
+    "shas": "d9db413fa87de51e109abeb31a69d648fc8414c2..5810cba229beabf124f6fbf9f8839bf6516cbfec"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-test",
@@ -360,11 +406,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 19
                             ]
                         }
@@ -378,9 +424,17 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "6ceaa758df5e705335778d863e4a000325a7188f",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index f035105..716746a 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -1,2 +1 @@",
+        "-const zero int = 0",
+        " const one, two uiint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "205fd6749a22e393f4c96d72095a7347b473d3d7"
+    "shas": "5810cba229beabf124f6fbf9f8839bf6516cbfec..6f46e936e458f9355d6a374e25288b94989076d6"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-rest-test",
@@ -391,11 +445,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -406,11 +460,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 30
                             ]
                         }
@@ -424,7 +478,14 @@
     "filePaths": [
         "const-declarations-with-types.go"
     ],
-    "sha1": "205fd6749a22e393f4c96d72095a7347b473d3d7",
+    "patch": [
+        "diff --git a/const-declarations-with-types.go b/const-declarations-with-types.go",
+        "index 716746a..e69de29 100644",
+        "--- a/const-declarations-with-types.go",
+        "+++ b/const-declarations-with-types.go",
+        "@@ -1 +0,0 @@",
+        "-const one, two uiint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "45b551f3f778995db1cbc9c4f64fc2a76995f41e"
+    "shas": "6f46e936e458f9355d6a374e25288b94989076d6..95f53bbe92bd5841e140af869c4f35cb74379028"
 }]

test/corpus/diff-summaries/go/const-declarations-without-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 15
                             ]
                         }
@@ -25,9 +25,16 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "f99392e84d40bc621fdc924228e731d179062c0b",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index e69de29..2f2e175 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -0,0 +1 @@",
+        "+const zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1aeedda828a7dda70f61221adf03427cd19ad270"
+    "shas": "47227a5c2dd60f353b45407e2d7695a53dc5bab9..c650e59013878fb76859603a33f695e9a42ab44d"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-replacement-insert-test",
@@ -38,11 +45,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -53,11 +60,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -68,11 +75,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 15
                             ]
                         }
@@ -86,9 +93,18 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "1aeedda828a7dda70f61221adf03427cd19ad270",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index 2f2e175..2d4a6fd 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -1 +1,3 @@",
+        "+const one, two = 1, 2",
+        "+const zero = 0",
+        " const zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "90d6f25afff0c53fc696d3d4a402e486b099effa"
+    "shas": "c650e59013878fb76859603a33f695e9a42ab44d..293c1186dbff3ce68dc45b31996c35d9b08017f2"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-insert-test",
@@ -100,64 +116,64 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero variable of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     18
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     19
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     14
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     15
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '0' in the zero variable of the 'main' module"
+                    "summary": "Replaced '1' with '0' in the zero variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -171,9 +187,19 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "90d6f25afff0c53fc696d3d4a402e486b099effa",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index 2d4a6fd..b60f29e 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-const one, two = 1, 2",
+        "+const zero = 0",
+        " const zero = 0",
+        " const zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7808862de1745ca995adc4fa43c1a257f3c959bf"
+    "shas": "293c1186dbff3ce68dc45b31996c35d9b08017f2..fcf3cba3eb450ffbe0c7a99281a5f4cbcd0d60f4"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-replacement-test",
@@ -185,64 +211,64 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one variable of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     14
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     15
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     18
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     19
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '0' with '1' in the one variable of the 'main' module"
+                    "summary": "Replaced '0' with '1' in the one variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -256,9 +282,19 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "7808862de1745ca995adc4fa43c1a257f3c959bf",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index b60f29e..2d4a6fd 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-const zero = 0",
+        "+const one, two = 1, 2",
+        " const zero = 0",
+        " const zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "624ed9b2234e961fd0c468233cb107b4e8c5dfa5"
+    "shas": "fcf3cba3eb450ffbe0c7a99281a5f4cbcd0d60f4..55a610329ed6c20c9bb7cc73e0490ce448a0cd5f"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-replacement-test",
@@ -269,11 +305,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -284,11 +320,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -299,11 +335,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 15
                             ]
                         }
@@ -314,11 +350,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 22
                             ]
                         }
@@ -329,11 +365,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 22
                             ]
                         }
@@ -347,9 +383,19 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "624ed9b2234e961fd0c468233cb107b4e8c5dfa5",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index 2d4a6fd..0cb8229 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -1,3 +1,2 @@",
+        "-const one, two = 1, 2",
+        "-const zero = 0",
+        " const zero = 0",
+        "+const one, two = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "440cf2448c118a2373813a5fe19a96d558943dd1"
+    "shas": "55a610329ed6c20c9bb7cc73e0490ce448a0cd5f..fc5a942eccd22eaa8f7acca5b37460dd6c867dba"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-test",
@@ -360,11 +406,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 15
                             ]
                         }
@@ -378,9 +424,17 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "440cf2448c118a2373813a5fe19a96d558943dd1",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index 0cb8229..83cc71f 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -1,2 +1 @@",
+        "-const zero = 0",
+        " const one, two = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "63236464b373c75b26318e339d0a64f9c37ab843"
+    "shas": "fc5a942eccd22eaa8f7acca5b37460dd6c867dba..3954838abc7833ed1cf3fec73b3d00436e14676a"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-rest-test",
@@ -391,11 +445,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -406,11 +460,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -424,7 +478,14 @@
     "filePaths": [
         "const-declarations-without-types.go"
     ],
-    "sha1": "63236464b373c75b26318e339d0a64f9c37ab843",
+    "patch": [
+        "diff --git a/const-declarations-without-types.go b/const-declarations-without-types.go",
+        "index 83cc71f..e69de29 100644",
+        "--- a/const-declarations-without-types.go",
+        "+++ b/const-declarations-without-types.go",
+        "@@ -1 +0,0 @@",
+        "-const one, two = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c21d0b27e7c59d7774df63523503c3bc468e4b03"
+    "shas": "3954838abc7833ed1cf3fec73b3d00436e14676a..7c6671fbbc34d7ffd6c48ceafe5d7cb701952070"
 }]

test/corpus/diff-summaries/go/const-with-implicit-values.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -55,9 +55,20 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "475deec198e080301901a65778b6e2ee6255ee60",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index e69de29..938a571 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -0,0 +1,5 @@",
+        "+const (",
+        "+ zero = iota",
+        "+ one",
+        "+ two",
+        "+ )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ac39692dc8e60b73af4c24df31d58e96a8cf4ae4"
+    "shas": "479bb7390b5a93cd2d670d77d3ac6bf6c4169be4..deb921d5c92c5599bf92d3a73434561717cc51fb"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-replacement-insert-test",
@@ -68,11 +79,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -83,11 +94,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -98,11 +109,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -113,11 +124,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -128,11 +139,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -143,11 +154,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -161,9 +172,29 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "ac39692dc8e60b73af4c24df31d58e96a8cf4ae4",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index 938a571..071b359 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -1,4 +1,14 @@",
+        " const (",
+        "+ a = iota",
+        "+ b",
+        "+ c",
+        "+ )",
+        "+const (",
+        "+ zero = iota",
+        "+ one",
+        "+ two",
+        "+ )",
+        "+const (",
+        "  zero = iota",
+        "  one",
+        "  two"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "784d367a0e4ba45ac0659e22c03a3f34d3c5394c"
+    "shas": "deb921d5c92c5599bf92d3a73434561717cc51fb..845186fb5aa10cf909a91e344b0642b04c714c6e"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-insert-test",
@@ -175,48 +206,48 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     3
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     6
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero variable of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     2
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     3
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     2
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     5
                                 ]
                             }
@@ -229,21 +260,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     2
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     3
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     2
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             }
@@ -258,9 +289,25 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "784d367a0e4ba45ac0659e22c03a3f34d3c5394c",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index 071b359..8a6d638 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -1,7 +1,7 @@",
+        " const (",
+        "- a = iota",
+        "- b",
+        "- c",
+        "+ zero = iota",
+        "+ one",
+        "+ two",
+        "  )",
+        " const (",
+        "  zero = iota"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "d6fea3f4d2a09fb831635228ffd52e4029a66690"
+    "shas": "845186fb5aa10cf909a91e344b0642b04c714c6e..7d478cd8b81e9bd6ceab2d831e67fe84c2e5302b"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-replacement-test",
@@ -272,48 +319,48 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     3
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a variable of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     2
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     2
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     3
                                 ]
                             }
@@ -326,21 +373,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     2
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     2
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     3
                                 ]
                             }
@@ -355,9 +402,25 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "d6fea3f4d2a09fb831635228ffd52e4029a66690",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index 8a6d638..071b359 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -1,7 +1,7 @@",
+        " const (",
+        "- zero = iota",
+        "- one",
+        "- two",
+        "+ a = iota",
+        "+ b",
+        "+ c",
+        "  )",
+        " const (",
+        "  zero = iota"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b4617614ee8c58faf89055b68cbcd640663208d3"
+    "shas": "7d478cd8b81e9bd6ceab2d831e67fe84c2e5302b..c7803f6793bf104045f60805ea29e82b1e15c8de"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-replacement-test",
@@ -368,11 +431,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -383,11 +446,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -398,11 +461,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -413,11 +476,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -428,11 +491,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -443,11 +506,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -458,11 +521,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -473,11 +536,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -488,11 +551,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 3
                             ]
                         }
@@ -506,9 +569,33 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "b4617614ee8c58faf89055b68cbcd640663208d3",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index 071b359..ae8b277 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -1,15 +1,10 @@",
+        " const (",
+        "- a = iota",
+        "- b",
+        "- c",
+        "- )",
+        "-const (",
+        "  zero = iota",
+        "  one",
+        "  two",
+        "  )",
+        " const (",
+        "- zero = iota",
+        "- one",
+        "- two",
+        "+ a = iota",
+        "+ b",
+        "+ c",
+        "  )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "0c0cd503b0f4d88a94cbee4fa7ad2b973e8960ac"
+    "shas": "c7803f6793bf104045f60805ea29e82b1e15c8de..549397a8b29323bb63774a7e6e7c9cbe12e8d585"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-test",
@@ -519,11 +606,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -534,11 +621,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -549,11 +636,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -567,9 +654,24 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "0c0cd503b0f4d88a94cbee4fa7ad2b973e8960ac",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index ae8b277..dfb4fad 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -1,9 +1,4 @@",
+        " const (",
+        "- zero = iota",
+        "- one",
+        "- two",
+        "- )",
+        "-const (",
+        "  a = iota",
+        "  b",
+        "  c"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "295241a104dec9ecba7fa69ba2012d53d4f88618"
+    "shas": "549397a8b29323bb63774a7e6e7c9cbe12e8d585..791136ead6293a07a456aeece9d8fca54919f160"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-rest-test",
@@ -580,11 +682,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -595,11 +697,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -610,11 +712,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 3
                             ]
                         }
@@ -628,7 +730,18 @@
     "filePaths": [
         "const-with-implicit-values.go"
     ],
-    "sha1": "295241a104dec9ecba7fa69ba2012d53d4f88618",
+    "patch": [
+        "diff --git a/const-with-implicit-values.go b/const-with-implicit-values.go",
+        "index dfb4fad..e69de29 100644",
+        "--- a/const-with-implicit-values.go",
+        "+++ b/const-with-implicit-values.go",
+        "@@ -1,5 +0,0 @@",
+        "-const (",
+        "- a = iota",
+        "- b",
+        "- c",
+        "- )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "bd92d81359528aecb248c2875d9cb620f555c9a7"
+    "shas": "791136ead6293a07a456aeece9d8fca54919f160..40bb3501528e6739138d99014546c14c14335b62"
 }]

test/corpus/diff-summaries/go/function-literals.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -25,9 +25,18 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "feb6123e4d38848977a42544b3bae6334aecf1e0",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index e69de29..49cbe77 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -0,0 +1,3 @@",
+        "+const s1 = func(s string) (int, int) {",
+        "+return 1, 2",
+        "+}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "14647fcfa4649e9784df604fefe4128a4af732e7"
+    "shas": "67f60ac0f2697ef8db7d2d1dba1a0b6528d97d51..8755974c3cd7ac6f2006d4e0414296eb9db38d7e"
 }
 ,{
     "testCaseDescription": "go-function-literals-replacement-insert-test",
@@ -38,11 +47,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -53,11 +62,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -71,9 +80,24 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "14647fcfa4649e9784df604fefe4128a4af732e7",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index 49cbe77..913c35a 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -1,3 +1,9 @@",
+        "+const s1 = func(b int) (string, string) {",
+        "+return 1, 2",
+        "+}",
+        "+const s1 = func(s string) (int, int) {",
+        "+return 1, 2",
+        "+}",
+        " const s1 = func(s string) (int, int) {",
+        " return 1, 2",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "089bc8da72a692d35ffacd1ecf61cb5558608ad6"
+    "shas": "8755974c3cd7ac6f2006d4e0414296eb9db38d7e..ee675e2f15860cd9206b37838cbcaff58523fdba"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-insert-test",
@@ -85,54 +109,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     17
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     17
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 's' identifier in the s1 variable of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 's' identifier in the s1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     19
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     19
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     25
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the s1 variable of the 'main' module"
+                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the s1 variable"
                 }
             ]
         },
@@ -141,9 +165,20 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "089bc8da72a692d35ffacd1ecf61cb5558608ad6",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index 913c35a..731e2c6 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -1,4 +1,4 @@",
+        "-const s1 = func(b int) (string, string) {",
+        "+const s1 = func(s string) (int, int) {",
+        " return 1, 2",
+        " }",
+        " const s1 = func(s string) (int, int) {"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "fd04c7101ea4fada80892f6d8266453324fc8bf7"
+    "shas": "ee675e2f15860cd9206b37838cbcaff58523fdba..a251d3cd5feeb8cfe7a47551c659b0b16e5a2d9f"
 }
 ,{
     "testCaseDescription": "go-function-literals-replacement-test",
@@ -155,54 +190,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     17
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     17
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 's' identifier with the 'b' identifier in the s1 variable of the 'main' module"
+                    "summary": "Replaced the 's' identifier with the 'b' identifier in the s1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     19
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     25
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     19
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'string' identifier with the 'int' identifier in the s1 variable of the 'main' module"
+                    "summary": "Replaced the 'string' identifier with the 'int' identifier in the s1 variable"
                 }
             ]
         },
@@ -211,9 +246,20 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "fd04c7101ea4fada80892f6d8266453324fc8bf7",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index 731e2c6..913c35a 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -1,4 +1,4 @@",
+        "-const s1 = func(s string) (int, int) {",
+        "+const s1 = func(b int) (string, string) {",
+        " return 1, 2",
+        " }",
+        " const s1 = func(s string) (int, int) {"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3d746e3f13a4392548edef656eeb9f8e7fa46ad7"
+    "shas": "a251d3cd5feeb8cfe7a47551c659b0b16e5a2d9f..ecfe71d5501411a8c39f306bd98ce8972e655c6f"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-replacement-test",
@@ -224,11 +270,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -239,11 +285,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -254,11 +300,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -272,9 +318,25 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "3d746e3f13a4392548edef656eeb9f8e7fa46ad7",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index 913c35a..51820bc 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -1,9 +1,6 @@",
+        "-const s1 = func(b int) (string, string) {",
+        "-return 1, 2",
+        "-}",
+        " const s1 = func(s string) (int, int) {",
+        " return 1, 2",
+        " }",
+        "-const s1 = func(s string) (int, int) {",
+        "+const s1 = func(b int) (string, string) {",
+        " return 1, 2",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "49f2d11ce6eeb1be2843f138688487c077222380"
+    "shas": "ecfe71d5501411a8c39f306bd98ce8972e655c6f..aaf5cae89acd940e7de671e5ee7bde85182c18a6"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-test",
@@ -285,11 +347,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -303,9 +365,21 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "49f2d11ce6eeb1be2843f138688487c077222380",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index 51820bc..d21dc2d 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -1,6 +1,3 @@",
+        "-const s1 = func(s string) (int, int) {",
+        "-return 1, 2",
+        "-}",
+        " const s1 = func(b int) (string, string) {",
+        " return 1, 2",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3f3560e2bd7986b84d183880a6709ba0d301722d"
+    "shas": "aaf5cae89acd940e7de671e5ee7bde85182c18a6..1619b15c7c4717361edf049d214759493d0cdc29"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-rest-test",
@@ -316,11 +390,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -334,7 +408,16 @@
     "filePaths": [
         "function-literals.go"
     ],
-    "sha1": "3f3560e2bd7986b84d183880a6709ba0d301722d",
+    "patch": [
+        "diff --git a/function-literals.go b/function-literals.go",
+        "index d21dc2d..e69de29 100644",
+        "--- a/function-literals.go",
+        "+++ b/function-literals.go",
+        "@@ -1,3 +0,0 @@",
+        "-const s1 = func(b int) (string, string) {",
+        "-return 1, 2",
+        "-}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f99392e84d40bc621fdc924228e731d179062c0b"
+    "shas": "1619b15c7c4717361edf049d214759493d0cdc29..47227a5c2dd60f353b45407e2d7695a53dc5bab9"
 }]

test/corpus/diff-summaries/go/go-and-defer-statements.json

@@ -5,30 +5,33 @@
             "go-and-defer-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                7
+                            ],
+                            "end": [
+                                1,
+                                12
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added the 'identifier()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                4
+                            ],
+                            "end": [
+                                2,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier()' function call"
                 }
             ]
         },
@@ -37,9 +40,17 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "52c2367740c0d2f7f66fbb1638b6bbe52b8bb586",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index e69de29..2638f27 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -0,0 +1,2 @@",
+        "+defer x.y()",
+        "+go x.y()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ff145520e936a2f8287e7b7f560e648c86e37d73"
+    "shas": "c169e9683d54586a7fa6eab867dc6eb4eae7e85c..80641345f16131608a18991fe0a29736f5f5b66d"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-replacement-insert-test",
@@ -50,11 +61,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -65,11 +76,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 4
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -80,11 +91,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 7
                             ],
                             "end": [
-                                5,
+                                3,
                                 12
                             ]
                         }
@@ -95,11 +106,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 4
                             ],
                             "end": [
-                                6,
+                                4,
                                 9
                             ]
                         }
@@ -113,9 +124,21 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "ff145520e936a2f8287e7b7f560e648c86e37d73",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index 2638f27..0cb11d5 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -1,2 +1,6 @@",
+        "+defer a.b()",
+        "+go c.d()",
+        "+defer x.y()",
+        "+go x.y()",
+        " defer x.y()",
+        " go x.y()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "35d23458ecbda705d91d36133acb3ee06114160e"
+    "shas": "80641345f16131608a18991fe0a29736f5f5b66d..c4bf57adbccc55e8edec2a3e41f7a5e385b41e44"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-insert-test",
@@ -127,21 +150,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
@@ -154,21 +177,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
@@ -181,21 +204,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     4
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     4
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             }
@@ -208,21 +231,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     7
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     7
                                 ]
                             }
@@ -237,9 +260,22 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "35d23458ecbda705d91d36133acb3ee06114160e",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index 0cb11d5..bdc42aa 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -1,5 +1,5 @@",
+        "-defer a.b()",
+        "-go c.d()",
+        "+defer x.y()",
+        "+go x.y()",
+        " defer x.y()",
+        " go x.y()",
+        " defer x.y()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f88c96f73dcf4e7e57a35b85a54babeb4b8be7c1"
+    "shas": "c4bf57adbccc55e8edec2a3e41f7a5e385b41e44..ee1387252f87d4b177e4220468eb3464aca29649"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-replacement-test",
@@ -251,21 +287,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     7
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
@@ -278,21 +314,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
@@ -305,21 +341,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     4
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     4
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             }
@@ -332,21 +368,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     7
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     7
                                 ]
                             }
@@ -361,9 +397,22 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "f88c96f73dcf4e7e57a35b85a54babeb4b8be7c1",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index bdc42aa..0cb11d5 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -1,5 +1,5 @@",
+        "-defer x.y()",
+        "-go x.y()",
+        "+defer a.b()",
+        "+go c.d()",
+        " defer x.y()",
+        " go x.y()",
+        " defer x.y()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b0fad2ef7fadce069db33e4d5d351cf07381ad0c"
+    "shas": "ee1387252f87d4b177e4220468eb3464aca29649..cf2d1e4c851ac68b7f34e8e038d2a4f1baed2c29"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-replacement-test",
@@ -374,11 +423,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -389,11 +438,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 4
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -404,11 +453,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 7
                             ],
                             "end": [
-                                5,
+                                3,
                                 12
                             ]
                         }
@@ -419,11 +468,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 4
                             ],
                             "end": [
-                                6,
+                                4,
                                 9
                             ]
                         }
@@ -434,11 +483,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 7
                             ],
                             "end": [
-                                5,
+                                3,
                                 12
                             ]
                         }
@@ -449,11 +498,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 4
                             ],
                             "end": [
-                                6,
+                                4,
                                 9
                             ]
                         }
@@ -467,9 +516,23 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "b0fad2ef7fadce069db33e4d5d351cf07381ad0c",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index 0cb11d5..f18666e 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -1,6 +1,4 @@",
+        "-defer a.b()",
+        "-go c.d()",
+        "-defer x.y()",
+        "-go x.y()",
+        " defer x.y()",
+        " go x.y()",
+        "+defer a.b()",
+        "+go c.d()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "23967cd45fb4ea3b1ba4510a47506b8782b1842a"
+    "shas": "cf2d1e4c851ac68b7f34e8e038d2a4f1baed2c29..ac0dbf98bade4304c09fbf1c54659937d25ef4f6"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-test",
@@ -480,11 +543,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -495,11 +558,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 4
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -513,9 +576,19 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "23967cd45fb4ea3b1ba4510a47506b8782b1842a",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index f18666e..eefd2e4 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -1,4 +1,2 @@",
+        "-defer x.y()",
+        "-go x.y()",
+        " defer a.b()",
+        " go c.d()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f0dc69f90f6294734196eb47b4391629a1b7ef82"
+    "shas": "ac0dbf98bade4304c09fbf1c54659937d25ef4f6..9d87babf6dd8ad58fecae95e0fe516803ef693af"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-rest-test",
@@ -524,30 +597,33 @@
             "go-and-defer-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                7
+                            ],
+                            "end": [
+                                1,
+                                12
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'identifier()' function call"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                4
+                            ],
+                            "end": [
+                                2,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'identifier()' function call"
                 }
             ]
         },
@@ -556,7 +632,15 @@
     "filePaths": [
         "go-and-defer-statements.go"
     ],
-    "sha1": "f0dc69f90f6294734196eb47b4391629a1b7ef82",
+    "patch": [
+        "diff --git a/go-and-defer-statements.go b/go-and-defer-statements.go",
+        "index eefd2e4..e69de29 100644",
+        "--- a/go-and-defer-statements.go",
+        "+++ b/go-and-defer-statements.go",
+        "@@ -1,2 +0,0 @@",
+        "-defer a.b()",
+        "-go c.d()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c69fcfce40f178714107964705a6370513f7733e"
+    "shas": "9d87babf6dd8ad58fecae95e0fe516803ef693af..b36463027cca058b97d4495c8c08a1ab9ab5cc0a"
 }]

test/corpus/diff-summaries/go/grouped-import-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -41,16 +41,16 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
                     },
-                    "summary": "Added the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 3, column 1 - line 7, column 2"
+                    "summary": "Added the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 1, column 1 - line 5, column 2"
                 }
             ]
         }
@@ -58,9 +58,20 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "60d0595870f22587e7f31bed659faaa89e73c81d",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index e69de29..6560136 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -0,0 +1,5 @@",
+        "+import (",
+        "+\"net/http\"",
+        "+  . \"some/dsl\"",
+        "+  alias \"some/package\"",
+        "+)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1fe7a29c5ec7cbbfbbe9c08f0df45e550a37e309"
+    "shas": "49405e780f45c25871a6c2c6a9c4bf847007c59f..cc06896916290333b40603e033a3026be682acd2"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-replacement-insert-test",
@@ -71,11 +82,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -86,11 +97,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -101,11 +112,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -116,11 +127,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -135,31 +146,31 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
                     },
-                    "summary": "Added the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 3, column 1 - line 7, column 2"
+                    "summary": "Added the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 1, column 1 - line 5, column 2"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
                     },
-                    "summary": "Added the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 8, column 1 - line 12, column 2"
+                    "summary": "Added the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 6, column 1 - line 10, column 2"
                 }
             ]
         }
@@ -167,9 +178,29 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "1fe7a29c5ec7cbbfbbe9c08f0df45e550a37e309",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index 6560136..31d6bd7 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -1,4 +1,14 @@",
+        " import (",
+        "+\"net/socket\"",
+        "+  . \"types/dsl\"",
+        "+  alias \"awesome/package\"",
+        "+)",
+        "+import (",
+        "+\"net/http\"",
+        "+  . \"some/dsl\"",
+        "+  alias \"some/package\"",
+        "+)",
+        "+import (",
+        " \"net/http\"",
+        "   . \"some/dsl\"",
+        "   alias \"some/package\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "bfae8c56020292f9b5b6a6bf4b3a93baca698132"
+    "shas": "cc06896916290333b40603e033a3026be682acd2..ae3d9e278cd263970d3db8098ffa0c1f92467a94"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-insert-test",
@@ -181,75 +212,75 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     11
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"net/socket\" string with the \"net/http\" string in the \"net/http\" import statement of the 'main' module"
+                    "summary": "Replaced the \"net/socket\" string with the \"net/http\" string in the \"net/http\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     16
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     15
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the \"some/dsl\" import statement of the 'main' module"
+                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the \"some/dsl\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     9
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     26
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     9
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     23
                                 ]
                             }
@@ -264,9 +295,25 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "bfae8c56020292f9b5b6a6bf4b3a93baca698132",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index 31d6bd7..b045ab3 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -1,7 +1,7 @@",
+        " import (",
+        "-\"net/socket\"",
+        "-  . \"types/dsl\"",
+        "-  alias \"awesome/package\"",
+        "+\"net/http\"",
+        "+  . \"some/dsl\"",
+        "+  alias \"some/package\"",
+        " )",
+        " import (",
+        " \"net/http\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "4486c18ce99e8c00f902916fefae9c8e93e53604"
+    "shas": "ae3d9e278cd263970d3db8098ffa0c1f92467a94..e58383201c252323abe4b3bab9aa34697e646d47"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-replacement-test",
@@ -278,75 +325,75 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     11
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"net/http\" string with the \"net/socket\" string in the \"net/socket\" import statement of the 'main' module"
+                    "summary": "Replaced the \"net/http\" string with the \"net/socket\" string in the \"net/socket\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     15
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     16
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the \"types/dsl\" import statement of the 'main' module"
+                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the \"types/dsl\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     9
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     23
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     9
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     26
                                 ]
                             }
@@ -361,9 +408,25 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "4486c18ce99e8c00f902916fefae9c8e93e53604",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index b045ab3..31d6bd7 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -1,7 +1,7 @@",
+        " import (",
+        "-\"net/http\"",
+        "-  . \"some/dsl\"",
+        "-  alias \"some/package\"",
+        "+\"net/socket\"",
+        "+  . \"types/dsl\"",
+        "+  alias \"awesome/package\"",
+        " )",
+        " import (",
+        " \"net/http\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ebeab6442fbe6ebfa96ec494a608838fdeb939d2"
+    "shas": "e58383201c252323abe4b3bab9aa34697e646d47..349362f05c75b2ed25ff9be203d01d1d1653e1d4"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-replacement-test",
@@ -374,11 +437,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -389,11 +452,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -404,11 +467,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -419,11 +482,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -434,11 +497,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -449,11 +512,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -468,46 +531,46 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 3, column 1 - line 7, column 2"
+                    "summary": "Deleted the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 1, column 1 - line 5, column 2"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 8, column 1 - line 12, column 2"
+                    "summary": "Deleted the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 6, column 1 - line 10, column 2"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
                     },
-                    "summary": "Added the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 8, column 1 - line 12, column 2"
+                    "summary": "Added the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 6, column 1 - line 10, column 2"
                 }
             ]
         }
@@ -515,9 +578,33 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "ebeab6442fbe6ebfa96ec494a608838fdeb939d2",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index 31d6bd7..62facc6 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -1,15 +1,10 @@",
+        " import (",
+        "-\"net/socket\"",
+        "-  . \"types/dsl\"",
+        "-  alias \"awesome/package\"",
+        "-)",
+        "-import (",
+        " \"net/http\"",
+        "   . \"some/dsl\"",
+        "   alias \"some/package\"",
+        " )",
+        " import (",
+        "-\"net/http\"",
+        "-  . \"some/dsl\"",
+        "-  alias \"some/package\"",
+        "+\"net/socket\"",
+        "+  . \"types/dsl\"",
+        "+  alias \"awesome/package\"",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a146a9af4f24e654718d36f735709738ac4aa6fc"
+    "shas": "349362f05c75b2ed25ff9be203d01d1d1653e1d4..96f9229250891a51f9f57e74e7e4b203e2645c56"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-test",
@@ -528,11 +615,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -543,11 +630,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -562,16 +649,16 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 3, column 1 - line 7, column 2"
+                    "summary": "Deleted the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 1, column 1 - line 5, column 2"
                 }
             ]
         }
@@ -579,9 +666,24 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "a146a9af4f24e654718d36f735709738ac4aa6fc",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index 62facc6..e2f9293 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -1,9 +1,4 @@",
+        " import (",
+        "-\"net/http\"",
+        "-  . \"some/dsl\"",
+        "-  alias \"some/package\"",
+        "-)",
+        "-import (",
+        " \"net/socket\"",
+        "   . \"types/dsl\"",
+        "   alias \"awesome/package\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f81df7eb8f27b1b375c0539beda1cb82f16df0ae"
+    "shas": "96f9229250891a51f9f57e74e7e4b203e2645c56..67cbd59683a26fc0a936ac70b19ebb9074aa5b03"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-rest-test",
@@ -592,11 +694,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -607,11 +709,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
@@ -626,16 +728,16 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 2
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 3, column 1 - line 7, column 2"
+                    "summary": "Deleted the 'import (\n\"net/socket\"\n  . \"types/dsl\"\n  alias \"awesome/package\"\n)' at line 1, column 1 - line 5, column 2"
                 }
             ]
         }
@@ -643,7 +745,18 @@
     "filePaths": [
         "grouped-import-declarations.go"
     ],
-    "sha1": "f81df7eb8f27b1b375c0539beda1cb82f16df0ae",
+    "patch": [
+        "diff --git a/grouped-import-declarations.go b/grouped-import-declarations.go",
+        "index e2f9293..e69de29 100644",
+        "--- a/grouped-import-declarations.go",
+        "+++ b/grouped-import-declarations.go",
+        "@@ -1,5 +0,0 @@",
+        "-import (",
+        "-\"net/socket\"",
+        "-  . \"types/dsl\"",
+        "-  alias \"awesome/package\"",
+        "-)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7d873f0d5579c52294d6b425bd5d9729ac1782e1"
+    "shas": "67cbd59683a26fc0a936ac70b19ebb9074aa5b03..c6aae7f905be036e251d244801d3fd73b49f6c46"
 }]

test/corpus/diff-summaries/go/grouped-var-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -40,9 +40,19 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "3f6fa7c6f499951a277e9ae6edce3681134ef5d9",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index e69de29..c1c0b16 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -0,0 +1,4 @@",
+        "+var (",
+        "+zero = 0",
+        "+one = 1",
+        "+)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6f2161f8593d0ec0dacd2958538ce5fa2a84f6ba"
+    "shas": "7ec7378727f160ff6fb78761d149f5f110898c3e..514932d92bd7fa7d087adb1d4968ff2d1b35d832"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-replacement-insert-test",
@@ -53,11 +63,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -68,11 +78,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -83,11 +93,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -98,11 +108,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -116,9 +126,27 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "6f2161f8593d0ec0dacd2958538ce5fa2a84f6ba",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index c1c0b16..6b9c91d 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -1,4 +1,12 @@",
+        " var (",
+        "+a = 0",
+        "+b = 1",
+        "+)",
+        "+var (",
+        "+zero = 0",
+        "+one = 1",
+        "+)",
+        "+var (",
+        " zero = 0",
+        " one = 1",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "aacd0b2f15a856a49e3d7fe131aed23a9c77224f"
+    "shas": "514932d92bd7fa7d087adb1d4968ff2d1b35d832..d8482bba7e246518bcaf8b8759b4ccaf7fd3f41d"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-insert-test",
@@ -130,54 +158,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero variable of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     4
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the one variable of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the one variable"
                 }
             ]
         },
@@ -186,9 +214,23 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "aacd0b2f15a856a49e3d7fe131aed23a9c77224f",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index 6b9c91d..5ed0e06 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        " var (",
+        "-a = 0",
+        "-b = 1",
+        "+zero = 0",
+        "+one = 1",
+        " )",
+        " var (",
+        " zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "8d277d6c567a51e3154eb9ee8d7f02f8ecda938e"
+    "shas": "d8482bba7e246518bcaf8b8759b4ccaf7fd3f41d..3221bb9fd5791c127b591e17941faf48d46e11f7"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-replacement-test",
@@ -200,54 +242,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     2
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a variable of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     4
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     2
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the b variable of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the b variable"
                 }
             ]
         },
@@ -256,9 +298,23 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "8d277d6c567a51e3154eb9ee8d7f02f8ecda938e",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index 5ed0e06..6b9c91d 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        " var (",
+        "-zero = 0",
+        "-one = 1",
+        "+a = 0",
+        "+b = 1",
+        " )",
+        " var (",
+        " zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "10bfc15216d52a971377c98ada621b65d1f1d762"
+    "shas": "3221bb9fd5791c127b591e17941faf48d46e11f7..eb6cf49333e266ba6255891b55edc54e015cc8dd"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-replacement-test",
@@ -269,11 +325,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -284,11 +340,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -299,11 +355,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -314,11 +370,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -329,11 +385,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -344,11 +400,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -362,9 +418,29 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "10bfc15216d52a971377c98ada621b65d1f1d762",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index 6b9c91d..9094e82 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -1,12 +1,8 @@",
+        " var (",
+        "-a = 0",
+        "-b = 1",
+        "-)",
+        "-var (",
+        " zero = 0",
+        " one = 1",
+        " )",
+        " var (",
+        "-zero = 0",
+        "-one = 1",
+        "+a = 0",
+        "+b = 1",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ff81eb523089ada7047b28b1802b8f4ee6ce77d3"
+    "shas": "eb6cf49333e266ba6255891b55edc54e015cc8dd..3973fafa7c0a3f1f3cd2e92462d863df41f3a920"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-test",
@@ -375,11 +451,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -390,11 +466,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -408,9 +484,23 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "ff81eb523089ada7047b28b1802b8f4ee6ce77d3",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index 9094e82..d954576 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -1,8 +1,4 @@",
+        " var (",
+        "-zero = 0",
+        "-one = 1",
+        "-)",
+        "-var (",
+        " a = 0",
+        " b = 1",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "706e2dd9a32626624b48a24e0b82d45574ccdbd1"
+    "shas": "3973fafa7c0a3f1f3cd2e92462d863df41f3a920..39e74e79c2f9366472ae046e56a3e0a60d1797e1"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-rest-test",
@@ -421,11 +511,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -436,11 +526,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -454,7 +544,17 @@
     "filePaths": [
         "grouped-var-declarations.go"
     ],
-    "sha1": "706e2dd9a32626624b48a24e0b82d45574ccdbd1",
+    "patch": [
+        "diff --git a/grouped-var-declarations.go b/grouped-var-declarations.go",
+        "index d954576..e69de29 100644",
+        "--- a/grouped-var-declarations.go",
+        "+++ b/grouped-var-declarations.go",
+        "@@ -1,4 +0,0 @@",
+        "-var (",
+        "-a = 0",
+        "-b = 1",
+        "-)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ad009ae663a027f35bb25867c4aa1375820fd816"
+    "shas": "39e74e79c2f9366472ae046e56a3e0a60d1797e1..c8c183bd98d018d2097fe1ee036d32d979f4919b"
 }]

test/corpus/diff-summaries/go/if-statements.json

@@ -1,48 +1,5 @@
 [{
     "testCaseDescription": "go-if-statements-insert-test",
-    "expectedResult": {
-        "changes": {
-            "if-statements.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'main' module with the 'main' module"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "if-statements.go"
-    ],
-    "sha1": "d721dbc2d0c1b003563fe79a82b9f2d3f609cc64",
-    "gitDir": "test/corpus/repos/go",
-    "sha2": "8ff80ea94d04e830ad846d865336e741c8364795"
-}
-,{
-    "testCaseDescription": "go-if-statements-replacement-insert-test",
     "expectedResult": {
         "changes": {
             "if-statements.go": [
@@ -50,56 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
                                 3,
-                                1
-                            ],
-                            "end": [
-                                5,
-                                2
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'x()' if statement"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                6,
-                                1
-                            ],
-                            "end": [
-                                8,
-                                2
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'y := b(); c' if statement"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                9,
-                                1
-                            ],
-                            "end": [
-                                13,
-                                2
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'z()' if statement"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                14,
-                                1
-                            ],
-                            "end": [
-                                16,
                                 2
                             ]
                         }
@@ -110,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                17,
+                                4,
                                 1
                             ],
                             "end": [
-                                19,
+                                6,
                                 2
                             ]
                         }
@@ -125,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                20,
+                                7,
                                 1
                             ],
                             "end": [
-                                24,
+                                11,
                                 2
                             ]
                         }
@@ -143,9 +55,163 @@
     "filePaths": [
         "if-statements.go"
     ],
-    "sha1": "8ff80ea94d04e830ad846d865336e741c8364795",
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index e69de29..2266b8b 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -0,0 +1,11 @@",
+        "+if a() {",
+        "+b()",
+        "+}",
+        "+if a := b(); c {",
+        "+d()",
+        "+}",
+        "+if a() {",
+        "+b()",
+        "+} else {",
+        "+c()",
+        "+}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "184deca8ba9943201f8512be5ff7f986db1bd6ac"
+    "shas": "bd35724ed7512ba9bb228b806e5888f347bd3793..eae64fa16d42245a11d166f1bd836ed97eeb419d"
+}
+,{
+    "testCaseDescription": "go-if-statements-replacement-insert-test",
+    "expectedResult": {
+        "changes": {
+            "if-statements.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x()' if statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'y := b(); c' if statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                7,
+                                1
+                            ],
+                            "end": [
+                                11,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'z()' if statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                12,
+                                1
+                            ],
+                            "end": [
+                                14,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a()' if statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                15,
+                                1
+                            ],
+                            "end": [
+                                17,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a := b(); c' if statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                18,
+                                1
+                            ],
+                            "end": [
+                                22,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a()' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "if-statements.go"
+    ],
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index 2266b8b..abacd6e 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -1,3 +1,25 @@",
+        "+if x() {",
+        "+b()",
+        "+}",
+        "+if y := b(); c {",
+        "+d()",
+        "+}",
+        "+if z() {",
+        "+b()",
+        "+} else {",
+        "+c()",
+        "+}",
+        "+if a() {",
+        "+b()",
+        "+}",
+        "+if a := b(); c {",
+        "+d()",
+        "+}",
+        "+if a() {",
+        "+b()",
+        "+} else {",
+        "+c()",
+        "+}",
+        " if a() {",
+        " b()",
+        " }"
+    ],
+    "gitDir": "test/corpus/repos/go",
+    "shas": "eae64fa16d42245a11d166f1bd836ed97eeb419d..409746cfde8f39fbd3a12243a73b81846da41749"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-insert-test",
@@ -157,21 +223,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -184,21 +250,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     4
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     4
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             }
@@ -211,21 +277,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    9,
+                                    7,
                                     4
                                 ],
                                 "end": [
-                                    9,
+                                    7,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    9,
+                                    7,
                                     4
                                 ],
                                 "end": [
-                                    9,
+                                    7,
                                     5
                                 ]
                             }
@@ -240,9 +306,28 @@
     "filePaths": [
         "if-statements.go"
     ],
-    "sha1": "184deca8ba9943201f8512be5ff7f986db1bd6ac",
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index abacd6e..b5fd21a 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -1,10 +1,10 @@",
+        "-if x() {",
+        "+if a() {",
+        " b()",
+        " }",
+        "-if y := b(); c {",
+        "+if a := b(); c {",
+        " d()",
+        " }",
+        "-if z() {",
+        "+if a() {",
+        " b()",
+        " } else {",
+        " c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1068ba7d4a382ce159ece211090eb64635d01d6f"
+    "shas": "409746cfde8f39fbd3a12243a73b81846da41749..56ba51da2e8ad7a81adbcd1e3a5fc413ea01b591"
 }
 ,{
     "testCaseDescription": "go-if-statements-replacement-test",
@@ -254,21 +339,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -281,21 +366,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     4
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     4
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             }
@@ -308,21 +393,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    9,
+                                    7,
                                     4
                                 ],
                                 "end": [
-                                    9,
+                                    7,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    9,
+                                    7,
                                     4
                                 ],
                                 "end": [
-                                    9,
+                                    7,
                                     5
                                 ]
                             }
@@ -337,9 +422,28 @@
     "filePaths": [
         "if-statements.go"
     ],
-    "sha1": "1068ba7d4a382ce159ece211090eb64635d01d6f",
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index b5fd21a..abacd6e 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -1,10 +1,10 @@",
+        "-if a() {",
+        "+if x() {",
+        " b()",
+        " }",
+        "-if a := b(); c {",
+        "+if y := b(); c {",
+        " d()",
+        " }",
+        "-if a() {",
+        "+if z() {",
+        " b()",
+        " } else {",
+        " c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "30bf2cf7b32f74fcb2eeeee6582adfff52d0f7f7"
+    "shas": "56ba51da2e8ad7a81adbcd1e3a5fc413ea01b591..876916554c152592cefc38a8f9a9e265f24fea7b"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-replacement-test",
@@ -350,11 +454,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -365,11 +469,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -380,11 +484,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                13,
+                                11,
                                 2
                             ]
                         }
@@ -395,11 +499,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                14,
+                                12,
                                 1
                             ],
                             "end": [
-                                16,
+                                14,
                                 2
                             ]
                         }
@@ -410,11 +514,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                17,
+                                15,
                                 1
                             ],
                             "end": [
-                                19,
+                                17,
                                 2
                             ]
                         }
@@ -425,11 +529,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                20,
+                                18,
                                 1
                             ],
                             "end": [
-                                24,
+                                22,
                                 2
                             ]
                         }
@@ -440,11 +544,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                14,
+                                12,
                                 1
                             ],
                             "end": [
-                                16,
+                                14,
                                 2
                             ]
                         }
@@ -455,11 +559,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                17,
+                                15,
                                 1
                             ],
                             "end": [
-                                19,
+                                17,
                                 2
                             ]
                         }
@@ -470,11 +574,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                20,
+                                18,
                                 1
                             ],
                             "end": [
-                                24,
+                                22,
                                 2
                             ]
                         }
@@ -488,9 +592,46 @@
     "filePaths": [
         "if-statements.go"
     ],
-    "sha1": "30bf2cf7b32f74fcb2eeeee6582adfff52d0f7f7",
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index abacd6e..ccb09fd 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -1,14 +1,3 @@",
+        "-if x() {",
+        "-b()",
+        "-}",
+        "-if y := b(); c {",
+        "-d()",
+        "-}",
+        "-if z() {",
+        "-b()",
+        "-} else {",
+        "-c()",
+        "-}",
+        " if a() {",
+        " b()",
+        " }",
+        "@@ -20,13 +9,13 @@ b()",
+        " } else {",
+        " c()",
+        " }",
+        "-if a() {",
+        "+if x() {",
+        " b()",
+        " }",
+        "-if a := b(); c {",
+        "+if y := b(); c {",
+        " d()",
+        " }",
+        "-if a() {",
+        "+if z() {",
+        " b()",
+        " } else {",
+        " c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "944d39dd78c1bfad643bf098aff846ff74368f41"
+    "shas": "876916554c152592cefc38a8f9a9e265f24fea7b..df039b5f947ac9e901fd47d32263ba46ccc9a518"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-test",
@@ -501,11 +642,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -516,11 +657,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -531,11 +672,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                13,
+                                11,
                                 2
                             ]
                         }
@@ -549,9 +690,29 @@
     "filePaths": [
         "if-statements.go"
     ],
-    "sha1": "944d39dd78c1bfad643bf098aff846ff74368f41",
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index ccb09fd..2e63573 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -1,14 +1,3 @@",
+        "-if a() {",
+        "-b()",
+        "-}",
+        "-if a := b(); c {",
+        "-d()",
+        "-}",
+        "-if a() {",
+        "-b()",
+        "-} else {",
+        "-c()",
+        "-}",
+        " if x() {",
+        " b()",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e9ce6c61402f2e5b5b6a18eb58248f7108645a98"
+    "shas": "df039b5f947ac9e901fd47d32263ba46ccc9a518..07a2bf60cdec6bbf5cf0ffc5e10c6695b03ae176"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-rest-test",
@@ -560,30 +721,48 @@
             "if-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'x()' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'y := b(); c' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                7,
+                                1
+                            ],
+                            "end": [
+                                11,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'z()' if statement"
                 }
             ]
         },
@@ -592,7 +771,24 @@
     "filePaths": [
         "if-statements.go"
     ],
-    "sha1": "e9ce6c61402f2e5b5b6a18eb58248f7108645a98",
+    "patch": [
+        "diff --git a/if-statements.go b/if-statements.go",
+        "index 2e63573..e69de29 100644",
+        "--- a/if-statements.go",
+        "+++ b/if-statements.go",
+        "@@ -1,11 +0,0 @@",
+        "-if x() {",
+        "-b()",
+        "-}",
+        "-if y := b(); c {",
+        "-d()",
+        "-}",
+        "-if z() {",
+        "-b()",
+        "-} else {",
+        "-c()",
+        "-}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c960fcc65ac55182c76b10f2b295a3cc10166860"
+    "shas": "07a2bf60cdec6bbf5cf0ffc5e10c6695b03ae176..294f5cc0ef0e25ecf0309fd41ae6cd4b376ab627"
 }]

test/corpus/diff-summaries/go/imaginary-literals.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -40,9 +40,19 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "6a5c5e925499fc0ac05bc20d3440592bebc89ea5",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index e69de29..aca2d55 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -0,0 +1,4 @@",
+        "+const (",
+        "+a = 01i",
+        "+b = 1.e+100i",
+        "+)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "04ef00437176d8193e549a700e3b19929002cc76"
+    "shas": "6761a7543f7002279b3e1d53f388c0b6408e11ac..70a8f336ad4cf76dbf55d755ee3b4ff94b77dc5b"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-replacement-insert-test",
@@ -53,11 +63,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -68,11 +78,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -83,11 +93,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -98,11 +108,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -116,9 +126,27 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "04ef00437176d8193e549a700e3b19929002cc76",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index aca2d55..6983988 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -1,4 +1,12 @@",
+        " const (",
+        "+a = 02i",
+        "+b = 1.e+103i",
+        "+)",
+        "+const (",
+        "+a = 01i",
+        "+b = 1.e+100i",
+        "+)",
+        "+const (",
+        " a = 01i",
+        " b = 1.e+100i",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "60b55b83363314517314e8c074c54c9244ac20ad"
+    "shas": "70a8f336ad4cf76dbf55d755ee3b4ff94b77dc5b..7003c23d83606920ba4dbc36a6fa8aa3fb23d254"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-insert-test",
@@ -130,54 +158,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the '02i' imaginary_literal with the '01i' imaginary_literal in the a variable of the 'main' module"
+                    "summary": "Replaced the '02i' imaginary_literal with the '01i' imaginary_literal in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     13
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the '1.e+103i' imaginary_literal with the '1.e+100i' imaginary_literal in the b variable of the 'main' module"
+                    "summary": "Replaced the '1.e+103i' imaginary_literal with the '1.e+100i' imaginary_literal in the b variable"
                 }
             ]
         },
@@ -186,9 +214,23 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "60b55b83363314517314e8c074c54c9244ac20ad",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index 6983988..a7e36a5 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -1,6 +1,6 @@",
+        " const (",
+        "-a = 02i",
+        "-b = 1.e+103i",
+        "+a = 01i",
+        "+b = 1.e+100i",
+        " )",
+        " const (",
+        " a = 01i"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "95e686a3b779e865259de5a05c7284342ec9efe5"
+    "shas": "7003c23d83606920ba4dbc36a6fa8aa3fb23d254..9c8a6f328131e0ab48ab9cccdf3a8a0ab164e527"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-replacement-test",
@@ -200,54 +242,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the '01i' imaginary_literal with the '02i' imaginary_literal in the a variable of the 'main' module"
+                    "summary": "Replaced the '01i' imaginary_literal with the '02i' imaginary_literal in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     13
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the '1.e+100i' imaginary_literal with the '1.e+103i' imaginary_literal in the b variable of the 'main' module"
+                    "summary": "Replaced the '1.e+100i' imaginary_literal with the '1.e+103i' imaginary_literal in the b variable"
                 }
             ]
         },
@@ -256,9 +298,23 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "95e686a3b779e865259de5a05c7284342ec9efe5",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index a7e36a5..6983988 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -1,6 +1,6 @@",
+        " const (",
+        "-a = 01i",
+        "-b = 1.e+100i",
+        "+a = 02i",
+        "+b = 1.e+103i",
+        " )",
+        " const (",
+        " a = 01i"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "498a8733d663fcea7130e75224198910ad23d497"
+    "shas": "9c8a6f328131e0ab48ab9cccdf3a8a0ab164e527..06c027b6920c1d1e7f4b44cd6527798c933581c4"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-replacement-test",
@@ -269,11 +325,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -284,11 +340,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -299,11 +355,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -314,11 +370,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -329,11 +385,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -344,11 +400,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -362,9 +418,29 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "498a8733d663fcea7130e75224198910ad23d497",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index 6983988..02cff8d 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -1,12 +1,8 @@",
+        " const (",
+        "-a = 02i",
+        "-b = 1.e+103i",
+        "-)",
+        "-const (",
+        " a = 01i",
+        " b = 1.e+100i",
+        " )",
+        " const (",
+        "-a = 01i",
+        "-b = 1.e+100i",
+        "+a = 02i",
+        "+b = 1.e+103i",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "d11becbeaabdb5e5e1eb9efb0db1b3439bc42139"
+    "shas": "06c027b6920c1d1e7f4b44cd6527798c933581c4..b6de01e92b11ca25862dcd7d798b72f9a01aa1c4"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-test",
@@ -375,11 +451,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -390,11 +466,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -408,9 +484,23 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "d11becbeaabdb5e5e1eb9efb0db1b3439bc42139",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index 02cff8d..6d8ec55 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -1,8 +1,4 @@",
+        " const (",
+        "-a = 01i",
+        "-b = 1.e+100i",
+        "-)",
+        "-const (",
+        " a = 02i",
+        " b = 1.e+103i",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "0afc23ae41d67a623887428c19698f2051e71d09"
+    "shas": "b6de01e92b11ca25862dcd7d798b72f9a01aa1c4..8af14aaa12876d71baf9d1580b9de3a0b4769e2a"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-rest-test",
@@ -421,11 +511,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -436,11 +526,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -454,7 +544,17 @@
     "filePaths": [
         "imaginary-literals.go"
     ],
-    "sha1": "0afc23ae41d67a623887428c19698f2051e71d09",
+    "patch": [
+        "diff --git a/imaginary-literals.go b/imaginary-literals.go",
+        "index 6d8ec55..e69de29 100644",
+        "--- a/imaginary-literals.go",
+        "+++ b/imaginary-literals.go",
+        "@@ -1,4 +0,0 @@",
+        "-const (",
+        "-a = 02i",
+        "-b = 1.e+103i",
+        "-)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "46503417695204e939923a09702395449f526a66"
+    "shas": "8af14aaa12876d71baf9d1580b9de3a0b4769e2a..3f18376b34b25deb3740a62df8c40ad667cfef4a"
 }]

test/corpus/diff-summaries/go/increment-decrement-statements.json

@@ -1,48 +1,5 @@
 [{
     "testCaseDescription": "go-increment-decrement-statements-insert-test",
-    "expectedResult": {
-        "changes": {
-            "increment-decrement-statements.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'main' module with the 'main' module"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "increment-decrement-statements.go"
-    ],
-    "sha1": "353e531a55c6c3d0540570c523e799df46615898",
-    "gitDir": "test/corpus/repos/go",
-    "sha2": "05731f26c98d3d4cf93557f3f95192d6d97e8be5"
-}
-,{
-    "testCaseDescription": "go-increment-decrement-statements-replacement-insert-test",
     "expectedResult": {
         "changes": {
             "increment-decrement-statements.go": [
@@ -50,41 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'foo' identifier"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                4,
-                                1
-                            ],
-                            "end": [
-                                4,
-                                2
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'x' identifier"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                1
-                            ],
-                            "end": [
-                                5,
+                                1,
                                 2
                             ]
                         }
@@ -95,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                2,
                                 1
                             ],
                             "end": [
-                                6,
+                                2,
                                 2
                             ]
                         }
@@ -113,9 +40,105 @@
     "filePaths": [
         "increment-decrement-statements.go"
     ],
-    "sha1": "05731f26c98d3d4cf93557f3f95192d6d97e8be5",
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index e69de29..c118f41 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -0,0 +1,2 @@",
+        "+i++",
+        "+j--"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "9c9be572b7c83e36de9a5997c7987815168a6a23"
+    "shas": "acf23921d6e89772dac98a78ba280e58c2429050..74900cd980876ca3be4654c097b3ee3475d51726"
+}
+,{
+    "testCaseDescription": "go-increment-decrement-statements-replacement-insert-test",
+    "expectedResult": {
+        "changes": {
+            "increment-decrement-statements.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'i' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'j' identifier"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "increment-decrement-statements.go"
+    ],
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index c118f41..d617bc4 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -1,2 +1,6 @@",
+        "+foo++",
+        "+x++",
+        "+i++",
+        "+j--",
+        " i++",
+        " j--"
+    ],
+    "gitDir": "test/corpus/repos/go",
+    "shas": "74900cd980876ca3be4654c097b3ee3475d51726..141a025429562d95737cea6257998bb5f91afdc4"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-insert-test",
@@ -127,21 +150,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -153,11 +176,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -168,11 +191,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -186,9 +209,22 @@
     "filePaths": [
         "increment-decrement-statements.go"
     ],
-    "sha1": "9c9be572b7c83e36de9a5997c7987815168a6a23",
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index d617bc4..15214d0 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -1,5 +1,5 @@",
+        "-foo++",
+        "-x++",
+        "+i++",
+        "+j--",
+        " i++",
+        " j--",
+        " i++"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c1ef5fffc731c318afb45049a81983a54f1ad6bd"
+    "shas": "141a025429562d95737cea6257998bb5f91afdc4..8f96737bbb510f71457b32de6ff88f244261ca3a"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-replacement-test",
@@ -200,21 +236,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             }
@@ -226,11 +262,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -241,11 +277,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -259,9 +295,22 @@
     "filePaths": [
         "increment-decrement-statements.go"
     ],
-    "sha1": "c1ef5fffc731c318afb45049a81983a54f1ad6bd",
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index 15214d0..d617bc4 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -1,5 +1,5 @@",
+        "-i++",
+        "-j--",
+        "+foo++",
+        "+x++",
+        " i++",
+        " j--",
+        " i++"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "494d53aa2b6983358c04d03252664e33375e204f"
+    "shas": "8f96737bbb510f71457b32de6ff88f244261ca3a..4189214ea59e379b3c40a1a079666495490968cc"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-replacement-test",
@@ -272,11 +321,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 4
                             ]
                         }
@@ -287,11 +336,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -302,11 +351,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 2
                             ]
                         }
@@ -317,11 +366,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -332,11 +381,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 4
                             ]
                         }
@@ -347,11 +396,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -365,9 +414,23 @@
     "filePaths": [
         "increment-decrement-statements.go"
     ],
-    "sha1": "494d53aa2b6983358c04d03252664e33375e204f",
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index d617bc4..640bbf1 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -1,6 +1,4 @@",
+        "-foo++",
+        "-x++",
+        "-i++",
+        "-j--",
+        " i++",
+        " j--",
+        "+foo++",
+        "+x++"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a8f0122076dddd7b2ccc818bb7b6e6e7f819cacc"
+    "shas": "4189214ea59e379b3c40a1a079666495490968cc..b01ab200bee6790fce1710c34aeb967595509f86"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-test",
@@ -378,11 +441,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 2
                             ]
                         }
@@ -393,11 +456,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -411,9 +474,19 @@
     "filePaths": [
         "increment-decrement-statements.go"
     ],
-    "sha1": "a8f0122076dddd7b2ccc818bb7b6e6e7f819cacc",
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index 640bbf1..b7c351d 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -1,4 +1,2 @@",
+        "-i++",
+        "-j--",
+        " foo++",
+        " x++"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ccc0273dc372b40fe71baf328c23abc7f1aaa558"
+    "shas": "b01ab200bee6790fce1710c34aeb967595509f86..c7abe86b7eb9259ab0b8cd859b857938aaacd550"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-rest-test",
@@ -422,30 +495,33 @@
             "increment-decrement-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x' identifier"
                 }
             ]
         },
@@ -454,7 +530,15 @@
     "filePaths": [
         "increment-decrement-statements.go"
     ],
-    "sha1": "ccc0273dc372b40fe71baf328c23abc7f1aaa558",
+    "patch": [
+        "diff --git a/increment-decrement-statements.go b/increment-decrement-statements.go",
+        "index b7c351d..e69de29 100644",
+        "--- a/increment-decrement-statements.go",
+        "+++ b/increment-decrement-statements.go",
+        "@@ -1,2 +0,0 @@",
+        "-foo++",
+        "-x++"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "07104070f6fbb41df4ca2bfb623637db5ce223eb"
+    "shas": "c7abe86b7eb9259ab0b8cd859b857938aaacd550..8b892c06025823500a32131e0005fe5ea0511bd9"
 }]

test/corpus/diff-summaries/go/label-statements.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 3
                             ],
                             "end": [
-                                4,
+                                2,
                                 15
                             ]
                         }
@@ -25,9 +25,18 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "c69fcfce40f178714107964705a6370513f7733e",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index e69de29..d0544fe 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -0,0 +1,3 @@",
+        "+{",
+        "+  insert_label:",
+        "+}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "06dfc9d634af0ab6cd3b7040a3abc3ace1d63978"
+    "shas": "b36463027cca058b97d4495c8c08a1ab9ab5cc0a..1fc84483617cdb29cf050b0bc3d87b01f6a13861"
 }
 ,{
     "testCaseDescription": "go-label-statements-replacement-insert-test",
@@ -36,30 +45,33 @@
             "label-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    6,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                2,
+                                3
+                            ],
+                            "end": [
+                                2,
+                                20
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added the 'replacement_label' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                3
+                            ],
+                            "end": [
+                                5,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'insert_label' identifier"
                 }
             ]
         },
@@ -68,9 +80,24 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "06dfc9d634af0ab6cd3b7040a3abc3ace1d63978",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index d0544fe..745311d 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -1,3 +1,9 @@",
+        " {",
+        "+  replacement_label:",
+        "+}",
+        "+{",
+        "+  insert_label:",
+        "+}",
+        "+{",
+        "   insert_label:",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "d8bee422a1feb5d4dbe64d7347f3e79ef8aebebf"
+    "shas": "1fc84483617cdb29cf050b0bc3d87b01f6a13861..0ac867b531ff4bcdb53b74c34c691ba7953b5f59"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-insert-test",
@@ -82,21 +109,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     3
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     20
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     3
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     15
                                 ]
                             }
@@ -111,9 +138,21 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "d8bee422a1feb5d4dbe64d7347f3e79ef8aebebf",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index 745311d..be34b5c 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -1,5 +1,5 @@",
+        " {",
+        "-  replacement_label:",
+        "+  insert_label:",
+        " }",
+        " {",
+        "   insert_label:"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3ffc48383ff965acde1cb61bf128dba6b5a956b3"
+    "shas": "0ac867b531ff4bcdb53b74c34c691ba7953b5f59..8816a0dfb9ed2e8ce865f18a22e0a0fea91a972f"
 }
 ,{
     "testCaseDescription": "go-label-statements-replacement-test",
@@ -125,21 +164,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     3
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     15
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     3
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     20
                                 ]
                             }
@@ -154,9 +193,21 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "3ffc48383ff965acde1cb61bf128dba6b5a956b3",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index be34b5c..745311d 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -1,5 +1,5 @@",
+        " {",
+        "-  insert_label:",
+        "+  replacement_label:",
+        " }",
+        " {",
+        "   insert_label:"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f0999f5fb8404d7bf45b5b48a29f7594b3b1d59c"
+    "shas": "8816a0dfb9ed2e8ce865f18a22e0a0fea91a972f..86835321d9dfbb9cc746ae02c27c84f687d8588b"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-replacement-test",
@@ -167,11 +218,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 3
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -182,11 +233,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 3
                             ],
                             "end": [
-                                7,
+                                5,
                                 15
                             ]
                         }
@@ -197,11 +248,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 3
                             ],
                             "end": [
-                                7,
+                                5,
                                 20
                             ]
                         }
@@ -215,9 +266,25 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "f0999f5fb8404d7bf45b5b48a29f7594b3b1d59c",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index 745311d..57f6c03 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -1,9 +1,6 @@",
+        " {",
+        "-  replacement_label:",
+        "-}",
+        "-{",
+        "   insert_label:",
+        " }",
+        " {",
+        "-  insert_label:",
+        "+  replacement_label:",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2d8e39fcd4c65814192407daa7416f6e3c50bb0a"
+    "shas": "86835321d9dfbb9cc746ae02c27c84f687d8588b..a86d97f2c6fe8abfe2a8f90c19b251059943d7a7"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-test",
@@ -226,30 +293,18 @@
             "label-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    6,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                2,
+                                3
+                            ],
+                            "end": [
+                                2,
+                                15
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'insert_label' identifier"
                 }
             ]
         },
@@ -258,9 +313,21 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "2d8e39fcd4c65814192407daa7416f6e3c50bb0a",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index 57f6c03..6920e65 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -1,6 +1,3 @@",
+        " {",
+        "-  insert_label:",
+        "-}",
+        "-{",
+        "   replacement_label:",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "194bc6d2f7a068a5fcb156d56ed4ad56dcbdf0c2"
+    "shas": "a86d97f2c6fe8abfe2a8f90c19b251059943d7a7..71d4de7371642308a8d1786d6cb88461d4aaf8b5"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-rest-test",
@@ -271,11 +338,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 3
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -289,7 +356,16 @@
     "filePaths": [
         "label-statements.go"
     ],
-    "sha1": "194bc6d2f7a068a5fcb156d56ed4ad56dcbdf0c2",
+    "patch": [
+        "diff --git a/label-statements.go b/label-statements.go",
+        "index 6920e65..e69de29 100644",
+        "--- a/label-statements.go",
+        "+++ b/label-statements.go",
+        "@@ -1,3 +0,0 @@",
+        "-{",
+        "-  replacement_label:",
+        "-}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "150f53c8cfb31186993a9588c913d8bcad3cef1d"
+    "shas": "71d4de7371642308a8d1786d6cb88461d4aaf8b5..ca9ffb9a8bca75e34a2383f7d503d3b21d7b08cc"
 }]

test/corpus/diff-summaries/go/map-literals.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -25,9 +25,19 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "3003ac02afb103f388ce64e485de8c028c6eb629",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index e69de29..16fb3cf 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -0,0 +1,4 @@",
+        "+const s = map[string]string{",
+        "+\"hi\": \"hello\",",
+        "+\"bye\": \"goodbye\",",
+        "+}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "94454acb7983200ae26fddbf57a5a997084c5785"
+    "shas": "02421320cce3bcbcdb5d7bd248eb1aa0ef8aff93..bcf7280bfaabf2abafe3fef0e53c921a6185013d"
 }
 ,{
     "testCaseDescription": "go-map-literals-replacement-insert-test",
@@ -38,11 +48,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -53,11 +63,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -71,9 +81,26 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "94454acb7983200ae26fddbf57a5a997084c5785",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index 16fb3cf..b3c30ca 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -1,3 +1,11 @@",
+        "+const s = map[string]int{",
+        "+\"foo\": \"bar\",",
+        "+\"baz\": \"hello\",",
+        "+}",
+        "+const s = map[string]string{",
+        "+\"hi\": \"hello\",",
+        "+\"bye\": \"goodbye\",",
+        "+}",
+        " const s = map[string]string{",
+        " \"hi\": \"hello\",",
+        " \"bye\": \"goodbye\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e895540c5ad838695b46f21a15e66bb47d9d6a19"
+    "shas": "bcf7280bfaabf2abafe3fef0e53c921a6185013d..ac890581fd47d5ebf0c88cac9f5f263442e8c179"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-insert-test",
@@ -85,135 +112,135 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     22
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     25
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     15
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     21
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the s variable of the 'main' module"
+                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the s variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"foo\" string with the \"hi\" string in the s variable of the 'main' module"
+                    "summary": "Replaced the \"foo\" string with the \"hi\" string in the s variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     8
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     7
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     14
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"bar\" string with the \"hello\" string in the s variable of the 'main' module"
+                    "summary": "Replaced the \"bar\" string with the \"hello\" string in the s variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     6
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"baz\" string with the \"bye\" string in the s variable of the 'main' module"
+                    "summary": "Replaced the \"baz\" string with the \"bye\" string in the s variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     8
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     15
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     8
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     17
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hello\" string with the \"goodbye\" string in the s variable of the 'main' module"
+                    "summary": "Replaced the \"hello\" string with the \"goodbye\" string in the s variable"
                 }
             ]
         },
@@ -222,9 +249,24 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "e895540c5ad838695b46f21a15e66bb47d9d6a19",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index b3c30ca..72c2e91 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -1,6 +1,6 @@",
+        "-const s = map[string]int{",
+        "-\"foo\": \"bar\",",
+        "-\"baz\": \"hello\",",
+        "+const s = map[string]string{",
+        "+\"hi\": \"hello\",",
+        "+\"bye\": \"goodbye\",",
+        " }",
+        " const s = map[string]string{",
+        " \"hi\": \"hello\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "aae53526a90645a92b2df9bea4766951db051b19"
+    "shas": "ac890581fd47d5ebf0c88cac9f5f263442e8c179..dd3d3d371b2bbaf02d99ee3638a84cdfa528793f"
 }
 ,{
     "testCaseDescription": "go-map-literals-replacement-test",
@@ -235,118 +277,118 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 15
                             ],
                             "end": [
-                                3,
+                                1,
                                 21
                             ]
                         }
                     },
-                    "summary": "Deleted the 'string' identifier in the s variable of the 'main' module"
+                    "summary": "Deleted the 'string' identifier in the s variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 22
                             ],
                             "end": [
-                                3,
+                                1,
                                 25
                             ]
                         }
                     },
-                    "summary": "Added the 'int' identifier in the s variable of the 'main' module"
+                    "summary": "Added the 'int' identifier in the s variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 6
                             ]
                         }
                     },
-                    "summary": "Added the \"foo\" string in the s variable of the 'main' module"
+                    "summary": "Added the \"foo\" string in the s variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 8
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
                     },
-                    "summary": "Added the \"bar\" string in the s variable of the 'main' module"
+                    "summary": "Added the \"bar\" string in the s variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     1
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     1
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     6
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hi\" string with the \"baz\" string in the s variable of the 'main' module"
+                    "summary": "Replaced the \"hi\" string with the \"baz\" string in the s variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 6
                             ]
                         }
                     },
-                    "summary": "Deleted the \"bye\" string in the s variable of the 'main' module"
+                    "summary": "Deleted the \"bye\" string in the s variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 8
                             ],
                             "end": [
-                                5,
+                                3,
                                 17
                             ]
                         }
                     },
-                    "summary": "Deleted the \"goodbye\" string in the s variable of the 'main' module"
+                    "summary": "Deleted the \"goodbye\" string in the s variable"
                 }
             ]
         },
@@ -355,9 +397,24 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "aae53526a90645a92b2df9bea4766951db051b19",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index 72c2e91..b3c30ca 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -1,6 +1,6 @@",
+        "-const s = map[string]string{",
+        "-\"hi\": \"hello\",",
+        "-\"bye\": \"goodbye\",",
+        "+const s = map[string]int{",
+        "+\"foo\": \"bar\",",
+        "+\"baz\": \"hello\",",
+        " }",
+        " const s = map[string]string{",
+        " \"hi\": \"hello\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "da53a715f7eac507f007903e29b8e7ab67ede56b"
+    "shas": "dd3d3d371b2bbaf02d99ee3638a84cdfa528793f..9d7589adf5a08f83cdb1b116e1418f432289e231"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-replacement-test",
@@ -368,11 +425,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -383,11 +440,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -398,11 +455,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -416,9 +473,30 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "da53a715f7eac507f007903e29b8e7ab67ede56b",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index b3c30ca..6d5f577 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -1,12 +1,8 @@",
+        "-const s = map[string]int{",
+        "-\"foo\": \"bar\",",
+        "-\"baz\": \"hello\",",
+        "-}",
+        " const s = map[string]string{",
+        " \"hi\": \"hello\",",
+        " \"bye\": \"goodbye\",",
+        " }",
+        "-const s = map[string]string{",
+        "-\"hi\": \"hello\",",
+        "-\"bye\": \"goodbye\",",
+        "+const s = map[string]int{",
+        "+\"foo\": \"bar\",",
+        "+\"baz\": \"hello\",",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b4ae265f96300c420b31f7913fe49bbe8e1a57cd"
+    "shas": "9d7589adf5a08f83cdb1b116e1418f432289e231..76fcbf24ccc8c6686db62eff0546be6d97e36608"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-test",
@@ -429,11 +507,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -447,9 +525,22 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "b4ae265f96300c420b31f7913fe49bbe8e1a57cd",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index 6d5f577..7f8e649 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -1,7 +1,3 @@",
+        "-const s = map[string]string{",
+        "-\"hi\": \"hello\",",
+        "-\"bye\": \"goodbye\",",
+        "-}",
+        " const s = map[string]int{",
+        " \"foo\": \"bar\",",
+        " \"baz\": \"hello\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c2adae1038553e500d686b3c2c588562f0747fd7"
+    "shas": "76fcbf24ccc8c6686db62eff0546be6d97e36608..a172d249198eca8d1a97853529cc96e79e8b962a"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-rest-test",
@@ -460,11 +551,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -478,7 +569,17 @@
     "filePaths": [
         "map-literals.go"
     ],
-    "sha1": "c2adae1038553e500d686b3c2c588562f0747fd7",
+    "patch": [
+        "diff --git a/map-literals.go b/map-literals.go",
+        "index 7f8e649..e69de29 100644",
+        "--- a/map-literals.go",
+        "+++ b/map-literals.go",
+        "@@ -1,4 +0,0 @@",
+        "-const s = map[string]int{",
+        "-\"foo\": \"bar\",",
+        "-\"baz\": \"hello\",",
+        "-}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "bb9bc3e6100eaaf7ccd25a9360f08698cff15981"
+    "shas": "a172d249198eca8d1a97853529cc96e79e8b962a..cd582e9b85e985f87af52085296e006987e8b0d3"
 }]

test/corpus/diff-summaries/go/map-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 19
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 20
                             ],
                             "end": [
-                                3,
+                                1,
                                 25
                             ]
                         }
@@ -55,9 +55,16 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "c818cf5bb28cfc9175040ba099cef324698884d8",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index e69de29..c86220d 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -0,0 +1 @@",
+        "+type m1 map[string]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2257e7dbe31053042cec06248d42a1043db10de2"
+    "shas": "ce33c1bfeb0cbfdd024d65479c25db256cdd12cc..a17295fbbf8618c6b504245e2b94381ba745ef76"
 }
 ,{
     "testCaseDescription": "go-map-types-replacement-insert-test",
@@ -68,11 +75,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -83,11 +90,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 16
                             ]
                         }
@@ -98,11 +105,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 17
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -113,11 +120,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -128,11 +135,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 13
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -143,11 +150,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 20
                             ],
                             "end": [
-                                4,
+                                2,
                                 25
                             ]
                         }
@@ -161,9 +168,18 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "2257e7dbe31053042cec06248d42a1043db10de2",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index c86220d..9cc2e8b 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -1 +1,3 @@",
+        "+type m1 map[int]error",
+        "+type m1 map[string]error",
+        " type m1 map[string]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "39b66e714f2dd4d4adca6f13fc122f514509e56d"
+    "shas": "a17295fbbf8618c6b504245e2b94381ba745ef76..e911ec9c095a334531d6f7a12da732a3ab64cd9b"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-insert-test",
@@ -175,21 +191,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     16
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     19
                                 ]
                             }
@@ -204,9 +220,19 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "39b66e714f2dd4d4adca6f13fc122f514509e56d",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index 9cc2e8b..ee1d5a0 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-type m1 map[int]error",
+        "+type m1 map[string]error",
+        " type m1 map[string]error",
+        " type m1 map[string]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "cce534462eee7e892f598bbb11eae8ddadb8621e"
+    "shas": "e911ec9c095a334531d6f7a12da732a3ab64cd9b..f78f0d563d0a83f7d64cf5b28c854727be528d05"
 }
 ,{
     "testCaseDescription": "go-map-types-replacement-test",
@@ -218,21 +244,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     19
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     13
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     16
                                 ]
                             }
@@ -247,9 +273,19 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "cce534462eee7e892f598bbb11eae8ddadb8621e",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index ee1d5a0..9cc2e8b 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-type m1 map[string]error",
+        "+type m1 map[int]error",
+        " type m1 map[string]error",
+        " type m1 map[string]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "916b37b7fbb2e41bd54ebb1507daeddef36ebd7b"
+    "shas": "f78f0d563d0a83f7d64cf5b28c854727be528d05..f0967ba8a8380ad4160e1d9c45c1a967f4912ce4"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-replacement-test",
@@ -260,11 +296,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -275,11 +311,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 16
                             ]
                         }
@@ -290,11 +326,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 17
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -305,11 +341,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -320,11 +356,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 13
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -335,11 +371,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 20
                             ],
                             "end": [
-                                4,
+                                2,
                                 25
                             ]
                         }
@@ -350,11 +386,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -365,11 +401,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 13
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -380,11 +416,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 17
                             ],
                             "end": [
-                                4,
+                                2,
                                 22
                             ]
                         }
@@ -398,9 +434,19 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "916b37b7fbb2e41bd54ebb1507daeddef36ebd7b",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index 9cc2e8b..a863ca9 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -1,3 +1,2 @@",
+        "-type m1 map[int]error",
+        "-type m1 map[string]error",
+        " type m1 map[string]error",
+        "+type m1 map[int]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f4ba0647de9d38eba60c257751ae648536d10e6d"
+    "shas": "f0967ba8a8380ad4160e1d9c45c1a967f4912ce4..d48a47fe4d8dd097f68ae843d389105250536d40"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-test",
@@ -411,11 +457,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -426,11 +472,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 19
                             ]
                         }
@@ -441,11 +487,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 20
                             ],
                             "end": [
-                                3,
+                                1,
                                 25
                             ]
                         }
@@ -459,9 +505,17 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "f4ba0647de9d38eba60c257751ae648536d10e6d",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index a863ca9..d7e6949 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -1,2 +1 @@",
+        "-type m1 map[string]error",
+        " type m1 map[int]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e8f2c34064e5df9bad4f99414bd81001fea14ab7"
+    "shas": "d48a47fe4d8dd097f68ae843d389105250536d40..56a30334ee9cb89bdae517650927f99c594ec54d"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-rest-test",
@@ -472,11 +526,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -487,11 +541,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 13
                             ],
                             "end": [
-                                3,
+                                1,
                                 16
                             ]
                         }
@@ -502,11 +556,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 17
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -520,7 +574,14 @@
     "filePaths": [
         "map-types.go"
     ],
-    "sha1": "e8f2c34064e5df9bad4f99414bd81001fea14ab7",
+    "patch": [
+        "diff --git a/map-types.go b/map-types.go",
+        "index d7e6949..e69de29 100644",
+        "--- a/map-types.go",
+        "+++ b/map-types.go",
+        "@@ -1 +0,0 @@",
+        "-type m1 map[int]error"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e8c412e8ad778a23678aa9734a72ddbb4d0a3f3e"
+    "shas": "56a30334ee9cb89bdae517650927f99c594ec54d..25efc557c3b81f94924fc76ce4196db1fd75e9cc"
 }]

test/corpus/diff-summaries/go/method-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 20
                             ],
                             "end": [
-                                3,
+                                1,
                                 26
                             ]
                         }
@@ -52,11 +52,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 27
                             ],
                             "end": [
-                                3,
+                                1,
                                 32
                             ]
                         }
@@ -67,11 +67,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 33
                             ],
                             "end": [
-                                3,
+                                1,
                                 39
                             ]
                         }
@@ -82,11 +82,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 41
                             ],
                             "end": [
-                                3,
+                                1,
                                 45
                             ]
                         }
@@ -97,11 +97,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 46
                             ],
                             "end": [
-                                3,
+                                1,
                                 48
                             ]
                         }
@@ -115,9 +115,16 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "cbfe90e40b3f1a5f8f1a76f1e2b9dbebe28783ee",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index e69de29..4431052 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -0,0 +1 @@",
+        "+func (self Person) Equals(other Person) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "14de9ec3de65ef9f8bc0e5fb6630ff5ac21eaab4"
+    "shas": "d533fb4333ed523cd36d6f2bb4f1c31eb61596f1..1c7c6082448deb0a1a306695dfbb6f9e01160484"
 }
 ,{
     "testCaseDescription": "go-method-declarations-replacement-insert-test",
@@ -128,11 +135,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -143,11 +150,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 15
                             ]
                         }
@@ -158,11 +165,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 17
                             ],
                             "end": [
-                                3,
+                                1,
                                 23
                             ]
                         }
@@ -173,11 +180,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 24
                             ],
                             "end": [
-                                3,
+                                1,
                                 29
                             ]
                         }
@@ -188,11 +195,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 30
                             ],
                             "end": [
-                                3,
+                                1,
                                 33
                             ]
                         }
@@ -203,11 +210,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 35
                             ],
                             "end": [
-                                3,
+                                1,
                                 39
                             ]
                         }
@@ -218,11 +225,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 40
                             ],
                             "end": [
-                                3,
+                                1,
                                 42
                             ]
                         }
@@ -233,11 +240,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 7
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -248,11 +255,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 18
                             ]
                         }
@@ -263,11 +270,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 20
                             ],
                             "end": [
-                                4,
+                                2,
                                 26
                             ]
                         }
@@ -278,11 +285,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 27
                             ],
                             "end": [
-                                4,
+                                2,
                                 32
                             ]
                         }
@@ -293,11 +300,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 33
                             ],
                             "end": [
-                                4,
+                                2,
                                 39
                             ]
                         }
@@ -308,11 +315,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 41
                             ],
                             "end": [
-                                4,
+                                2,
                                 45
                             ]
                         }
@@ -323,11 +330,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 46
                             ],
                             "end": [
-                                4,
+                                2,
                                 48
                             ]
                         }
@@ -341,9 +348,18 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "14de9ec3de65ef9f8bc0e5fb6630ff5ac21eaab4",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index 4431052..adbefab 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -1 +1,3 @@",
+        "+func (self Num) Equals(other Num) bool {}",
+        "+func (self Person) Equals(other Person) bool {}",
+        " func (self Person) Equals(other Person) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5054e15fa1244744a8a8c7d13ab985ef52ec27d7"
+    "shas": "1c7c6082448deb0a1a306695dfbb6f9e01160484..de2a0006cae2a14a2d8d12b21c6ce59f29507870"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-insert-test",
@@ -355,21 +371,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     15
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             }
@@ -382,21 +398,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     30
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     33
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     33
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     39
                                 ]
                             }
@@ -411,9 +427,19 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "5054e15fa1244744a8a8c7d13ab985ef52ec27d7",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index adbefab..88c36a5 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -1,3 +1,3 @@",
+        "-func (self Num) Equals(other Num) bool {}",
+        "+func (self Person) Equals(other Person) bool {}",
+        " func (self Person) Equals(other Person) bool {}",
+        " func (self Person) Equals(other Person) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e87f60598a56c038968a79ac963c75c931619bce"
+    "shas": "de2a0006cae2a14a2d8d12b21c6ce59f29507870..50c341ba4551b92559db55663bbd8344705582b4"
 }
 ,{
     "testCaseDescription": "go-method-declarations-replacement-test",
@@ -425,21 +451,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     15
                                 ]
                             }
@@ -452,21 +478,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     33
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     39
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     30
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     33
                                 ]
                             }
@@ -481,9 +507,19 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "e87f60598a56c038968a79ac963c75c931619bce",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index 88c36a5..adbefab 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -1,3 +1,3 @@",
+        "-func (self Person) Equals(other Person) bool {}",
+        "+func (self Num) Equals(other Num) bool {}",
+        " func (self Person) Equals(other Person) bool {}",
+        " func (self Person) Equals(other Person) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6068bf44242bbbf53c3e25bbe807eb07c69c4e19"
+    "shas": "50c341ba4551b92559db55663bbd8344705582b4..9a1e61ef7bc553d3764a6d5b88a271466c4dc547"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-replacement-test",
@@ -494,11 +530,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -509,11 +545,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 15
                             ]
                         }
@@ -524,11 +560,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 17
                             ],
                             "end": [
-                                3,
+                                1,
                                 23
                             ]
                         }
@@ -539,11 +575,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 24
                             ],
                             "end": [
-                                3,
+                                1,
                                 29
                             ]
                         }
@@ -554,11 +590,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 30
                             ],
                             "end": [
-                                3,
+                                1,
                                 33
                             ]
                         }
@@ -569,11 +605,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 35
                             ],
                             "end": [
-                                3,
+                                1,
                                 39
                             ]
                         }
@@ -584,11 +620,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 40
                             ],
                             "end": [
-                                3,
+                                1,
                                 42
                             ]
                         }
@@ -599,11 +635,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 7
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -614,11 +650,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 18
                             ]
                         }
@@ -629,11 +665,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 20
                             ],
                             "end": [
-                                4,
+                                2,
                                 26
                             ]
                         }
@@ -644,11 +680,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 27
                             ],
                             "end": [
-                                4,
+                                2,
                                 32
                             ]
                         }
@@ -659,11 +695,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 33
                             ],
                             "end": [
-                                4,
+                                2,
                                 39
                             ]
                         }
@@ -674,11 +710,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 41
                             ],
                             "end": [
-                                4,
+                                2,
                                 45
                             ]
                         }
@@ -689,11 +725,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 46
                             ],
                             "end": [
-                                4,
+                                2,
                                 48
                             ]
                         }
@@ -704,11 +740,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 7
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -719,11 +755,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 15
                             ]
                         }
@@ -734,11 +770,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 17
                             ],
                             "end": [
-                                4,
+                                2,
                                 23
                             ]
                         }
@@ -749,11 +785,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 24
                             ],
                             "end": [
-                                4,
+                                2,
                                 29
                             ]
                         }
@@ -764,11 +800,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 30
                             ],
                             "end": [
-                                4,
+                                2,
                                 33
                             ]
                         }
@@ -779,11 +815,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 35
                             ],
                             "end": [
-                                4,
+                                2,
                                 39
                             ]
                         }
@@ -794,11 +830,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 40
                             ],
                             "end": [
-                                4,
+                                2,
                                 42
                             ]
                         }
@@ -812,9 +848,19 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "6068bf44242bbbf53c3e25bbe807eb07c69c4e19",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index adbefab..9168669 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -1,3 +1,2 @@",
+        "-func (self Num) Equals(other Num) bool {}",
+        "-func (self Person) Equals(other Person) bool {}",
+        " func (self Person) Equals(other Person) bool {}",
+        "+func (self Num) Equals(other Num) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "57eb6787a6123a5d6fee4468ad409e164de5997c"
+    "shas": "9a1e61ef7bc553d3764a6d5b88a271466c4dc547..0004725872e875c81dc295a1e0c89ecf8b4da92d"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-test",
@@ -825,11 +871,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -840,11 +886,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -855,11 +901,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 20
                             ],
                             "end": [
-                                3,
+                                1,
                                 26
                             ]
                         }
@@ -870,11 +916,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 27
                             ],
                             "end": [
-                                3,
+                                1,
                                 32
                             ]
                         }
@@ -885,11 +931,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 33
                             ],
                             "end": [
-                                3,
+                                1,
                                 39
                             ]
                         }
@@ -900,11 +946,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 41
                             ],
                             "end": [
-                                3,
+                                1,
                                 45
                             ]
                         }
@@ -915,11 +961,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 46
                             ],
                             "end": [
-                                3,
+                                1,
                                 48
                             ]
                         }
@@ -933,9 +979,17 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "57eb6787a6123a5d6fee4468ad409e164de5997c",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index 9168669..64a70fa 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -1,2 +1 @@",
+        "-func (self Person) Equals(other Person) bool {}",
+        " func (self Num) Equals(other Num) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "01f7c70d4627963d529697f038404d69754c7b60"
+    "shas": "0004725872e875c81dc295a1e0c89ecf8b4da92d..fb4aef49e696686ec2a1195a49571eb3f53ace5e"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-rest-test",
@@ -946,11 +1000,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 7
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -961,11 +1015,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 15
                             ]
                         }
@@ -976,11 +1030,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 17
                             ],
                             "end": [
-                                3,
+                                1,
                                 23
                             ]
                         }
@@ -991,11 +1045,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 24
                             ],
                             "end": [
-                                3,
+                                1,
                                 29
                             ]
                         }
@@ -1006,11 +1060,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 30
                             ],
                             "end": [
-                                3,
+                                1,
                                 33
                             ]
                         }
@@ -1021,11 +1075,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 35
                             ],
                             "end": [
-                                3,
+                                1,
                                 39
                             ]
                         }
@@ -1036,11 +1090,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 40
                             ],
                             "end": [
-                                3,
+                                1,
                                 42
                             ]
                         }
@@ -1054,7 +1108,14 @@
     "filePaths": [
         "method-declarations.go"
     ],
-    "sha1": "01f7c70d4627963d529697f038404d69754c7b60",
+    "patch": [
+        "diff --git a/method-declarations.go b/method-declarations.go",
+        "index 64a70fa..e69de29 100644",
+        "--- a/method-declarations.go",
+        "+++ b/method-declarations.go",
+        "@@ -1 +0,0 @@",
+        "-func (self Num) Equals(other Num) bool {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "262ad8491999ea66eb0f840c0b00851ebce2af55"
+    "shas": "fb4aef49e696686ec2a1195a49571eb3f53ace5e..d09227c96ba4107fb4b848d1ef05e13e92fa41a7"
 }]

test/corpus/diff-summaries/go/pointer-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 3
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 5
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 3
                             ]
                         }
@@ -52,11 +52,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -70,9 +70,19 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "e8c412e8ad778a23678aa9734a72ddbb4d0a3f3e",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index e69de29..05b4659 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -0,0 +1,4 @@",
+        "+type (",
+        "+p1 *string",
+        "+p2 **p1",
+        "+)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2609295792db8611d8b08bbee5435b5864a2f212"
+    "shas": "25efc557c3b81f94924fc76ce4196db1fd75e9cc..7d8cd7f79e26327a145c2e37f193db0f0aa1b49b"
 }
 ,{
     "testCaseDescription": "go-pointer-types-replacement-insert-test",
@@ -83,11 +93,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 3
                             ]
                         }
@@ -98,11 +108,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 5
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -113,11 +123,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 3
                             ]
                         }
@@ -128,11 +138,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -143,11 +153,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 3
                             ]
                         }
@@ -158,11 +168,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 5
                             ],
                             "end": [
-                                8,
+                                6,
                                 11
                             ]
                         }
@@ -173,11 +183,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                9,
+                                7,
                                 3
                             ]
                         }
@@ -188,11 +198,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 6
                             ],
                             "end": [
-                                9,
+                                7,
                                 8
                             ]
                         }
@@ -206,9 +216,27 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "2609295792db8611d8b08bbee5435b5864a2f212",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index 05b4659..95e685d 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -1,4 +1,12 @@",
+        " type (",
+        "+p1 *int",
+        "+p2 **p3",
+        "+)",
+        "+type (",
+        "+p1 *string",
+        "+p2 **p1",
+        "+)",
+        "+type (",
+        " p1 *string",
+        " p2 **p1",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "d99e6ee28aef12a358f5c2aaa3e6875731d28485"
+    "shas": "7d8cd7f79e26327a145c2e37f193db0f0aa1b49b..19578c62cd7513a2390877a56b02993533e6eb4c"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-insert-test",
@@ -220,21 +248,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     11
                                 ]
                             }
@@ -247,21 +275,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             }
@@ -276,9 +304,23 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "d99e6ee28aef12a358f5c2aaa3e6875731d28485",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index 95e685d..74ff673 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -1,6 +1,6 @@",
+        " type (",
+        "-p1 *int",
+        "-p2 **p3",
+        "+p1 *string",
+        "+p2 **p1",
+        " )",
+        " type (",
+        " p1 *string"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a837d19f0f9758240991ed6012164f15f7fd7711"
+    "shas": "19578c62cd7513a2390877a56b02993533e6eb4c..201e8300e6cc9127cf35b7f6cd44857ac967709b"
 }
 ,{
     "testCaseDescription": "go-pointer-types-replacement-test",
@@ -290,21 +332,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     11
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
@@ -317,21 +359,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             }
@@ -346,9 +388,23 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "a837d19f0f9758240991ed6012164f15f7fd7711",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index 74ff673..95e685d 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -1,6 +1,6 @@",
+        " type (",
+        "-p1 *string",
+        "-p2 **p1",
+        "+p1 *int",
+        "+p2 **p3",
+        " )",
+        " type (",
+        " p1 *string"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a1e6dddea2e8e7a0581e8c7886365eb4bd84ffe5"
+    "shas": "201e8300e6cc9127cf35b7f6cd44857ac967709b..9ba75e4b5fa06381da78759652306dc43d764bc1"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-replacement-test",
@@ -359,11 +415,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 3
                             ]
                         }
@@ -374,11 +430,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 5
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -389,11 +445,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 3
                             ]
                         }
@@ -404,11 +460,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -419,11 +475,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 3
                             ]
                         }
@@ -434,11 +490,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 5
                             ],
                             "end": [
-                                8,
+                                6,
                                 11
                             ]
                         }
@@ -449,11 +505,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                9,
+                                7,
                                 3
                             ]
                         }
@@ -464,11 +520,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 6
                             ],
                             "end": [
-                                9,
+                                7,
                                 8
                             ]
                         }
@@ -479,11 +535,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 3
                             ]
                         }
@@ -494,11 +550,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 5
                             ],
                             "end": [
-                                8,
+                                6,
                                 8
                             ]
                         }
@@ -509,11 +565,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                9,
+                                7,
                                 3
                             ]
                         }
@@ -524,11 +580,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 6
                             ],
                             "end": [
-                                9,
+                                7,
                                 8
                             ]
                         }
@@ -542,9 +598,29 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "a1e6dddea2e8e7a0581e8c7886365eb4bd84ffe5",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index 95e685d..4556eeb 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -1,12 +1,8 @@",
+        " type (",
+        "-p1 *int",
+        "-p2 **p3",
+        "-)",
+        "-type (",
+        " p1 *string",
+        " p2 **p1",
+        " )",
+        " type (",
+        "-p1 *string",
+        "-p2 **p1",
+        "+p1 *int",
+        "+p2 **p3",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "390441dc9a8726ab3ff62efe6e9da7915745fc6f"
+    "shas": "9ba75e4b5fa06381da78759652306dc43d764bc1..31542ede38bd2367c39c2a2c74a8b5663de97b56"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-test",
@@ -555,11 +631,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 3
                             ]
                         }
@@ -570,11 +646,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 5
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -585,11 +661,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 3
                             ]
                         }
@@ -600,11 +676,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -618,9 +694,23 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "390441dc9a8726ab3ff62efe6e9da7915745fc6f",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index 4556eeb..5d13f48 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -1,8 +1,4 @@",
+        " type (",
+        "-p1 *string",
+        "-p2 **p1",
+        "-)",
+        "-type (",
+        " p1 *int",
+        " p2 **p3",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e75361609b9f93258981f716b33bdec73f2777ae"
+    "shas": "31542ede38bd2367c39c2a2c74a8b5663de97b56..0d8c55cd851c0e65a5ba9d03a2bba90ee6301ade"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-rest-test",
@@ -631,11 +721,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 3
                             ]
                         }
@@ -646,11 +736,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 5
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -661,11 +751,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 3
                             ]
                         }
@@ -676,11 +766,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -694,7 +784,17 @@
     "filePaths": [
         "pointer-types.go"
     ],
-    "sha1": "e75361609b9f93258981f716b33bdec73f2777ae",
+    "patch": [
+        "diff --git a/pointer-types.go b/pointer-types.go",
+        "index 5d13f48..e69de29 100644",
+        "--- a/pointer-types.go",
+        "+++ b/pointer-types.go",
+        "@@ -1,4 +0,0 @@",
+        "-type (",
+        "-p1 *int",
+        "-p2 **p3",
+        "-)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "9b11035ae1a210fb170ae96625f8e899d4d25b2f"
+    "shas": "0d8c55cd851c0e65a5ba9d03a2bba90ee6301ade..bf799eac39c8188d30ac10bed1218975e6ad803c"
 }]

test/corpus/diff-summaries/go/qualified-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -55,9 +55,16 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "07104070f6fbb41df4ca2bfb623637db5ce223eb",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index e69de29..7840cac 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -0,0 +1 @@",
+        "+type a b.c"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "75ee6b013a64337b30d7a9d77f7b9a643b016f66"
+    "shas": "8b892c06025823500a32131e0005fe5ea0511bd9..cc9434572a9cf4dbb372c73f9f746edbbe46ddb2"
 }
 ,{
     "testCaseDescription": "go-qualified-types-replacement-insert-test",
@@ -68,11 +75,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -83,11 +90,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -98,11 +105,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -113,11 +120,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -128,11 +135,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 8
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -143,11 +150,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -161,9 +168,18 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "75ee6b013a64337b30d7a9d77f7b9a643b016f66",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index 7840cac..0256b29 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -1 +1,3 @@",
+        "+type x y.z",
+        "+type a b.c",
+        " type a b.c"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "69c54a54eedf5fe8a2a871dd2a5a09f8e9f21f7f"
+    "shas": "cc9434572a9cf4dbb372c73f9f746edbbe46ddb2..45ca504c2b13f39fb13a318350ce73ee051ded0a"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-insert-test",
@@ -175,21 +191,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     7
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     7
                                 ]
                             }
@@ -202,21 +218,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -229,21 +245,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     10
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     10
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             }
@@ -258,9 +274,19 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "69c54a54eedf5fe8a2a871dd2a5a09f8e9f21f7f",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index 0256b29..e963dfd 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-type x y.z",
+        "+type a b.c",
+        " type a b.c",
+        " type a b.c"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c75f6a304a1800e1316820d2276786724ef76d24"
+    "shas": "45ca504c2b13f39fb13a318350ce73ee051ded0a..1ca51b82d0783636e0e4a89c86d5e1f3d403f641"
 }
 ,{
     "testCaseDescription": "go-qualified-types-replacement-test",
@@ -272,21 +298,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     7
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     7
                                 ]
                             }
@@ -299,21 +325,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -326,21 +352,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     10
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     10
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     11
                                 ]
                             }
@@ -355,9 +381,19 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "c75f6a304a1800e1316820d2276786724ef76d24",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index e963dfd..0256b29 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-type a b.c",
+        "+type x y.z",
+        " type a b.c",
+        " type a b.c"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "eb04e3d75fd1cbf8d9859e938313e1be66994f11"
+    "shas": "1ca51b82d0783636e0e4a89c86d5e1f3d403f641..cef08f468e0b80e81570eeff49e1aaf2f0819257"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-replacement-test",
@@ -368,11 +404,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -383,11 +419,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -398,11 +434,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -413,11 +449,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -428,11 +464,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 8
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -443,11 +479,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -458,11 +494,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -473,11 +509,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 8
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -488,11 +524,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -506,9 +542,19 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "eb04e3d75fd1cbf8d9859e938313e1be66994f11",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index 0256b29..4525e0a 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -1,3 +1,2 @@",
+        "-type x y.z",
+        "-type a b.c",
+        " type a b.c",
+        "+type x y.z"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a1b8b1799e887e65a2962f74535fa3147a7f972f"
+    "shas": "cef08f468e0b80e81570eeff49e1aaf2f0819257..4749e1e8204299ef1dfe4ee61031f3f5b29e9763"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-test",
@@ -519,11 +565,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -534,11 +580,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -549,11 +595,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -567,9 +613,17 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "a1b8b1799e887e65a2962f74535fa3147a7f972f",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index 4525e0a..f31a963 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -1,2 +1 @@",
+        "-type a b.c",
+        " type x y.z"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "97dc17cc5dc2739e249cfdcbd5c169030f7e6751"
+    "shas": "4749e1e8204299ef1dfe4ee61031f3f5b29e9763..7b55badd2f0f41090564ea56d00e8ffd57fda98f"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-rest-test",
@@ -580,11 +634,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -595,11 +649,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -610,11 +664,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -628,7 +682,14 @@
     "filePaths": [
         "qualified-types.go"
     ],
-    "sha1": "97dc17cc5dc2739e249cfdcbd5c169030f7e6751",
+    "patch": [
+        "diff --git a/qualified-types.go b/qualified-types.go",
+        "index f31a963..e69de29 100644",
+        "--- a/qualified-types.go",
+        "+++ b/qualified-types.go",
+        "@@ -1 +0,0 @@",
+        "-type x y.z"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6d7202f99aff5a0fefda7df058917f141335424f"
+    "shas": "7b55badd2f0f41090564ea56d00e8ffd57fda98f..96ee23366cb8e34e0b1aef14810c83f5066a6f3b"
 }]

test/corpus/diff-summaries/go/selector-expressions.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -25,9 +25,16 @@
     "filePaths": [
         "selector-expressions.go"
     ],
-    "sha1": "4f37802913bc6d0558da212b36497be55209c99b",
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index e69de29..7be43f2 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -0,0 +1 @@",
+        "+a.b.c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "41f3987a397e005336a1b76c91719e753cd5e3f4"
+    "shas": "bf82bf19d4c58176cb36d1c4e0cb934241bd5394..87d1fc7bef359bdd4e0dcc8aad67c08ce1c35f6c"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-replacement-insert-test",
@@ -36,30 +43,33 @@
             "selector-expressions.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                8
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added the 'method call()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'method call()' function call"
                 }
             ]
         },
@@ -68,9 +78,18 @@
     "filePaths": [
         "selector-expressions.go"
     ],
-    "sha1": "41f3987a397e005336a1b76c91719e753cd5e3f4",
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index 7be43f2..4fa8605 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -1 +1,3 @@",
+        "+x.y.z()",
+        "+a.b.c()",
+        " a.b.c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "201915f3eb57c8f53b28084b3080eae7376cf15d"
+    "shas": "87d1fc7bef359bdd4e0dcc8aad67c08ce1c35f6c..ca3e3a97e47529457509431057a09ae9f09774de"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-insert-test",
@@ -82,21 +101,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -109,21 +128,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     3
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     3
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             }
@@ -136,21 +155,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             }
@@ -165,9 +184,19 @@
     "filePaths": [
         "selector-expressions.go"
     ],
-    "sha1": "201915f3eb57c8f53b28084b3080eae7376cf15d",
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index 4fa8605..2a586da 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -1,3 +1,3 @@",
+        "-x.y.z()",
+        "+a.b.c()",
+        " a.b.c()",
+        " a.b.c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "79f050f2e282ea00bd1a5a2379c9b22ec63a216e"
+    "shas": "ca3e3a97e47529457509431057a09ae9f09774de..4784dc00012db8262fb5321370d25c7f4e2cc8d6"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-replacement-test",
@@ -179,21 +208,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -206,21 +235,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     3
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     3
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             }
@@ -233,21 +262,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             }
@@ -262,9 +291,19 @@
     "filePaths": [
         "selector-expressions.go"
     ],
-    "sha1": "79f050f2e282ea00bd1a5a2379c9b22ec63a216e",
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index 2a586da..4fa8605 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -1,3 +1,3 @@",
+        "-a.b.c()",
+        "+x.y.z()",
+        " a.b.c()",
+        " a.b.c()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "8a2fbcba91669a62575ba3e24b843c37a3e71184"
+    "shas": "4784dc00012db8262fb5321370d25c7f4e2cc8d6..cccdb91577b7d7e692a2940325435e7129bce6a0"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-replacement-test",
@@ -275,11 +314,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -290,11 +329,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -305,11 +344,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 8
                             ]
                         }
@@ -323,55 +362,22 @@
     "filePaths": [
         "selector-expressions.go"
     ],
-    "sha1": "8a2fbcba91669a62575ba3e24b843c37a3e71184",
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index 4fa8605..3e2d0bd 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -1,3 +1,2 @@",
+        "-x.y.z()",
+        "-a.b.c()",
+        " a.b.c()",
+        "+x.y.z()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1f5ef7ae6dda1abe457f1344d1b89da8687703b9"
+    "shas": "cccdb91577b7d7e692a2940325435e7129bce6a0..a9b16a5fef8a8d18ff6629bba3baf8d652e1954a"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-test",
-    "expectedResult": {
-        "changes": {
-            "selector-expressions.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'main' module with the 'main' module"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "selector-expressions.go"
-    ],
-    "sha1": "1f5ef7ae6dda1abe457f1344d1b89da8687703b9",
-    "gitDir": "test/corpus/repos/go",
-    "sha2": "a1ba277b8446b3a8e12bbeaa2146aaf2388971d3"
-}
-,{
-    "testCaseDescription": "go-selector-expressions-delete-rest-test",
     "expectedResult": {
         "changes": {
             "selector-expressions.go": [
@@ -379,11 +385,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 8
                             ]
                         }
@@ -397,7 +403,53 @@
     "filePaths": [
         "selector-expressions.go"
     ],
-    "sha1": "a1ba277b8446b3a8e12bbeaa2146aaf2388971d3",
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index 3e2d0bd..00b9e7c 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -1,2 +1 @@",
+        "-a.b.c()",
+        " x.y.z()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7a0e56fcfbef48bf43e71d2d33c4b74a2cf05cb5"
+    "shas": "a9b16a5fef8a8d18ff6629bba3baf8d652e1954a..fa7f69becdee526370c1aea7e1530d2da4e1c8de"
+}
+,{
+    "testCaseDescription": "go-selector-expressions-delete-rest-test",
+    "expectedResult": {
+        "changes": {
+            "selector-expressions.go": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'method call()' function call"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "selector-expressions.go"
+    ],
+    "patch": [
+        "diff --git a/selector-expressions.go b/selector-expressions.go",
+        "index 00b9e7c..e69de29 100644",
+        "--- a/selector-expressions.go",
+        "+++ b/selector-expressions.go",
+        "@@ -1 +0,0 @@",
+        "-x.y.z()"
+    ],
+    "gitDir": "test/corpus/repos/go",
+    "shas": "fa7f69becdee526370c1aea7e1530d2da4e1c8de..5d7acec54aeae4a86833f9a0b00bf588083883ab"
 }]

test/corpus/diff-summaries/go/send-statements.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 4
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -40,9 +40,16 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "a4eb90cc8a9cbf4002ab1c646f3b965bce70cc47",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index e69de29..9df974c 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -0,0 +1 @@",
+        "+foo <- 5"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "62add87261e8579b065c88e1ebe0c4a342edc4de"
+    "shas": "1afdfc9d2ffbe4b43ec47892c4583237f382efd2..714795be33defefb56b589bf1984b5013bfd3d0f"
 }
 ,{
     "testCaseDescription": "go-send-statements-replacement-insert-test",
@@ -51,30 +58,63 @@
             "send-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added 'bar' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                8
+                            ],
+                            "end": [
+                                1,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added '6'"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                8
+                            ],
+                            "end": [
+                                2,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added '5'"
                 }
             ]
         },
@@ -83,9 +123,18 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "62add87261e8579b065c88e1ebe0c4a342edc4de",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index 9df974c..de76cee 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -1 +1,3 @@",
+        "+bar <- 6",
+        "+foo <- 5",
+        " foo <- 5"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "34a4f845249f85d7c1dbca944865f358e54bd5aa"
+    "shas": "714795be33defefb56b589bf1984b5013bfd3d0f..d67f3c65395ec2d583d2838eb62e633160dc5bb0"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-insert-test",
@@ -97,21 +146,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             }
@@ -124,21 +173,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -153,9 +202,19 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "34a4f845249f85d7c1dbca944865f358e54bd5aa",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index de76cee..d487575 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -1,3 +1,3 @@",
+        "-bar <- 6",
+        "+foo <- 5",
+        " foo <- 5",
+        " foo <- 5"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3ad99151e7a17d306cbc9188d1e972ee7eabd9f2"
+    "shas": "d67f3c65395ec2d583d2838eb62e633160dc5bb0..f3edb65315d77ba6c2c56272b231534fb537d8cc"
 }
 ,{
     "testCaseDescription": "go-send-statements-replacement-test",
@@ -167,21 +226,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     4
                                 ]
                             }
@@ -194,21 +253,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -223,9 +282,19 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "3ad99151e7a17d306cbc9188d1e972ee7eabd9f2",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index d487575..de76cee 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -1,3 +1,3 @@",
+        "-foo <- 5",
+        "+bar <- 6",
+        " foo <- 5",
+        " foo <- 5"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "fe6d8f386756e9bf034aa26611533f41325d33e7"
+    "shas": "f3edb65315d77ba6c2c56272b231534fb537d8cc..0bab01c74332f89cf225e90aec13c47f76180a4a"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-replacement-test",
@@ -236,11 +305,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 4
                             ]
                         }
@@ -251,11 +320,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -266,11 +335,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 4
                             ]
                         }
@@ -281,11 +350,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 8
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -296,11 +365,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 4
                             ]
                         }
@@ -311,11 +380,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 8
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -329,9 +398,19 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "fe6d8f386756e9bf034aa26611533f41325d33e7",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index de76cee..65a1c23 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -1,3 +1,2 @@",
+        "-bar <- 6",
+        "-foo <- 5",
+        " foo <- 5",
+        "+bar <- 6"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "27a0815cc703e9ca882601641e3ff5106b08f1b3"
+    "shas": "0bab01c74332f89cf225e90aec13c47f76180a4a..659323e1c3b72c8aeb375fe6afca8af9afd91380"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-test",
@@ -340,30 +419,33 @@
             "send-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
                     },
-                    "summary": "Replaced 'main' module with 'main' module"
+                    "summary": "Deleted 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                8
+                            ],
+                            "end": [
+                                1,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '5'"
                 }
             ]
         },
@@ -372,9 +454,17 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "27a0815cc703e9ca882601641e3ff5106b08f1b3",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index 65a1c23..bab29cb 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -1,2 +1 @@",
+        "-foo <- 5",
+        " bar <- 6"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f49d172b1fdce66fae95c6d73f01dd5f27a9a5d8"
+    "shas": "659323e1c3b72c8aeb375fe6afca8af9afd91380..659afeebaae01516ea3532538f0ea665e2823020"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-rest-test",
@@ -385,11 +475,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 4
                             ]
                         }
@@ -400,11 +490,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -418,7 +508,14 @@
     "filePaths": [
         "send-statements.go"
     ],
-    "sha1": "f49d172b1fdce66fae95c6d73f01dd5f27a9a5d8",
+    "patch": [
+        "diff --git a/send-statements.go b/send-statements.go",
+        "index bab29cb..e69de29 100644",
+        "--- a/send-statements.go",
+        "+++ b/send-statements.go",
+        "@@ -1 +0,0 @@",
+        "-bar <- 6"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "353e531a55c6c3d0540570c523e799df46615898"
+    "shas": "659afeebaae01516ea3532538f0ea665e2823020..acf23921d6e89772dac98a78ba280e58c2429050"
 }]

test/corpus/diff-summaries/go/short-var-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -40,9 +40,16 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "c960fcc65ac55182c76b10f2b295a3cc10166860",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index e69de29..99b7041 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -0,0 +1 @@",
+        "+a, b := 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1a783799a30336dc4b9798aef977bb2a4ad30d5d"
+    "shas": "294f5cc0ef0e25ecf0309fd41ae6cd4b376ab627..7ec7132712c0483a2acf6807c9e0b400580acf30"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-replacement-insert-test",
@@ -51,30 +58,63 @@
             "short-var-declarations.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                13
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added the 'x' variable"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'y' variable"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a' variable"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'b' variable"
                 }
             ]
         },
@@ -83,9 +123,18 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "1a783799a30336dc4b9798aef977bb2a4ad30d5d",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index 99b7041..220aab8 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -1 +1,3 @@",
+        "+x, y := 3, 4",
+        "+a, b := 1, 2",
+        " a, b := 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "950d07065887bd080775b0257f250b3b53f35d53"
+    "shas": "7ec7132712c0483a2acf6807c9e0b400580acf30..d55246a1bf4a17fe28258dccf542d3a6ebaf922a"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-insert-test",
@@ -97,21 +146,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -124,21 +173,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
@@ -151,21 +200,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -178,21 +227,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     13
                                 ]
                             }
@@ -207,9 +256,19 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "950d07065887bd080775b0257f250b3b53f35d53",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index 220aab8..96ba966 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -1,3 +1,3 @@",
+        "-x, y := 3, 4",
+        "+a, b := 1, 2",
+        " a, b := 1, 2",
+        " a, b := 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2e165e3a8349e288cf5df008c91215a6d1e0eea1"
+    "shas": "d55246a1bf4a17fe28258dccf542d3a6ebaf922a..8984549fa93dd35873e2ee52afc2af3f04791d1c"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-replacement-test",
@@ -221,21 +280,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -248,21 +307,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     9
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     10
                                 ]
                             }
@@ -275,21 +334,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -302,21 +361,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     13
                                 ]
                             }
@@ -331,9 +390,19 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "2e165e3a8349e288cf5df008c91215a6d1e0eea1",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index 96ba966..220aab8 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -1,3 +1,3 @@",
+        "-a, b := 1, 2",
+        "+x, y := 3, 4",
+        " a, b := 1, 2",
+        " a, b := 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f824e878031e2b1d44d93528ba9c60b4cef6083d"
+    "shas": "8984549fa93dd35873e2ee52afc2af3f04791d1c..dd109e24c6a2d3b52a0e1579fa93be09e86bfbbb"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-replacement-test",
@@ -344,11 +413,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -359,11 +428,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -374,11 +443,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -389,11 +458,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -404,11 +473,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -419,11 +488,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -437,9 +506,19 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "f824e878031e2b1d44d93528ba9c60b4cef6083d",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index 220aab8..53cb4ed 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -1,3 +1,2 @@",
+        "-x, y := 3, 4",
+        "-a, b := 1, 2",
+        " a, b := 1, 2",
+        "+x, y := 3, 4"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "32c2030e4597ceafbb01ff6e3d6189c4c0c1df4d"
+    "shas": "dd109e24c6a2d3b52a0e1579fa93be09e86bfbbb..068c4c6e6ce030231dcd6b1f5ae3d282a4f6ba47"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-test",
@@ -448,30 +527,33 @@
             "short-var-declarations.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                13
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'a' variable"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'b' variable"
                 }
             ]
         },
@@ -480,9 +562,17 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "32c2030e4597ceafbb01ff6e3d6189c4c0c1df4d",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index 53cb4ed..9209ec7 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -1,2 +1 @@",
+        "-a, b := 1, 2",
+        " x, y := 3, 4"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "86e943ef7847ca3016b391c44cb7fdee78d9d927"
+    "shas": "068c4c6e6ce030231dcd6b1f5ae3d282a4f6ba47..5a9292f0154404769494bed8797a68db3bf662ad"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-rest-test",
@@ -493,11 +583,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -508,11 +598,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -526,7 +616,14 @@
     "filePaths": [
         "short-var-declarations.go"
     ],
-    "sha1": "86e943ef7847ca3016b391c44cb7fdee78d9d927",
+    "patch": [
+        "diff --git a/short-var-declarations.go b/short-var-declarations.go",
+        "index 9209ec7..e69de29 100644",
+        "--- a/short-var-declarations.go",
+        "+++ b/short-var-declarations.go",
+        "@@ -1 +0,0 @@",
+        "-x, y := 3, 4"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b553e5d63655ec620ade647a1f3551dfa59d2277"
+    "shas": "5a9292f0154404769494bed8797a68db3bf662ad..aa129cc05ef2a77358a80e1404c396003e3738af"
 }]

test/corpus/diff-summaries/go/single-import-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -41,16 +41,16 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 28
                             ]
                         }
                     },
-                    "summary": "Added the 'import alias \"some/package\"' at line 5, column 1 - line 5, column 28"
+                    "summary": "Added the 'import alias \"some/package\"' at line 3, column 1 - line 3, column 28"
                 }
             ]
         }
@@ -58,9 +58,18 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "489adde209f940544e660d374c47bbc860b9c72b",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index e69de29..e30eddb 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -0,0 +1,3 @@",
+        "+import \"net/http\"",
+        "+import . \"some/dsl\"",
+        "+import alias \"some/package\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a6757a56251ba2d618305d1b2ae2fd719f8a3e28"
+    "shas": "b755f1d4404210b76f3d304569455d98b90fa186..437e7db7a8729ba8a685986dd98343129eaf289b"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-replacement-insert-test",
@@ -71,11 +80,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 17
                             ]
                         }
@@ -86,11 +95,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 21
                             ]
                         }
@@ -101,11 +110,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 18
                             ]
                         }
@@ -116,11 +125,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 20
                             ]
                         }
@@ -135,31 +144,31 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 32
                             ]
                         }
                     },
-                    "summary": "Added the 'import alias \"awesome/packages\"' at line 5, column 1 - line 5, column 32"
+                    "summary": "Added the 'import alias \"awesome/packages\"' at line 3, column 1 - line 3, column 32"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 28
                             ]
                         }
                     },
-                    "summary": "Added the 'import alias \"some/package\"' at line 8, column 1 - line 8, column 28"
+                    "summary": "Added the 'import alias \"some/package\"' at line 6, column 1 - line 6, column 28"
                 }
             ]
         }
@@ -167,9 +176,24 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "a6757a56251ba2d618305d1b2ae2fd719f8a3e28",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index e30eddb..a6141af 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -1,3 +1,9 @@",
+        "+import \"foo/bar\"",
+        "+import . \"types/dsl\"",
+        "+import alias \"awesome/packages\"",
+        "+import \"net/http\"",
+        "+import . \"some/dsl\"",
+        "+import alias \"some/package\"",
+        " import \"net/http\"",
+        " import . \"some/dsl\"",
+        " import alias \"some/package\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "960ff51ff3afe7ef94a8ca0f7eca90a7187f81bd"
+    "shas": "437e7db7a8729ba8a685986dd98343129eaf289b..24c2801f35fbac08fe710af7d34a6de746be8b8d"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-insert-test",
@@ -181,75 +205,75 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     17
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"foo/bar\" string with the \"net/http\" string in the \"net/http\" import statement of the 'main' module"
+                    "summary": "Replaced the \"foo/bar\" string with the \"net/http\" string in the \"net/http\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     21
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     20
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the \"some/dsl\" import statement of the 'main' module"
+                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the \"some/dsl\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     14
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     32
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     14
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     28
                                 ]
                             }
@@ -264,9 +288,24 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "960ff51ff3afe7ef94a8ca0f7eca90a7187f81bd",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index a6141af..b54ad96 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        "-import \"foo/bar\"",
+        "-import . \"types/dsl\"",
+        "-import alias \"awesome/packages\"",
+        "+import \"net/http\"",
+        "+import . \"some/dsl\"",
+        "+import alias \"some/package\"",
+        " import \"net/http\"",
+        " import . \"some/dsl\"",
+        " import alias \"some/package\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5e23bd9f1d9ccbde466105805444a19d662a2281"
+    "shas": "24c2801f35fbac08fe710af7d34a6de746be8b8d..330336208dc9988acdd03b84111ed42f47a68cc1"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-replacement-test",
@@ -278,75 +317,75 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     17
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"net/http\" string with the \"foo/bar\" string in the \"foo/bar\" import statement of the 'main' module"
+                    "summary": "Replaced the \"net/http\" string with the \"foo/bar\" string in the \"foo/bar\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     20
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     21
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the \"types/dsl\" import statement of the 'main' module"
+                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the \"types/dsl\" import statement"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     14
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     28
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     14
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     32
                                 ]
                             }
@@ -361,9 +400,24 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "5e23bd9f1d9ccbde466105805444a19d662a2281",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index b54ad96..a6141af 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        "-import \"net/http\"",
+        "-import . \"some/dsl\"",
+        "-import alias \"some/package\"",
+        "+import \"foo/bar\"",
+        "+import . \"types/dsl\"",
+        "+import alias \"awesome/packages\"",
+        " import \"net/http\"",
+        " import . \"some/dsl\"",
+        " import alias \"some/package\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3a34d3922437ed1c541317cec4d6d0832a7c73c1"
+    "shas": "330336208dc9988acdd03b84111ed42f47a68cc1..fed29600ad272abe4d05fb7b4bb406a408ef62d9"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-replacement-test",
@@ -374,11 +428,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 17
                             ]
                         }
@@ -389,11 +443,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 21
                             ]
                         }
@@ -404,11 +458,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 18
                             ]
                         }
@@ -419,11 +473,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 20
                             ]
                         }
@@ -434,11 +488,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 17
                             ]
                         }
@@ -449,11 +503,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 21
                             ]
                         }
@@ -468,46 +522,46 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 32
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import alias \"awesome/packages\"' at line 5, column 1 - line 5, column 32"
+                    "summary": "Deleted the 'import alias \"awesome/packages\"' at line 3, column 1 - line 3, column 32"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 28
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import alias \"some/package\"' at line 8, column 1 - line 8, column 28"
+                    "summary": "Deleted the 'import alias \"some/package\"' at line 6, column 1 - line 6, column 28"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 32
                             ]
                         }
                     },
-                    "summary": "Added the 'import alias \"awesome/packages\"' at line 8, column 1 - line 8, column 32"
+                    "summary": "Added the 'import alias \"awesome/packages\"' at line 6, column 1 - line 6, column 32"
                 }
             ]
         }
@@ -515,9 +569,27 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "3a34d3922437ed1c541317cec4d6d0832a7c73c1",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index a6141af..98c2392 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -1,9 +1,6 @@",
+        "-import \"foo/bar\"",
+        "-import . \"types/dsl\"",
+        "-import alias \"awesome/packages\"",
+        "-import \"net/http\"",
+        "-import . \"some/dsl\"",
+        "-import alias \"some/package\"",
+        " import \"net/http\"",
+        " import . \"some/dsl\"",
+        " import alias \"some/package\"",
+        "+import \"foo/bar\"",
+        "+import . \"types/dsl\"",
+        "+import alias \"awesome/packages\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c8c900b5aafe5f4f1cefb69838267401815cf0cd"
+    "shas": "fed29600ad272abe4d05fb7b4bb406a408ef62d9..d8fe5f813263407b360696c773393622f8626ac8"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-test",
@@ -528,11 +600,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -543,11 +615,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -562,16 +634,16 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 28
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import alias \"some/package\"' at line 5, column 1 - line 5, column 28"
+                    "summary": "Deleted the 'import alias \"some/package\"' at line 3, column 1 - line 3, column 28"
                 }
             ]
         }
@@ -579,9 +651,21 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "c8c900b5aafe5f4f1cefb69838267401815cf0cd",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index 98c2392..8af8c6d 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -1,6 +1,3 @@",
+        "-import \"net/http\"",
+        "-import . \"some/dsl\"",
+        "-import alias \"some/package\"",
+        " import \"foo/bar\"",
+        " import . \"types/dsl\"",
+        " import alias \"awesome/packages\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "645d50be110772c29dd4a1c2e842bbf06aa43569"
+    "shas": "d8fe5f813263407b360696c773393622f8626ac8..a322dc7bac3a14fa7b2bc7584e05add891842d38"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-rest-test",
@@ -592,11 +676,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 17
                             ]
                         }
@@ -607,11 +691,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 21
                             ]
                         }
@@ -626,16 +710,16 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 32
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import alias \"awesome/packages\"' at line 5, column 1 - line 5, column 32"
+                    "summary": "Deleted the 'import alias \"awesome/packages\"' at line 3, column 1 - line 3, column 32"
                 }
             ]
         }
@@ -643,7 +727,16 @@
     "filePaths": [
         "single-import-declarations.go"
     ],
-    "sha1": "645d50be110772c29dd4a1c2e842bbf06aa43569",
+    "patch": [
+        "diff --git a/single-import-declarations.go b/single-import-declarations.go",
+        "index 8af8c6d..e69de29 100644",
+        "--- a/single-import-declarations.go",
+        "+++ b/single-import-declarations.go",
+        "@@ -1,3 +0,0 @@",
+        "-import \"foo/bar\"",
+        "-import . \"types/dsl\"",
+        "-import alias \"awesome/packages\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "60d0595870f22587e7f31bed659faaa89e73c81d"
+    "shas": "a322dc7bac3a14fa7b2bc7584e05add891842d38..49405e780f45c25871a6c2c6a9c4bf847007c59f"
 }]

test/corpus/diff-summaries/go/single-line-function-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 23
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 24
                             ]
                         }
@@ -55,9 +55,18 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "3859e3f291b6fe933be02dbc730935422b0aafb0",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index e69de29..3ac1720 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -0,0 +1,3 @@",
+        "+func f1() { a() }",
+        "+func f2() { a(); b() }",
+        "+func f3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "05e1472680c28fa54012fee5a06f0f7a0e5912a9"
+    "shas": "9096649c53a965576d44aa8d1b52f7b63d420fea..cae2b3de861d0266a7437eed7937500a50a26873"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-replacement-insert-test",
@@ -68,11 +77,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -83,11 +92,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 23
                             ]
                         }
@@ -98,11 +107,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 24
                             ]
                         }
@@ -113,11 +122,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 18
                             ]
                         }
@@ -128,11 +137,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 23
                             ]
                         }
@@ -143,11 +152,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 24
                             ]
                         }
@@ -161,9 +170,24 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "05e1472680c28fa54012fee5a06f0f7a0e5912a9",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index 3ac1720..39e0696 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -1,3 +1,9 @@",
+        "+func g1() { a() }",
+        "+func g2() { a(); b() }",
+        "+func g3() { a(); b(); }",
+        "+func f1() { a() }",
+        "+func f2() { a(); b() }",
+        "+func f3() { a(); b(); }",
+        " func f1() { a() }",
+        " func f2() { a(); b() }",
+        " func f3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3019b504597b211e81deb8d9c25d0b866d70e87d"
+    "shas": "cae2b3de861d0266a7437eed7937500a50a26873..48dfe25b8ab21ce6cc4d3b1d2047b474fe1cc13b"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-insert-test",
@@ -175,81 +199,81 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the f1 function of the 'main' module"
+                    "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the f1 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g2' identifier with the 'f2' identifier in the f2 function of the 'main' module"
+                    "summary": "Replaced the 'g2' identifier with the 'f2' identifier in the f2 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g3' identifier with the 'f3' identifier in the f3 function of the 'main' module"
+                    "summary": "Replaced the 'g3' identifier with the 'f3' identifier in the f3 function"
                 }
             ]
         },
@@ -258,9 +282,24 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "3019b504597b211e81deb8d9c25d0b866d70e87d",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index 39e0696..eec54a8 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        "-func g1() { a() }",
+        "-func g2() { a(); b() }",
+        "-func g3() { a(); b(); }",
+        "+func f1() { a() }",
+        "+func f2() { a(); b() }",
+        "+func f3() { a(); b(); }",
+        " func f1() { a() }",
+        " func f2() { a(); b() }",
+        " func f3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "bd945223a19928035a820b953198e3ce94590248"
+    "shas": "48dfe25b8ab21ce6cc4d3b1d2047b474fe1cc13b..3741e0652eb253b416b04872a63d816ccc25d1a6"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-replacement-test",
@@ -272,81 +311,81 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the g1 function of the 'main' module"
+                    "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the g1 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f2' identifier with the 'g2' identifier in the g2 function of the 'main' module"
+                    "summary": "Replaced the 'f2' identifier with the 'g2' identifier in the g2 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f3' identifier with the 'g3' identifier in the g3 function of the 'main' module"
+                    "summary": "Replaced the 'f3' identifier with the 'g3' identifier in the g3 function"
                 }
             ]
         },
@@ -355,9 +394,24 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "bd945223a19928035a820b953198e3ce94590248",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index eec54a8..39e0696 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        "-func f1() { a() }",
+        "-func f2() { a(); b() }",
+        "-func f3() { a(); b(); }",
+        "+func g1() { a() }",
+        "+func g2() { a(); b() }",
+        "+func g3() { a(); b(); }",
+        " func f1() { a() }",
+        " func f2() { a(); b() }",
+        " func f3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "d1fe7332442f0732a82dc41756a860a784461a01"
+    "shas": "3741e0652eb253b416b04872a63d816ccc25d1a6..d8b23ec7c0f30bb603eda112e423f35c5d53d1b1"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-replacement-test",
@@ -368,11 +422,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -383,11 +437,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 23
                             ]
                         }
@@ -398,11 +452,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 24
                             ]
                         }
@@ -413,11 +467,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 18
                             ]
                         }
@@ -428,11 +482,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 23
                             ]
                         }
@@ -443,11 +497,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 24
                             ]
                         }
@@ -458,11 +512,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 18
                             ]
                         }
@@ -473,11 +527,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 23
                             ]
                         }
@@ -488,11 +542,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 24
                             ]
                         }
@@ -506,9 +560,27 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "d1fe7332442f0732a82dc41756a860a784461a01",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index 39e0696..7fcb3a1 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -1,9 +1,6 @@",
+        "-func g1() { a() }",
+        "-func g2() { a(); b() }",
+        "-func g3() { a(); b(); }",
+        "-func f1() { a() }",
+        "-func f2() { a(); b() }",
+        "-func f3() { a(); b(); }",
+        " func f1() { a() }",
+        " func f2() { a(); b() }",
+        " func f3() { a(); b(); }",
+        "+func g1() { a() }",
+        "+func g2() { a(); b() }",
+        "+func g3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "76cdb2d4f70ba087e9d75bf3e04d668a343d1d41"
+    "shas": "d8b23ec7c0f30bb603eda112e423f35c5d53d1b1..20c4ef7df079d3437ea04953c1c5312cb54f1002"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-test",
@@ -519,11 +591,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -534,11 +606,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 23
                             ]
                         }
@@ -549,11 +621,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 24
                             ]
                         }
@@ -567,9 +639,21 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "76cdb2d4f70ba087e9d75bf3e04d668a343d1d41",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index 7fcb3a1..ef4196f 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -1,6 +1,3 @@",
+        "-func f1() { a() }",
+        "-func f2() { a(); b() }",
+        "-func f3() { a(); b(); }",
+        " func g1() { a() }",
+        " func g2() { a(); b() }",
+        " func g3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "155eee8f053d32a704ba6bc1502e2e2b828b81cb"
+    "shas": "20c4ef7df079d3437ea04953c1c5312cb54f1002..ad3299189246bfc5df44d7866c05fd40ccd34abc"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-rest-test",
@@ -580,11 +664,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 18
                             ]
                         }
@@ -595,11 +679,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 23
                             ]
                         }
@@ -610,11 +694,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 24
                             ]
                         }
@@ -628,7 +712,16 @@
     "filePaths": [
         "single-line-function-declarations.go"
     ],
-    "sha1": "155eee8f053d32a704ba6bc1502e2e2b828b81cb",
+    "patch": [
+        "diff --git a/single-line-function-declarations.go b/single-line-function-declarations.go",
+        "index ef4196f..e69de29 100644",
+        "--- a/single-line-function-declarations.go",
+        "+++ b/single-line-function-declarations.go",
+        "@@ -1,3 +0,0 @@",
+        "-func g1() { a() }",
+        "-func g2() { a(); b() }",
+        "-func g3() { a(); b(); }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1011eae016159133bb9b3305fa29900aa6f06827"
+    "shas": "ad3299189246bfc5df44d7866c05fd40ccd34abc..256c131008b104fa15d57c0f3ff56131c11337fe"
 }]

test/corpus/diff-summaries/go/slice-literals.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 26
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -55,9 +55,21 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "e727d68d5530b584f126dc2c23f5dafc2ed9f862",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index e69de29..9b1eb7a 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -0,0 +1,6 @@",
+        "+const s1 = []string{}",
+        "+const s2 = []string{\"hi\"}",
+        "+const s3 = []string{",
+        "+\"hi\",",
+        "+ \"hello\",",
+        "+}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7d1dc33757ba083fa8c0a4ee6420a19ba409a632"
+    "shas": "9e795da07ee62f0a45cb22c279f0ac4a7f3d43d7..7e5f16141af567d499956917afac82cf54db902b"
 }
 ,{
     "testCaseDescription": "go-slice-literals-replacement-insert-test",
@@ -68,11 +80,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 27
                             ]
                         }
@@ -83,11 +95,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 29
                             ]
                         }
@@ -98,11 +110,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -113,11 +125,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                9,
+                                7,
                                 22
                             ]
                         }
@@ -128,11 +140,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                10,
+                                8,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 26
                             ]
                         }
@@ -143,11 +155,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                11,
+                                9,
                                 1
                             ],
                             "end": [
-                                14,
+                                12,
                                 2
                             ]
                         }
@@ -161,9 +173,30 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "7d1dc33757ba083fa8c0a4ee6420a19ba409a632",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index 9b1eb7a..4555163 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -1,3 +1,15 @@",
+        "+const s1 = []string{\"sup\"}",
+        "+const s2 = []string{\"hello\"}",
+        "+const s3 = []string{",
+        "+\"bar\",",
+        "+ \"baz\",",
+        "+}",
+        "+const s1 = []string{}",
+        "+const s2 = []string{\"hi\"}",
+        "+const s3 = []string{",
+        "+\"hi\",",
+        "+ \"hello\",",
+        "+}",
+        " const s1 = []string{}",
+        " const s2 = []string{\"hi\"}",
+        " const s3 = []string{"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2777faca7f750c059198d05cdeb7506db55f5b44"
+    "shas": "7e5f16141af567d499956917afac82cf54db902b..430df208c0280d2df11bed2f3f13ef4d0b0ad9fc"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-insert-test",
@@ -175,108 +208,108 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     21
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     26
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     20
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"sup\" string with the '{}' literal_value in the s1 variable of the 'main' module"
+                    "summary": "Replaced the \"sup\" string with the '{}' literal_value in the s1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     21
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     28
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     21
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     25
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hello\" string with the \"hi\" string in the s2 variable of the 'main' module"
+                    "summary": "Replaced the \"hello\" string with the \"hi\" string in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     1
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     1
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"bar\" string with the \"hi\" string in the s3 variable of the 'main' module"
+                    "summary": "Replaced the \"bar\" string with the \"hi\" string in the s3 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     2
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     7
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     2
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     9
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"baz\" string with the \"hello\" string in the s3 variable of the 'main' module"
+                    "summary": "Replaced the \"baz\" string with the \"hello\" string in the s3 variable"
                 }
             ]
         },
@@ -285,9 +318,27 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "2777faca7f750c059198d05cdeb7506db55f5b44",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index 4555163..39a2067 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -1,8 +1,8 @@",
+        "-const s1 = []string{\"sup\"}",
+        "-const s2 = []string{\"hello\"}",
+        "+const s1 = []string{}",
+        "+const s2 = []string{\"hi\"}",
+        " const s3 = []string{",
+        "-\"bar\",",
+        "- \"baz\",",
+        "+\"hi\",",
+        "+ \"hello\",",
+        " }",
+        " const s1 = []string{}",
+        " const s2 = []string{\"hi\"}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6c12749cd08a72bbdef593a7c7a81b9d863afb10"
+    "shas": "430df208c0280d2df11bed2f3f13ef4d0b0ad9fc..6d5b83fd5bcf434b3dc818de211b89abee2d6cf4"
 }
 ,{
     "testCaseDescription": "go-slice-literals-replacement-test",
@@ -299,108 +350,108 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     20
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     22
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     21
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     26
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the '{}' literal_value with the \"sup\" string in the s1 variable of the 'main' module"
+                    "summary": "Replaced the '{}' literal_value with the \"sup\" string in the s1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     21
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     25
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     21
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     28
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hi\" string with the \"hello\" string in the s2 variable of the 'main' module"
+                    "summary": "Replaced the \"hi\" string with the \"hello\" string in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     1
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    6,
+                                    4,
                                     1
                                 ],
                                 "end": [
-                                    6,
+                                    4,
                                     6
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hi\" string with the \"bar\" string in the s3 variable of the 'main' module"
+                    "summary": "Replaced the \"hi\" string with the \"bar\" string in the s3 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     2
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     2
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     7
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hello\" string with the \"baz\" string in the s3 variable of the 'main' module"
+                    "summary": "Replaced the \"hello\" string with the \"baz\" string in the s3 variable"
                 }
             ]
         },
@@ -409,9 +460,27 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "6c12749cd08a72bbdef593a7c7a81b9d863afb10",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index 39a2067..4555163 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -1,8 +1,8 @@",
+        "-const s1 = []string{}",
+        "-const s2 = []string{\"hi\"}",
+        "+const s1 = []string{\"sup\"}",
+        "+const s2 = []string{\"hello\"}",
+        " const s3 = []string{",
+        "-\"hi\",",
+        "- \"hello\",",
+        "+\"bar\",",
+        "+ \"baz\",",
+        " }",
+        " const s1 = []string{}",
+        " const s2 = []string{\"hi\"}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "988fbb38958d9dc24e4e35b23bccdad8442f4a94"
+    "shas": "6d5b83fd5bcf434b3dc818de211b89abee2d6cf4..9a675a67b7a1a6c55dcd56919a18b1cef6a4ebd2"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-replacement-test",
@@ -422,11 +491,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 27
                             ]
                         }
@@ -437,11 +506,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 29
                             ]
                         }
@@ -452,11 +521,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -467,11 +536,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                9,
+                                7,
                                 22
                             ]
                         }
@@ -482,11 +551,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                10,
+                                8,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 26
                             ]
                         }
@@ -497,11 +566,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                11,
+                                9,
                                 1
                             ],
                             "end": [
-                                14,
+                                12,
                                 2
                             ]
                         }
@@ -512,11 +581,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                9,
+                                7,
                                 27
                             ]
                         }
@@ -527,11 +596,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                10,
+                                8,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 29
                             ]
                         }
@@ -542,11 +611,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                11,
+                                9,
                                 1
                             ],
                             "end": [
-                                14,
+                                12,
                                 2
                             ]
                         }
@@ -560,9 +629,37 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "988fbb38958d9dc24e4e35b23bccdad8442f4a94",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index 4555163..d3fb29c 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -1,18 +1,12 @@",
+        "-const s1 = []string{\"sup\"}",
+        "-const s2 = []string{\"hello\"}",
+        "-const s3 = []string{",
+        "-\"bar\",",
+        "- \"baz\",",
+        "-}",
+        " const s1 = []string{}",
+        " const s2 = []string{\"hi\"}",
+        " const s3 = []string{",
+        " \"hi\",",
+        "  \"hello\",",
+        " }",
+        "-const s1 = []string{}",
+        "-const s2 = []string{\"hi\"}",
+        "+const s1 = []string{\"sup\"}",
+        "+const s2 = []string{\"hello\"}",
+        " const s3 = []string{",
+        "-\"hi\",",
+        "- \"hello\",",
+        "+\"bar\",",
+        "+ \"baz\",",
+        " }"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e138f6bad52e3a5eb9669b55644cf0f6b78a4959"
+    "shas": "9a675a67b7a1a6c55dcd56919a18b1cef6a4ebd2..0be08b31a19a03e3ab9ce42f685dac31c88fcf21"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-test",
@@ -573,11 +670,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -588,11 +685,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 26
                             ]
                         }
@@ -603,11 +700,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -621,9 +718,24 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "e138f6bad52e3a5eb9669b55644cf0f6b78a4959",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index d3fb29c..e3fd378 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -1,9 +1,3 @@",
+        "-const s1 = []string{}",
+        "-const s2 = []string{\"hi\"}",
+        "-const s3 = []string{",
+        "-\"hi\",",
+        "- \"hello\",",
+        "-}",
+        " const s1 = []string{\"sup\"}",
+        " const s2 = []string{\"hello\"}",
+        " const s3 = []string{"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7cc41f942596210a56b0d38f340cbbff25e64125"
+    "shas": "0be08b31a19a03e3ab9ce42f685dac31c88fcf21..3aa336f26d89c944f5f2d3ce3382a451a2e9ab9c"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-rest-test",
@@ -634,11 +746,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 27
                             ]
                         }
@@ -649,11 +761,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 29
                             ]
                         }
@@ -664,11 +776,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 2
                             ]
                         }
@@ -682,7 +794,19 @@
     "filePaths": [
         "slice-literals.go"
     ],
-    "sha1": "7cc41f942596210a56b0d38f340cbbff25e64125",
+    "patch": [
+        "diff --git a/slice-literals.go b/slice-literals.go",
+        "index e3fd378..e69de29 100644",
+        "--- a/slice-literals.go",
+        "+++ b/slice-literals.go",
+        "@@ -1,6 +0,0 @@",
+        "-const s1 = []string{\"sup\"}",
+        "-const s2 = []string{\"hello\"}",
+        "-const s3 = []string{",
+        "-\"bar\",",
+        "- \"baz\",",
+        "-}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ac21f9d0ee6f7ef2a5a607b08fe2b95f3a6470c8"
+    "shas": "3aa336f26d89c944f5f2d3ce3382a451a2e9ab9c..5b7d43722e8258820bec8f43f32d77913026fbd1"
 }]

test/corpus/diff-summaries/go/slice-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -52,11 +52,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -70,9 +70,17 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "4c8c99e5a735f66e43d41e65a75a75272a162c8c",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index e69de29..1b8dbe5 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -0,0 +1,2 @@",
+        "+type a []b",
+        "+type c [][]d"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "99a3831a6044a4a67c3097d126a27802bf1a070b"
+    "shas": "338fc2d73f62d9c316e48cf2390c1052834d4985..1ea577f2f81489221ed09ffb1ad11075a01a8c3c"
 }
 ,{
     "testCaseDescription": "go-slice-types-replacement-insert-test",
@@ -83,11 +91,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -98,11 +106,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -113,11 +121,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -128,11 +136,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -143,11 +151,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 7
                             ]
                         }
@@ -158,11 +166,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 10
                             ],
                             "end": [
-                                5,
+                                3,
                                 11
                             ]
                         }
@@ -173,11 +181,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 6
                             ],
                             "end": [
-                                6,
+                                4,
                                 7
                             ]
                         }
@@ -188,11 +196,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 12
                             ],
                             "end": [
-                                6,
+                                4,
                                 13
                             ]
                         }
@@ -206,9 +214,21 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "99a3831a6044a4a67c3097d126a27802bf1a070b",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index 1b8dbe5..d718ee8 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -1,2 +1,6 @@",
+        "+type a [][]p",
+        "+type c []y",
+        "+type a []b",
+        "+type c [][]d",
+        " type a []b",
+        " type c [][]d"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "cc90097c8cf3490855377cf31aa3de2e3e92b08f"
+    "shas": "1ea577f2f81489221ed09ffb1ad11075a01a8c3c..ea4858c48ca03ca912291083660d83d19205240c"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-insert-test",
@@ -219,11 +239,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -234,11 +254,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -249,11 +269,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -264,11 +284,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -282,9 +302,22 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "cc90097c8cf3490855377cf31aa3de2e3e92b08f",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index d718ee8..e6836eb 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -1,5 +1,5 @@",
+        "-type a [][]p",
+        "-type c []y",
+        "+type a []b",
+        "+type c [][]d",
+        " type a []b",
+        " type c [][]d",
+        " type a []b"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b7bd35a7d0885f272b4308903892645a3fe5bbb7"
+    "shas": "ea4858c48ca03ca912291083660d83d19205240c..74a3b7c7d6431de72a0ab9d1fe827fb9207385bb"
 }
 ,{
     "testCaseDescription": "go-slice-types-replacement-test",
@@ -295,11 +328,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -310,11 +343,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -325,11 +358,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -340,11 +373,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -358,9 +391,22 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "b7bd35a7d0885f272b4308903892645a3fe5bbb7",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index e6836eb..d718ee8 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -1,5 +1,5 @@",
+        "-type a []b",
+        "-type c [][]d",
+        "+type a [][]p",
+        "+type c []y",
+        " type a []b",
+        " type c [][]d",
+        " type a []b"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7e67518ac3811296fdc770c881b134581998c9cd"
+    "shas": "74a3b7c7d6431de72a0ab9d1fe827fb9207385bb..3c1f3f0aaba3f93566e81fa6919588140c7f84f8"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-replacement-test",
@@ -371,11 +417,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -386,11 +432,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -401,11 +447,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -416,11 +462,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -431,11 +477,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 7
                             ]
                         }
@@ -446,11 +492,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 10
                             ],
                             "end": [
-                                5,
+                                3,
                                 11
                             ]
                         }
@@ -461,11 +507,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 6
                             ],
                             "end": [
-                                6,
+                                4,
                                 7
                             ]
                         }
@@ -476,11 +522,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 12
                             ],
                             "end": [
-                                6,
+                                4,
                                 13
                             ]
                         }
@@ -491,11 +537,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 6
                             ],
                             "end": [
-                                5,
+                                3,
                                 7
                             ]
                         }
@@ -506,11 +552,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 12
                             ],
                             "end": [
-                                5,
+                                3,
                                 13
                             ]
                         }
@@ -521,11 +567,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 6
                             ],
                             "end": [
-                                6,
+                                4,
                                 7
                             ]
                         }
@@ -536,11 +582,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 10
                             ],
                             "end": [
-                                6,
+                                4,
                                 11
                             ]
                         }
@@ -554,9 +600,23 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "7e67518ac3811296fdc770c881b134581998c9cd",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index d718ee8..9f9c73f 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -1,6 +1,4 @@",
+        "-type a [][]p",
+        "-type c []y",
+        "-type a []b",
+        "-type c [][]d",
+        " type a []b",
+        " type c [][]d",
+        "+type a [][]p",
+        "+type c []y"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5fc6c996739c83c3b77acfb9fcd7e89ee3ffe347"
+    "shas": "3c1f3f0aaba3f93566e81fa6919588140c7f84f8..14884815c9c60888a7434f5537b7d37ed222154b"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-test",
@@ -567,11 +627,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -582,11 +642,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 10
                             ],
                             "end": [
-                                3,
+                                1,
                                 11
                             ]
                         }
@@ -597,11 +657,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -612,11 +672,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 12
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -630,9 +690,19 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "5fc6c996739c83c3b77acfb9fcd7e89ee3ffe347",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index 9f9c73f..964a319 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -1,4 +1,2 @@",
+        "-type a []b",
+        "-type c [][]d",
+        " type a [][]p",
+        " type c []y"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "16fcb96325446aa55183c41f179fb38b2288c374"
+    "shas": "14884815c9c60888a7434f5537b7d37ed222154b..9052f7f67fe0ab24fccfccd64c631ce9a5ea299d"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-rest-test",
@@ -643,11 +713,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 7
                             ]
                         }
@@ -658,11 +728,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 12
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -673,11 +743,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -688,11 +758,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 11
                             ]
                         }
@@ -706,7 +776,15 @@
     "filePaths": [
         "slice-types.go"
     ],
-    "sha1": "16fcb96325446aa55183c41f179fb38b2288c374",
+    "patch": [
+        "diff --git a/slice-types.go b/slice-types.go",
+        "index 964a319..e69de29 100644",
+        "--- a/slice-types.go",
+        "+++ b/slice-types.go",
+        "@@ -1,2 +0,0 @@",
+        "-type a [][]p",
+        "-type c []y"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "776befbec12285642ba8944297803b4289c10cf0"
+    "shas": "9052f7f67fe0ab24fccfccd64c631ce9a5ea299d..32e685f38686a99987e01d66161451aeba15b018"
 }]

test/corpus/diff-summaries/go/string-literals.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -40,9 +40,19 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "46503417695204e939923a09702395449f526a66",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index e69de29..90ac543 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -0,0 +1,4 @@",
+        "+const (",
+        "+a = \"0\"",
+        "+b = \"hello world\"",
+        "+)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a76939c67983d066f688e7ce631efa7939b44061"
+    "shas": "3f18376b34b25deb3740a62df8c40ad667cfef4a..1fcc677f0888042248bdab575c0e47c0ab14de18"
 }
 ,{
     "testCaseDescription": "go-string-literals-replacement-insert-test",
@@ -53,11 +63,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -68,11 +78,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -83,11 +93,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -98,11 +108,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -116,9 +126,27 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "a76939c67983d066f688e7ce631efa7939b44061",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index 90ac543..a781ce7 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -1,4 +1,12 @@",
+        " const (",
+        "+a = \"2\"",
+        "+b = \"hi\"",
+        "+)",
+        "+const (",
+        "+a = \"0\"",
+        "+b = \"hello world\"",
+        "+)",
+        "+const (",
+        " a = \"0\"",
+        " b = \"hello world\"",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2ee4fc2288f35ae53ff82ea8c0e635e6c8ec88fb"
+    "shas": "1fcc677f0888042248bdab575c0e47c0ab14de18..b2d8cadd90f5b59b4c6eb0390c490ae2c4a18d43"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-insert-test",
@@ -130,54 +158,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"2\" string with the \"0\" string in the a variable of the 'main' module"
+                    "summary": "Replaced the \"2\" string with the \"0\" string in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     18
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hi\" string with the \"hello world\" string in the b variable of the 'main' module"
+                    "summary": "Replaced the \"hi\" string with the \"hello world\" string in the b variable"
                 }
             ]
         },
@@ -186,9 +214,23 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "2ee4fc2288f35ae53ff82ea8c0e635e6c8ec88fb",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index a781ce7..e7b83ba 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -1,6 +1,6 @@",
+        " const (",
+        "-a = \"2\"",
+        "-b = \"hi\"",
+        "+a = \"0\"",
+        "+b = \"hello world\"",
+        " )",
+        " const (",
+        " a = \"0\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a9289dc489299bca159b46cf38d70d86dbdaec2b"
+    "shas": "b2d8cadd90f5b59b4c6eb0390c490ae2c4a18d43..a1f9c06d180e286202d36246299acd0b591fcd5a"
 }
 ,{
     "testCaseDescription": "go-string-literals-replacement-test",
@@ -200,54 +242,54 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"0\" string with the \"2\" string in the a variable of the 'main' module"
+                    "summary": "Replaced the \"0\" string with the \"2\" string in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     18
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     5
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     9
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hello world\" string with the \"hi\" string in the b variable of the 'main' module"
+                    "summary": "Replaced the \"hello world\" string with the \"hi\" string in the b variable"
                 }
             ]
         },
@@ -256,9 +298,23 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "a9289dc489299bca159b46cf38d70d86dbdaec2b",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index e7b83ba..a781ce7 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -1,6 +1,6 @@",
+        " const (",
+        "-a = \"0\"",
+        "-b = \"hello world\"",
+        "+a = \"2\"",
+        "+b = \"hi\"",
+        " )",
+        " const (",
+        " a = \"0\""
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1b4e94355841b5a0f04871f29b45eaacfae619b7"
+    "shas": "a1f9c06d180e286202d36246299acd0b591fcd5a..e1282339ed365981efd8f8c59b43478999306c11"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-replacement-test",
@@ -269,11 +325,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -284,11 +340,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -299,11 +355,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -314,11 +370,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -329,11 +385,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -344,11 +400,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                10,
+                                8,
                                 2
                             ]
                         }
@@ -362,9 +418,29 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "1b4e94355841b5a0f04871f29b45eaacfae619b7",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index a781ce7..38c651f 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -1,12 +1,8 @@",
+        " const (",
+        "-a = \"2\"",
+        "-b = \"hi\"",
+        "-)",
+        "-const (",
+        " a = \"0\"",
+        " b = \"hello world\"",
+        " )",
+        " const (",
+        "-a = \"0\"",
+        "-b = \"hello world\"",
+        "+a = \"2\"",
+        "+b = \"hi\"",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2ee868c0d8265081b782f2a44910abb7093a0c0c"
+    "shas": "e1282339ed365981efd8f8c59b43478999306c11..432f3a0fcc0b325bc03132ce27f83e25fe8be1ae"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-test",
@@ -375,11 +451,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -390,11 +466,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -408,9 +484,23 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "2ee868c0d8265081b782f2a44910abb7093a0c0c",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index 38c651f..f70bc80 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -1,8 +1,4 @@",
+        " const (",
+        "-a = \"0\"",
+        "-b = \"hello world\"",
+        "-)",
+        "-const (",
+        " a = \"2\"",
+        " b = \"hi\"",
+        " )"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "1a592735bca17371b66c085235fb6cc6bb00b321"
+    "shas": "432f3a0fcc0b325bc03132ce27f83e25fe8be1ae..42c2e3f4eef81d189311a542d1c0450e8b56c443"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-rest-test",
@@ -421,11 +511,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -436,11 +526,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -454,7 +544,17 @@
     "filePaths": [
         "string-literals.go"
     ],
-    "sha1": "1a592735bca17371b66c085235fb6cc6bb00b321",
+    "patch": [
+        "diff --git a/string-literals.go b/string-literals.go",
+        "index f70bc80..e69de29 100644",
+        "--- a/string-literals.go",
+        "+++ b/string-literals.go",
+        "@@ -1,4 +0,0 @@",
+        "-const (",
+        "-a = \"2\"",
+        "-b = \"hi\"",
+        "-)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e727d68d5530b584f126dc2c23f5dafc2ed9f862"
+    "shas": "42c2e3f4eef81d189311a542d1c0450e8b56c443..9e795da07ee62f0a45cb22c279f0ac4a7f3d43d7"
 }]

test/corpus/diff-summaries/go/struct-literals.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 32
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 23
                             ]
                         }
@@ -55,9 +55,21 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "bb9bc3e6100eaaf7ccd25a9360f08698cff15981",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index e69de29..f949dbb 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -0,0 +1,6 @@",
+        "+const s1 = Person{",
+        "+name: \"Frank\",",
+        "+Age: \"5 months\",",
+        "+}",
+        "+const s2 = struct{i int;}{i: 5}",
+        "+const s3 = time.Time{}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5751915de93bd4edbb76549621e27487401e9ddc"
+    "shas": "cd582e9b85e985f87af52085296e006987e8b0d3..6c9bcc47bf47a86de621d89270a4d7d62dd8241c"
 }
 ,{
     "testCaseDescription": "go-struct-literals-replacement-insert-test",
@@ -68,11 +80,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -83,11 +95,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 34
                             ]
                         }
@@ -98,11 +110,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 24
                             ]
                         }
@@ -113,11 +125,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -128,11 +140,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                13,
+                                11,
                                 1
                             ],
                             "end": [
-                                13,
+                                11,
                                 32
                             ]
                         }
@@ -143,11 +155,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                14,
+                                12,
                                 1
                             ],
                             "end": [
-                                14,
+                                12,
                                 23
                             ]
                         }
@@ -161,9 +173,30 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "5751915de93bd4edbb76549621e27487401e9ddc",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index f949dbb..c6a242e 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -1,3 +1,15 @@",
+        "+const s1 = Dog{",
+        "+name: \"Frank\",",
+        "+Age: \"5 months\",",
+        "+}",
+        "+const s2 = struct{i float;}{j: 6}",
+        "+const s3 = time.Month{}",
+        "+const s1 = Person{",
+        "+name: \"Frank\",",
+        "+Age: \"5 months\",",
+        "+}",
+        "+const s2 = struct{i int;}{i: 5}",
+        "+const s3 = time.Time{}",
+        " const s1 = Person{",
+        " name: \"Frank\",",
+        " Age: \"5 months\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "0ac865f0373e18dd0b54761f3e7b229a8aeedcb7"
+    "shas": "6c9bcc47bf47a86de621d89270a4d7d62dd8241c..549bd62659cc4988bc02a8deb069747ea8efc519"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-insert-test",
@@ -175,135 +208,135 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     15
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Dog' identifier with the 'Person' identifier in the s1 variable of the 'main' module"
+                    "summary": "Replaced the 'Dog' identifier with the 'Person' identifier in the s1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     21
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     26
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     21
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     24
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'float' identifier with the 'int' identifier in the s2 variable of the 'main' module"
+                    "summary": "Replaced the 'float' identifier with the 'int' identifier in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     29
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     30
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     27
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     28
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'j' identifier with the 'i' identifier in the s2 variable of the 'main' module"
+                    "summary": "Replaced the 'j' identifier with the 'i' identifier in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     32
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     33
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     30
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     31
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '6' with '5' in the s2 variable of the 'main' module"
+                    "summary": "Replaced '6' with '5' in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    8,
+                                    6,
                                     17
                                 ],
                                 "end": [
-                                    8,
+                                    6,
                                     22
                                 ]
                             },
                             {
                                 "start": [
-                                    8,
+                                    6,
                                     17
                                 ],
                                 "end": [
-                                    8,
+                                    6,
                                     21
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Month' identifier with the 'Time' identifier in the s3 variable of the 'main' module"
+                    "summary": "Replaced the 'Month' identifier with the 'Time' identifier in the s3 variable"
                 }
             ]
         },
@@ -312,9 +345,27 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "0ac865f0373e18dd0b54761f3e7b229a8aeedcb7",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index c6a242e..680652e 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -1,9 +1,9 @@",
+        "-const s1 = Dog{",
+        "+const s1 = Person{",
+        " name: \"Frank\",",
+        " Age: \"5 months\",",
+        " }",
+        "-const s2 = struct{i float;}{j: 6}",
+        "-const s3 = time.Month{}",
+        "+const s2 = struct{i int;}{i: 5}",
+        "+const s3 = time.Time{}",
+        " const s1 = Person{",
+        " name: \"Frank\",",
+        " Age: \"5 months\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "156014fcaa38d31c2fde2e7fb290c8f4b2b636ba"
+    "shas": "549bd62659cc4988bc02a8deb069747ea8efc519..02d890ec6a09db8058f6a825c4f81f4c0abcfa38"
 }
 ,{
     "testCaseDescription": "go-struct-literals-replacement-test",
@@ -326,135 +377,135 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     18
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     15
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Person' identifier with the 'Dog' identifier in the s1 variable of the 'main' module"
+                    "summary": "Replaced the 'Person' identifier with the 'Dog' identifier in the s1 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     21
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     24
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     21
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     26
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'int' identifier with the 'float' identifier in the s2 variable of the 'main' module"
+                    "summary": "Replaced the 'int' identifier with the 'float' identifier in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     27
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     28
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     29
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     30
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'i' identifier with the 'j' identifier in the s2 variable of the 'main' module"
+                    "summary": "Replaced the 'i' identifier with the 'j' identifier in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     30
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     31
                                 ]
                             },
                             {
                                 "start": [
-                                    7,
+                                    5,
                                     32
                                 ],
                                 "end": [
-                                    7,
+                                    5,
                                     33
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '5' with '6' in the s2 variable of the 'main' module"
+                    "summary": "Replaced '5' with '6' in the s2 variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    8,
+                                    6,
                                     17
                                 ],
                                 "end": [
-                                    8,
+                                    6,
                                     21
                                 ]
                             },
                             {
                                 "start": [
-                                    8,
+                                    6,
                                     17
                                 ],
                                 "end": [
-                                    8,
+                                    6,
                                     22
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Time' identifier with the 'Month' identifier in the s3 variable of the 'main' module"
+                    "summary": "Replaced the 'Time' identifier with the 'Month' identifier in the s3 variable"
                 }
             ]
         },
@@ -463,9 +514,27 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "156014fcaa38d31c2fde2e7fb290c8f4b2b636ba",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index 680652e..c6a242e 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -1,9 +1,9 @@",
+        "-const s1 = Person{",
+        "+const s1 = Dog{",
+        " name: \"Frank\",",
+        " Age: \"5 months\",",
+        " }",
+        "-const s2 = struct{i int;}{i: 5}",
+        "-const s3 = time.Time{}",
+        "+const s2 = struct{i float;}{j: 6}",
+        "+const s3 = time.Month{}",
+        " const s1 = Person{",
+        " name: \"Frank\",",
+        " Age: \"5 months\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "174afee30e6ac3bdc677dabaccec0fbc080702f2"
+    "shas": "02d890ec6a09db8058f6a825c4f81f4c0abcfa38..3e8f6a306606b2698b9733e5f66cd359a7563b3d"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-replacement-test",
@@ -476,11 +545,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -491,11 +560,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 34
                             ]
                         }
@@ -506,11 +575,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 24
                             ]
                         }
@@ -521,11 +590,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -536,11 +605,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                13,
+                                11,
                                 1
                             ],
                             "end": [
-                                13,
+                                11,
                                 32
                             ]
                         }
@@ -551,11 +620,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                14,
+                                12,
                                 1
                             ],
                             "end": [
-                                14,
+                                12,
                                 23
                             ]
                         }
@@ -566,11 +635,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 1
                             ],
                             "end": [
-                                12,
+                                10,
                                 2
                             ]
                         }
@@ -581,11 +650,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                13,
+                                11,
                                 1
                             ],
                             "end": [
-                                13,
+                                11,
                                 34
                             ]
                         }
@@ -596,11 +665,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                14,
+                                12,
                                 1
                             ],
                             "end": [
-                                14,
+                                12,
                                 24
                             ]
                         }
@@ -614,9 +683,36 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "174afee30e6ac3bdc677dabaccec0fbc080702f2",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index c6a242e..5aaf236 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -1,18 +1,12 @@",
+        "-const s1 = Dog{",
+        "-name: \"Frank\",",
+        "-Age: \"5 months\",",
+        "-}",
+        "-const s2 = struct{i float;}{j: 6}",
+        "-const s3 = time.Month{}",
+        " const s1 = Person{",
+        " name: \"Frank\",",
+        " Age: \"5 months\",",
+        " }",
+        " const s2 = struct{i int;}{i: 5}",
+        " const s3 = time.Time{}",
+        "-const s1 = Person{",
+        "+const s1 = Dog{",
+        " name: \"Frank\",",
+        " Age: \"5 months\",",
+        " }",
+        "-const s2 = struct{i int;}{i: 5}",
+        "-const s3 = time.Time{}",
+        "+const s2 = struct{i float;}{j: 6}",
+        "+const s3 = time.Month{}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "603e16c70c2ac01320ed82cde555516397b7861a"
+    "shas": "3e8f6a306606b2698b9733e5f66cd359a7563b3d..9e036681bd0abc57a429a77198d02f726efff075"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-test",
@@ -627,11 +723,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -642,11 +738,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 32
                             ]
                         }
@@ -657,11 +753,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 23
                             ]
                         }
@@ -675,9 +771,24 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "603e16c70c2ac01320ed82cde555516397b7861a",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index 5aaf236..9f5ac64 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -1,9 +1,3 @@",
+        "-const s1 = Person{",
+        "-name: \"Frank\",",
+        "-Age: \"5 months\",",
+        "-}",
+        "-const s2 = struct{i int;}{i: 5}",
+        "-const s3 = time.Time{}",
+        " const s1 = Dog{",
+        " name: \"Frank\",",
+        " Age: \"5 months\","
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3c9c55133ad8c871ab1b2b9704781762203f8a7b"
+    "shas": "9e036681bd0abc57a429a77198d02f726efff075..0cabca264829090bbcca8324cad7d2ef6d0a4c1c"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-rest-test",
@@ -688,11 +799,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 2
                             ]
                         }
@@ -703,11 +814,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 34
                             ]
                         }
@@ -718,11 +829,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 24
                             ]
                         }
@@ -736,7 +847,19 @@
     "filePaths": [
         "struct-literals.go"
     ],
-    "sha1": "3c9c55133ad8c871ab1b2b9704781762203f8a7b",
+    "patch": [
+        "diff --git a/struct-literals.go b/struct-literals.go",
+        "index 9f5ac64..e69de29 100644",
+        "--- a/struct-literals.go",
+        "+++ b/struct-literals.go",
+        "@@ -1,6 +0,0 @@",
+        "-const s1 = Dog{",
+        "-name: \"Frank\",",
+        "-Age: \"5 months\",",
+        "-}",
+        "-const s2 = struct{i float;}{j: 6}",
+        "-const s3 = time.Month{}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "a4eb90cc8a9cbf4002ab1c646f3b965bce70cc47"
+    "shas": "0cabca264829090bbcca8324cad7d2ef6d0a4c1c..1afdfc9d2ffbe4b43ec47892c4583237f382efd2"
 }]

test/corpus/diff-summaries/go/type-assertion-expressions.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 2
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 4
                             ],
                             "end": [
-                                3,
+                                1,
                                 5
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 12
                             ]
                         }
@@ -55,9 +55,16 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "b1669d02e282b6c97db8719b314b3fc45b149496",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index e69de29..0765038 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -0,0 +1 @@",
+        "+x.(z.Person)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3eca1bc5dc05a442f328ece5d82eb5d668d0eaf7"
+    "shas": "d3f3af3265adb9413a11a3528b28667b0c70a1e2..7b6b8caa4b207c3c450f5e87744c58fb53baf8c3"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-replacement-insert-test",
@@ -66,30 +73,93 @@
             "type-assertion-expressions.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                2
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added the 'b' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'c' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                6
+                            ],
+                            "end": [
+                                1,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'Dog' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                4
+                            ],
+                            "end": [
+                                2,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'z' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                6
+                            ],
+                            "end": [
+                                2,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'Person' identifier"
                 }
             ]
         },
@@ -98,9 +168,18 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "3eca1bc5dc05a442f328ece5d82eb5d668d0eaf7",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index 0765038..56239fb 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -1 +1,3 @@",
+        "+b.(c.Dog)",
+        "+x.(z.Person)",
+        " x.(z.Person)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "18d82c20e80e8c2616e2bee249c6469ed80caf66"
+    "shas": "7b6b8caa4b207c3c450f5e87744c58fb53baf8c3..114120738b787beac6725da990d63863e4e2905b"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-insert-test",
@@ -112,21 +191,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -139,21 +218,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -166,21 +245,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     12
                                 ]
                             }
@@ -195,9 +274,19 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "18d82c20e80e8c2616e2bee249c6469ed80caf66",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index 56239fb..de94018 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -1,3 +1,3 @@",
+        "-b.(c.Dog)",
+        "+x.(z.Person)",
+        " x.(z.Person)",
+        " x.(z.Person)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f7f61458523524f9156c118a842acae8684a9fb8"
+    "shas": "114120738b787beac6725da990d63863e4e2905b..d01aada8630c1fa14c98e7c4344c6f91d0555e98"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-replacement-test",
@@ -209,21 +298,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     1
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     2
                                 ]
                             }
@@ -236,21 +325,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -263,21 +352,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     12
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -292,9 +381,19 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "f7f61458523524f9156c118a842acae8684a9fb8",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index de94018..56239fb 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -1,3 +1,3 @@",
+        "-x.(z.Person)",
+        "+b.(c.Dog)",
+        " x.(z.Person)",
+        " x.(z.Person)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "eb4314e57e567795e18580f8bad6174d71f6079e"
+    "shas": "d01aada8630c1fa14c98e7c4344c6f91d0555e98..123e6af58b082c4fb361e05c141910b0e258c557"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-replacement-test",
@@ -305,11 +404,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 2
                             ]
                         }
@@ -320,11 +419,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 4
                             ],
                             "end": [
-                                3,
+                                1,
                                 5
                             ]
                         }
@@ -335,11 +434,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -350,11 +449,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -365,11 +464,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 4
                             ],
                             "end": [
-                                4,
+                                2,
                                 5
                             ]
                         }
@@ -380,11 +479,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 12
                             ]
                         }
@@ -395,11 +494,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 2
                             ]
                         }
@@ -410,11 +509,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 4
                             ],
                             "end": [
-                                4,
+                                2,
                                 5
                             ]
                         }
@@ -425,11 +524,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 6
                             ],
                             "end": [
-                                4,
+                                2,
                                 9
                             ]
                         }
@@ -443,9 +542,19 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "eb4314e57e567795e18580f8bad6174d71f6079e",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index 56239fb..aa7c34c 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -1,3 +1,2 @@",
+        "-b.(c.Dog)",
+        "-x.(z.Person)",
+        " x.(z.Person)",
+        "+b.(c.Dog)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "0ce99c947903940b17396384f338c33a5ea5dbc7"
+    "shas": "123e6af58b082c4fb361e05c141910b0e258c557..986aa572f724e252f2bd33b8f1930f46b2b1314a"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-test",
@@ -454,30 +563,48 @@
             "type-assertion-expressions.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                2
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'x' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'z' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                6
+                            ],
+                            "end": [
+                                1,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'Person' identifier"
                 }
             ]
         },
@@ -486,9 +613,17 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "0ce99c947903940b17396384f338c33a5ea5dbc7",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index aa7c34c..093a081 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -1,2 +1 @@",
+        "-x.(z.Person)",
+        " b.(c.Dog)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "54efa88da5245a5bd75fa463c4f286849d0ce1b7"
+    "shas": "986aa572f724e252f2bd33b8f1930f46b2b1314a..3e70ca6b1cd1883b8495832c3e57983edabf55b1"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-rest-test",
@@ -499,11 +634,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 2
                             ]
                         }
@@ -514,11 +649,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 4
                             ],
                             "end": [
-                                3,
+                                1,
                                 5
                             ]
                         }
@@ -529,11 +664,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 6
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -547,7 +682,14 @@
     "filePaths": [
         "type-assertion-expressions.go"
     ],
-    "sha1": "54efa88da5245a5bd75fa463c4f286849d0ce1b7",
+    "patch": [
+        "diff --git a/type-assertion-expressions.go b/type-assertion-expressions.go",
+        "index 093a081..e69de29 100644",
+        "--- a/type-assertion-expressions.go",
+        "+++ b/type-assertion-expressions.go",
+        "@@ -1 +0,0 @@",
+        "-b.(c.Dog)"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ac77956a23a92cbf0da1aa714b566fb94d240162"
+    "shas": "3e70ca6b1cd1883b8495832c3e57983edabf55b1..693cdf76f21d015a636d4ac6c87f795ed6bd090b"
 }]

test/corpus/diff-summaries/go/type-switch-statements.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 5
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -52,11 +52,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 9
                             ],
                             "end": [
-                                6,
+                                4,
                                 12
                             ]
                         }
@@ -67,11 +67,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 5
                             ],
                             "end": [
-                                7,
+                                5,
                                 10
                             ]
                         }
@@ -85,9 +85,21 @@
     "filePaths": [
         "type-switch-statements.go"
     ],
-    "sha1": "5ed5348fda2a0c23b658e6e2a4a918d6abfd9b09",
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index e69de29..f353f0b 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -0,0 +1,6 @@",
+        "+switch e.(type) {",
+        "+  case []Person:",
+        "+    a()",
+        "+  case *Dog:",
+        "+    break",
+        "+}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "8c9e10a92d4b505bf5d75bb8d8d7f0d387cd3cd3"
+    "shas": "2de5024544064b228b54159d60307f986fdc8ee9..17bfceb9e9c2b372da22522f373195d94a74ad04"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-replacement-insert-test",
@@ -96,30 +108,153 @@
             "type-switch-statements.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    9,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                8
+                            ],
+                            "end": [
+                                1,
+                                9
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Added the 'b' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                10
+                            ],
+                            "end": [
+                                2,
+                                16
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'Person' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                5
+                            ],
+                            "end": [
+                                3,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                9
+                            ],
+                            "end": [
+                                4,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'Dog' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                5
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'break' break_statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                7,
+                                8
+                            ],
+                            "end": [
+                                7,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'e' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                8,
+                                10
+                            ],
+                            "end": [
+                                8,
+                                16
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'Person' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                9,
+                                5
+                            ],
+                            "end": [
+                                9,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                10,
+                                9
+                            ],
+                            "end": [
+                                10,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'Dog' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                11,
+                                5
+                            ],
+                            "end": [
+                                11,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'break' break_statement"
                 }
             ]
         },
@@ -128,9 +263,30 @@
     "filePaths": [
         "type-switch-statements.go"
     ],
-    "sha1": "8c9e10a92d4b505bf5d75bb8d8d7f0d387cd3cd3",
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index f353f0b..0c6eb84 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -1,3 +1,15 @@",
+        "+switch b.(type) {",
+        "+  case []Person:",
+        "+    a()",
+        "+  case *Dog:",
+        "+    break",
+        "+}",
+        "+switch e.(type) {",
+        "+  case []Person:",
+        "+    a()",
+        "+  case *Dog:",
+        "+    break",
+        "+}",
+        " switch e.(type) {",
+        "   case []Person:",
+        "     a()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7b554c76f25a54ff17905bf91c4b438d610ce906"
+    "shas": "17bfceb9e9c2b372da22522f373195d94a74ad04..90cd615275a1f4328af6280571ff5bbb5a76dcae"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-insert-test",
@@ -142,21 +298,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -171,9 +327,20 @@
     "filePaths": [
         "type-switch-statements.go"
     ],
-    "sha1": "7b554c76f25a54ff17905bf91c4b438d610ce906",
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index 0c6eb84..b373d6d 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -1,4 +1,4 @@",
+        "-switch b.(type) {",
+        "+switch e.(type) {",
+        "   case []Person:",
+        "     a()",
+        "   case *Dog:"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "aa7c10f0b81dff8ff06579226a25180862120a0b"
+    "shas": "90cd615275a1f4328af6280571ff5bbb5a76dcae..dcee63cea9925a67454e2d836792c6523da654a0"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-replacement-test",
@@ -185,21 +352,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     8
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -214,9 +381,20 @@
     "filePaths": [
         "type-switch-statements.go"
     ],
-    "sha1": "aa7c10f0b81dff8ff06579226a25180862120a0b",
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index b373d6d..0c6eb84 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -1,4 +1,4 @@",
+        "-switch e.(type) {",
+        "+switch b.(type) {",
+        "   case []Person:",
+        "     a()",
+        "   case *Dog:"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "4f512515a026daf778573a4ee70423cf19ffe392"
+    "shas": "dcee63cea9925a67454e2d836792c6523da654a0..c9b764e71359b28661197d853ccbfb0750405231"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-replacement-test",
@@ -227,11 +405,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
@@ -242,11 +420,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -257,11 +435,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 5
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -272,11 +450,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 9
                             ],
                             "end": [
-                                6,
+                                4,
                                 12
                             ]
                         }
@@ -287,11 +465,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 5
                             ],
                             "end": [
-                                7,
+                                5,
                                 10
                             ]
                         }
@@ -302,11 +480,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                9,
+                                7,
                                 8
                             ],
                             "end": [
-                                9,
+                                7,
                                 9
                             ]
                         }
@@ -317,11 +495,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                10,
+                                8,
                                 10
                             ],
                             "end": [
-                                10,
+                                8,
                                 16
                             ]
                         }
@@ -332,11 +510,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                11,
+                                9,
                                 5
                             ],
                             "end": [
-                                11,
+                                9,
                                 8
                             ]
                         }
@@ -347,11 +525,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                12,
+                                10,
                                 9
                             ],
                             "end": [
-                                12,
+                                10,
                                 12
                             ]
                         }
@@ -362,11 +540,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                13,
+                                11,
                                 5
                             ],
                             "end": [
-                                13,
+                                11,
                                 10
                             ]
                         }
@@ -377,11 +555,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                9,
+                                7,
                                 8
                             ],
                             "end": [
-                                9,
+                                7,
                                 9
                             ]
                         }
@@ -392,11 +570,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                10,
+                                8,
                                 10
                             ],
                             "end": [
-                                10,
+                                8,
                                 16
                             ]
                         }
@@ -407,11 +585,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                11,
+                                9,
                                 5
                             ],
                             "end": [
-                                11,
+                                9,
                                 8
                             ]
                         }
@@ -422,11 +600,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                12,
+                                10,
                                 9
                             ],
                             "end": [
-                                12,
+                                10,
                                 12
                             ]
                         }
@@ -437,11 +615,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                13,
+                                11,
                                 5
                             ],
                             "end": [
-                                13,
+                                11,
                                 10
                             ]
                         }
@@ -455,55 +633,35 @@
     "filePaths": [
         "type-switch-statements.go"
     ],
-    "sha1": "4f512515a026daf778573a4ee70423cf19ffe392",
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index 0c6eb84..64567d6 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -1,16 +1,10 @@",
+        "-switch b.(type) {",
+        "-  case []Person:",
+        "-    a()",
+        "-  case *Dog:",
+        "-    break",
+        "-}",
+        " switch e.(type) {",
+        "   case []Person:",
+        "     a()",
+        "   case *Dog:",
+        "     break",
+        " }",
+        "-switch e.(type) {",
+        "+switch b.(type) {",
+        "   case []Person:",
+        "     a()",
+        "   case *Dog:"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "94f94a0f60ffe393994e557cfc35fdda7e350d09"
+    "shas": "c9b764e71359b28661197d853ccbfb0750405231..1021943f2594b7cd8c977fd0e6cef06c34bd4d70"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-test",
-    "expectedResult": {
-        "changes": {
-            "type-switch-statements.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    9,
-                                    1
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'main' module with the 'main' module"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "type-switch-statements.go"
-    ],
-    "sha1": "94f94a0f60ffe393994e557cfc35fdda7e350d09",
-    "gitDir": "test/corpus/repos/go",
-    "sha2": "aa78c757ce8c988cc95998bfc375aadda963b79d"
-}
-,{
-    "testCaseDescription": "go-type-switch-statements-delete-rest-test",
     "expectedResult": {
         "changes": {
             "type-switch-statements.go": [
@@ -511,26 +669,26 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 8
                             ],
                             "end": [
-                                3,
+                                1,
                                 9
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' identifier"
+                    "summary": "Deleted the 'e' identifier"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 10
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -541,11 +699,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 5
                             ],
                             "end": [
-                                5,
+                                3,
                                 8
                             ]
                         }
@@ -556,11 +714,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 9
                             ],
                             "end": [
-                                6,
+                                4,
                                 12
                             ]
                         }
@@ -571,11 +729,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 5
                             ],
                             "end": [
-                                7,
+                                5,
                                 10
                             ]
                         }
@@ -589,7 +747,125 @@
     "filePaths": [
         "type-switch-statements.go"
     ],
-    "sha1": "aa78c757ce8c988cc95998bfc375aadda963b79d",
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index 64567d6..047534a 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -1,9 +1,3 @@",
+        "-switch e.(type) {",
+        "-  case []Person:",
+        "-    a()",
+        "-  case *Dog:",
+        "-    break",
+        "-}",
+        " switch b.(type) {",
+        "   case []Person:",
+        "     a()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "55c9268038cdb6e46dd211683ac12b462f9e590f"
+    "shas": "1021943f2594b7cd8c977fd0e6cef06c34bd4d70..501f3e52ab12fac877cd58fa6631284d8c7480ff"
+}
+,{
+    "testCaseDescription": "go-type-switch-statements-delete-rest-test",
+    "expectedResult": {
+        "changes": {
+            "type-switch-statements.go": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                8
+                            ],
+                            "end": [
+                                1,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'b' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                10
+                            ],
+                            "end": [
+                                2,
+                                16
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'Person' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                5
+                            ],
+                            "end": [
+                                3,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a()' function call"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                9
+                            ],
+                            "end": [
+                                4,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'Dog' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                5
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'break' break_statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "type-switch-statements.go"
+    ],
+    "patch": [
+        "diff --git a/type-switch-statements.go b/type-switch-statements.go",
+        "index 047534a..e69de29 100644",
+        "--- a/type-switch-statements.go",
+        "+++ b/type-switch-statements.go",
+        "@@ -1,6 +0,0 @@",
+        "-switch b.(type) {",
+        "-  case []Person:",
+        "-    a()",
+        "-  case *Dog:",
+        "-    break",
+        "-}"
+    ],
+    "gitDir": "test/corpus/repos/go",
+    "shas": "501f3e52ab12fac877cd58fa6631284d8c7480ff..e544e711890744c45f9b49604be9c175422f7e15"
 }]

test/corpus/diff-summaries/go/unary-expressions.json

@@ -1,48 +1,5 @@
 [{
     "testCaseDescription": "go-unary-expressions-insert-test",
-    "expectedResult": {
-        "changes": {
-            "unary-expressions.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'main' module with the 'main' module"
-                }
-            ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "unary-expressions.go"
-    ],
-    "sha1": "423c95c361986c8807246777d0d1f5dd0602c5d7",
-    "gitDir": "test/corpus/repos/go",
-    "sha2": "12de993f257bdb9907574b17ef26c69eea4cecaa"
-}
-,{
-    "testCaseDescription": "go-unary-expressions-replacement-insert-test",
     "expectedResult": {
         "changes": {
             "unary-expressions.go": [
@@ -50,41 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 4
                             ],
                             "end": [
-                                3,
-                                5
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'b' identifier"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                4,
-                                1
-                            ],
-                            "end": [
-                                4,
-                                7
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'identifier()' function call"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                4
-                            ],
-                            "end": [
-                                5,
+                                1,
                                 5
                             ]
                         }
@@ -95,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                2,
                                 1
                             ],
                             "end": [
-                                6,
+                                2,
                                 7
                             ]
                         }
@@ -113,9 +40,105 @@
     "filePaths": [
         "unary-expressions.go"
     ],
-    "sha1": "12de993f257bdb9907574b17ef26c69eea4cecaa",
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index e69de29..858c09a 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -0,0 +1,2 @@",
+        "+!<-a",
+        "+*foo()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "11145f78213cf405aad0a5d1324d6b806d3f472a"
+    "shas": "42975c2ba57995b8cc4cfe30c7599c673970dd25..383857c1c2527b50055c4dfe90fb44b26bf0fefa"
+}
+,{
+    "testCaseDescription": "go-unary-expressions-replacement-insert-test",
+    "expectedResult": {
+        "changes": {
+            "unary-expressions.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'b' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                4
+                            ],
+                            "end": [
+                                3,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier()' function call"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "unary-expressions.go"
+    ],
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index 858c09a..0b42f98 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -1,2 +1,6 @@",
+        "+!<-b",
+        "+*bar()",
+        "+!<-a",
+        "+*foo()",
+        " !<-a",
+        " *foo()"
+    ],
+    "gitDir": "test/corpus/repos/go",
+    "shas": "383857c1c2527b50055c4dfe90fb44b26bf0fefa..9312cbe74e464febaa3f93fb1b2adf7011d1b95b"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-insert-test",
@@ -127,21 +150,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -154,21 +177,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             }
@@ -183,9 +206,22 @@
     "filePaths": [
         "unary-expressions.go"
     ],
-    "sha1": "11145f78213cf405aad0a5d1324d6b806d3f472a",
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index 0b42f98..25afb46 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -1,5 +1,5 @@",
+        "-!<-b",
+        "-*bar()",
+        "+!<-a",
+        "+*foo()",
+        " !<-a",
+        " *foo()",
+        " !<-a"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "fe320d2bd5724dc92c3702ebef1e3be53cf629d9"
+    "shas": "9312cbe74e464febaa3f93fb1b2adf7011d1b95b..57ec8fc14e1e8a6d8634011258174e08068a4198"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-replacement-test",
@@ -197,21 +233,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     4
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     5
                                 ]
                             }
@@ -224,21 +260,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     2
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     5
                                 ]
                             }
@@ -253,9 +289,22 @@
     "filePaths": [
         "unary-expressions.go"
     ],
-    "sha1": "fe320d2bd5724dc92c3702ebef1e3be53cf629d9",
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index 25afb46..0b42f98 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -1,5 +1,5 @@",
+        "-!<-a",
+        "-*foo()",
+        "+!<-b",
+        "+*bar()",
+        " !<-a",
+        " *foo()",
+        " !<-a"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f4b3902991f22998eca4acc15dc987b62176c418"
+    "shas": "57ec8fc14e1e8a6d8634011258174e08068a4198..c8e2c9b5af896f4b2a72cc9862c60df9a1b65aa4"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-replacement-test",
@@ -266,11 +315,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 4
                             ],
                             "end": [
-                                3,
+                                1,
                                 5
                             ]
                         }
@@ -281,11 +330,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -296,11 +345,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 4
                             ],
                             "end": [
-                                5,
+                                3,
                                 5
                             ]
                         }
@@ -311,11 +360,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 7
                             ]
                         }
@@ -326,11 +375,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 4
                             ],
                             "end": [
-                                5,
+                                3,
                                 5
                             ]
                         }
@@ -341,11 +390,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 7
                             ]
                         }
@@ -359,9 +408,23 @@
     "filePaths": [
         "unary-expressions.go"
     ],
-    "sha1": "f4b3902991f22998eca4acc15dc987b62176c418",
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index 0b42f98..812fb68 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -1,6 +1,4 @@",
+        "-!<-b",
+        "-*bar()",
+        "-!<-a",
+        "-*foo()",
+        " !<-a",
+        " *foo()",
+        "+!<-b",
+        "+*bar()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3df238d0afc9c08d06ebe067685ec879aaab33a8"
+    "shas": "c8e2c9b5af896f4b2a72cc9862c60df9a1b65aa4..f3aa65ee6692f5aa37c6f8e6a01d2093e27999a0"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-test",
@@ -372,11 +435,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 4
                             ],
                             "end": [
-                                3,
+                                1,
                                 5
                             ]
                         }
@@ -387,11 +450,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 7
                             ]
                         }
@@ -405,9 +468,19 @@
     "filePaths": [
         "unary-expressions.go"
     ],
-    "sha1": "3df238d0afc9c08d06ebe067685ec879aaab33a8",
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index 812fb68..6da661d 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -1,4 +1,2 @@",
+        "-!<-a",
+        "-*foo()",
+        " !<-b",
+        " *bar()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "8d525b8c16c2b71695c639ccd70ee8a054da5f9f"
+    "shas": "f3aa65ee6692f5aa37c6f8e6a01d2093e27999a0..da09442b50bcb67001af1f6599a2d2cd37c86907"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-rest-test",
@@ -416,30 +489,33 @@
             "unary-expressions.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    1,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    1
-                                ],
-                                "end": [
-                                    3,
-                                    1
-                                ]
-                            }
-                        ]
+                        "delete": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Deleted the 'b' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'identifier()' function call"
                 }
             ]
         },
@@ -448,7 +524,15 @@
     "filePaths": [
         "unary-expressions.go"
     ],
-    "sha1": "8d525b8c16c2b71695c639ccd70ee8a054da5f9f",
+    "patch": [
+        "diff --git a/unary-expressions.go b/unary-expressions.go",
+        "index 6da661d..e69de29 100644",
+        "--- a/unary-expressions.go",
+        "+++ b/unary-expressions.go",
+        "@@ -1,2 +0,0 @@",
+        "-!<-b",
+        "-*bar()"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c084d45f7de68c3a9328f11b1ff483ad5260f06e"
+    "shas": "da09442b50bcb67001af1f6599a2d2cd37c86907..b3266e749035509bbbd882ef5e2d3ad93c3c60bf"
 }]

test/corpus/diff-summaries/go/var-declarations-with-no-expressions.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -55,9 +55,17 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "70ce013ae911ea6eada76f2e5739baddcd04613f",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index e69de29..f156385 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -0,0 +1,2 @@",
+        "+var zero int",
+        "+var one, two uint64"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "cc1f8ac20228e18260eb8d54b2ba0ed54bb74630"
+    "shas": "a2b3bd32a19f7f76f1536197e193b8699b844991..a2b836d16d1c5f0e706cd50d82e0f04a5fb91a7a"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-replacement-insert-test",
@@ -68,11 +76,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -83,11 +91,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -98,11 +106,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -113,11 +121,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 13
                             ]
                         }
@@ -128,11 +136,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 20
                             ]
                         }
@@ -143,11 +151,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 20
                             ]
                         }
@@ -161,9 +169,21 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "cc1f8ac20228e18260eb8d54b2ba0ed54bb74630",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index f156385..f696db9 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -1,2 +1,6 @@",
+        "+var a int",
+        "+var b, c uint64",
+        "+var zero int",
+        "+var one, two uint64",
+        " var zero int",
+        " var one, two uint64"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "c0b885c04fe0c5033537181739830e44d9c3575d"
+    "shas": "a2b836d16d1c5f0e706cd50d82e0f04a5fb91a7a..de01c957dd54df2dd44c5e7c32b524ab0e5ae288"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-insert-test",
@@ -175,21 +195,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
@@ -202,21 +222,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
@@ -229,21 +249,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     8
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             }
@@ -258,9 +278,22 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "c0b885c04fe0c5033537181739830e44d9c3575d",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index f696db9..e5e3183 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -1,5 +1,5 @@",
+        "-var a int",
+        "-var b, c uint64",
+        "+var zero int",
+        "+var one, two uint64",
+        " var zero int",
+        " var one, two uint64",
+        " var zero int"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "ac406800d15885c84b561071d4dfc6df4a0d4d64"
+    "shas": "de01c957dd54df2dd44c5e7c32b524ab0e5ae288..ec8bb1e3302da7a2a19ced73e7de72165c0bc5cc"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-replacement-test",
@@ -272,21 +305,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             }
@@ -299,21 +332,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     6
                                 ]
                             }
@@ -326,21 +359,21 @@
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     8
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     9
                                 ]
                             }
@@ -355,9 +388,22 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "ac406800d15885c84b561071d4dfc6df4a0d4d64",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index e5e3183..f696db9 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -1,5 +1,5 @@",
+        "-var zero int",
+        "-var one, two uint64",
+        "+var a int",
+        "+var b, c uint64",
+        " var zero int",
+        " var one, two uint64",
+        " var zero int"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "21e30df645b4718de28a23a53812adeff14ec120"
+    "shas": "ec8bb1e3302da7a2a19ced73e7de72165c0bc5cc..abc39ff623686b60f6dfb97f81a22bc99616fc32"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-replacement-test",
@@ -368,11 +414,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -383,11 +429,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -398,11 +444,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -413,11 +459,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 13
                             ]
                         }
@@ -428,11 +474,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 20
                             ]
                         }
@@ -443,11 +489,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 20
                             ]
                         }
@@ -458,11 +504,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 10
                             ]
                         }
@@ -473,11 +519,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 16
                             ]
                         }
@@ -488,11 +534,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 16
                             ]
                         }
@@ -506,9 +552,23 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "21e30df645b4718de28a23a53812adeff14ec120",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index f696db9..137ee10 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -1,6 +1,4 @@",
+        "-var a int",
+        "-var b, c uint64",
+        "-var zero int",
+        "-var one, two uint64",
+        " var zero int",
+        " var one, two uint64",
+        "+var a int",
+        "+var b, c uint64"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7f979d33c8675dcf2060cca3ee72e2f3df901e76"
+    "shas": "abc39ff623686b60f6dfb97f81a22bc99616fc32..ca2096e1754ebad8a421c0aec68b934eb6fe5946"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-test",
@@ -519,11 +579,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -534,11 +594,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -549,11 +609,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -567,9 +627,19 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "7f979d33c8675dcf2060cca3ee72e2f3df901e76",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index 137ee10..443ec9e 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -1,4 +1,2 @@",
+        "-var zero int",
+        "-var one, two uint64",
+        " var a int",
+        " var b, c uint64"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5e63095f508ef9950f3ea36b9db98288c0a0b736"
+    "shas": "ca2096e1754ebad8a421c0aec68b934eb6fe5946..7cde9f681f73bc4b0fe063954142d9aac568b776"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-rest-test",
@@ -580,11 +650,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 10
                             ]
                         }
@@ -595,11 +665,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -610,11 +680,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 16
                             ]
                         }
@@ -628,7 +698,15 @@
     "filePaths": [
         "var-declarations-with-no-expressions.go"
     ],
-    "sha1": "5e63095f508ef9950f3ea36b9db98288c0a0b736",
+    "patch": [
+        "diff --git a/var-declarations-with-no-expressions.go b/var-declarations-with-no-expressions.go",
+        "index 443ec9e..e69de29 100644",
+        "--- a/var-declarations-with-no-expressions.go",
+        "+++ b/var-declarations-with-no-expressions.go",
+        "@@ -1,2 +0,0 @@",
+        "-var a int",
+        "-var b, c uint64"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "3f6fa7c6f499951a277e9ae6edce3681134ef5d9"
+    "shas": "7cde9f681f73bc4b0fe063954142d9aac568b776..7ec7378727f160ff6fb78761d149f5f110898c3e"
 }]

test/corpus/diff-summaries/go/var-declarations-with-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 17
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 27
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 27
                             ]
                         }
@@ -55,9 +55,17 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "560d069610442142d3191d7af8ea8e1a2ebfb6ca",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index e69de29..7fa0f78 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -0,0 +1,2 @@",
+        "+var zero int = 0",
+        "+var one, two uint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "d2c92ac70f8e73adf099bc0e290820d6eb845995"
+    "shas": "e8cad3a47721767f585896752477a07578a6ae45..5b28fe9002c6b7f4d200b92c3c4bed53f4c52999"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-replacement-insert-test",
@@ -68,11 +76,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -83,11 +91,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 2
                             ],
                             "end": [
-                                4,
+                                2,
                                 24
                             ]
                         }
@@ -98,11 +106,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 2
                             ],
                             "end": [
-                                4,
+                                2,
                                 24
                             ]
                         }
@@ -113,11 +121,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 17
                             ]
                         }
@@ -128,11 +136,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 27
                             ]
                         }
@@ -143,11 +151,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 27
                             ]
                         }
@@ -161,9 +169,21 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "d2c92ac70f8e73adf099bc0e290820d6eb845995",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index 7fa0f78..bf0a293 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -1,2 +1,6 @@",
+        "+var a int = 0",
+        "+ var b, c uint64 = 1, 2",
+        "+var zero int = 0",
+        "+var one, two uint64 = 1, 2",
+        " var zero int = 0",
+        " var one, two uint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "152f26eaa12a8990773283c45ad83d581f49f6ac"
+    "shas": "5b28fe9002c6b7f4d200b92c3c4bed53f4c52999..9a2b636002071173ed229f3479690cdcb6340b2b"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-insert-test",
@@ -175,81 +195,81 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero variable of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     7
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the one variable of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the one variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     9
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     10
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the two variable of the 'main' module"
+                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the two variable"
                 }
             ]
         },
@@ -258,9 +278,22 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "152f26eaa12a8990773283c45ad83d581f49f6ac",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index bf0a293..cba22b9 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -1,5 +1,5 @@",
+        "-var a int = 0",
+        "- var b, c uint64 = 1, 2",
+        "+var zero int = 0",
+        "+var one, two uint64 = 1, 2",
+        " var zero int = 0",
+        " var one, two uint64 = 1, 2",
+        " var zero int = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "9c15c981626ece122958d534391d1cd11500823f"
+    "shas": "9a2b636002071173ed229f3479690cdcb6340b2b..2e8341b5c732a5cee90db221775545f69821fa61"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-replacement-test",
@@ -272,81 +305,81 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     6
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a variable of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     5
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     7
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the b variable of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the b variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     10
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     9
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     10
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the c variable of the 'main' module"
+                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the c variable"
                 }
             ]
         },
@@ -355,9 +388,22 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "9c15c981626ece122958d534391d1cd11500823f",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index cba22b9..bf0a293 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -1,5 +1,5 @@",
+        "-var zero int = 0",
+        "-var one, two uint64 = 1, 2",
+        "+var a int = 0",
+        "+ var b, c uint64 = 1, 2",
+        " var zero int = 0",
+        " var one, two uint64 = 1, 2",
+        " var zero int = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "cefe840a6a8540095390d13aa58ea3124dbda0fc"
+    "shas": "2e8341b5c732a5cee90db221775545f69821fa61..324bbd99a82f7bd7b4d6015f3b6d344f39fb1b25"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-replacement-test",
@@ -368,11 +414,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -383,11 +429,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 2
                             ],
                             "end": [
-                                4,
+                                2,
                                 24
                             ]
                         }
@@ -398,11 +444,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 2
                             ],
                             "end": [
-                                4,
+                                2,
                                 24
                             ]
                         }
@@ -413,11 +459,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 17
                             ]
                         }
@@ -428,11 +474,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 27
                             ]
                         }
@@ -443,11 +489,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 27
                             ]
                         }
@@ -458,11 +504,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 14
                             ]
                         }
@@ -473,11 +519,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 2
                             ],
                             "end": [
-                                6,
+                                4,
                                 24
                             ]
                         }
@@ -488,11 +534,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 2
                             ],
                             "end": [
-                                6,
+                                4,
                                 24
                             ]
                         }
@@ -506,9 +552,23 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "cefe840a6a8540095390d13aa58ea3124dbda0fc",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index bf0a293..bd11fef 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -1,6 +1,4 @@",
+        "-var a int = 0",
+        "- var b, c uint64 = 1, 2",
+        "-var zero int = 0",
+        "-var one, two uint64 = 1, 2",
+        " var zero int = 0",
+        " var one, two uint64 = 1, 2",
+        "+var a int = 0",
+        "+ var b, c uint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7611c6e70f70c76bb7d56d3996937b80c11e0ab4"
+    "shas": "324bbd99a82f7bd7b4d6015f3b6d344f39fb1b25..6864d4222bcdf5c352c42623d77a94fc8aa74a5b"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-test",
@@ -519,11 +579,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 17
                             ]
                         }
@@ -534,11 +594,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 27
                             ]
                         }
@@ -549,11 +609,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 27
                             ]
                         }
@@ -567,9 +627,19 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "7611c6e70f70c76bb7d56d3996937b80c11e0ab4",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index bd11fef..6e0b7e7 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -1,4 +1,2 @@",
+        "-var zero int = 0",
+        "-var one, two uint64 = 1, 2",
+        " var a int = 0",
+        "  var b, c uint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "94b59191a5053d07a4fd33841213f6ee78ee13bf"
+    "shas": "6864d4222bcdf5c352c42623d77a94fc8aa74a5b..61b82a1db7b24aa0535c03fd7f41164e89045d27"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-rest-test",
@@ -580,11 +650,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 14
                             ]
                         }
@@ -595,11 +665,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 2
                             ],
                             "end": [
-                                4,
+                                2,
                                 24
                             ]
                         }
@@ -610,11 +680,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 2
                             ],
                             "end": [
-                                4,
+                                2,
                                 24
                             ]
                         }
@@ -628,7 +698,15 @@
     "filePaths": [
         "var-declarations-with-types.go"
     ],
-    "sha1": "94b59191a5053d07a4fd33841213f6ee78ee13bf",
+    "patch": [
+        "diff --git a/var-declarations-with-types.go b/var-declarations-with-types.go",
+        "index 6e0b7e7..e69de29 100644",
+        "--- a/var-declarations-with-types.go",
+        "+++ b/var-declarations-with-types.go",
+        "@@ -1,2 +0,0 @@",
+        "-var a int = 0",
+        "- var b, c uint64 = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "70ce013ae911ea6eada76f2e5739baddcd04613f"
+    "shas": "61b82a1db7b24aa0535c03fd7f41164e89045d27..a2b3bd32a19f7f76f1536197e193b8699b844991"
 }]

test/corpus/diff-summaries/go/var-declarations-without-types.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -25,9 +25,16 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "45b551f3f778995db1cbc9c4f64fc2a76995f41e",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index e69de29..8c7993a 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -0,0 +1 @@",
+        "+var zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "6aa89fd9d53f9b40aebc5975b8a727d9a21b180b"
+    "shas": "95f53bbe92bd5841e140af869c4f35cb74379028..52b1ec2c1e475877223a656dd96d72fdb804f91a"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-replacement-insert-test",
@@ -38,11 +45,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -53,11 +60,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -68,11 +75,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -86,9 +93,18 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "6aa89fd9d53f9b40aebc5975b8a727d9a21b180b",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index 8c7993a..80fe8ba 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -1 +1,3 @@",
+        "+var one, two = 1, 2",
+        "+var zero = 0",
+        " var zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "7c9ca82a0940fbb2d8545cf5bb423211cdc6bc5e"
+    "shas": "52b1ec2c1e475877223a656dd96d72fdb804f91a..fe75b1bdfc43772e3d24948192fc07e698745980"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-insert-test",
@@ -100,64 +116,64 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero variable of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     16
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     17
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     13
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '0' in the zero variable of the 'main' module"
+                    "summary": "Replaced '1' with '0' in the zero variable"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -171,9 +187,19 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "7c9ca82a0940fbb2d8545cf5bb423211cdc6bc5e",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index 80fe8ba..c4df5f9 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-var one, two = 1, 2",
+        "+var zero = 0",
+        " var zero = 0",
+        " var zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e26bf19b3efa7ad66570dd9ba9a4b5dea2a06487"
+    "shas": "fe75b1bdfc43772e3d24948192fc07e698745980..35cb02da912d11d0f08767f9473f097b940abd00"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-replacement-test",
@@ -185,64 +211,64 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     9
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     5
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one variable of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one variable"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     12
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     13
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     16
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     17
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced '0' with '1' in the one variable of the 'main' module"
+                    "summary": "Replaced '0' with '1' in the one variable"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -256,9 +282,19 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "e26bf19b3efa7ad66570dd9ba9a4b5dea2a06487",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index c4df5f9..80fe8ba 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -1,3 +1,3 @@",
+        "-var zero = 0",
+        "+var one, two = 1, 2",
+        " var zero = 0",
+        " var zero = 0"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "38532e82f3d975ef8fd20cb67547ad4141a4aa36"
+    "shas": "35cb02da912d11d0f08767f9473f097b940abd00..eb7d7dcbf668189e8a180beda45aa6bbcbeb817d"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-replacement-test",
@@ -269,11 +305,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -284,11 +320,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -299,11 +335,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 13
                             ]
                         }
@@ -314,11 +350,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -329,11 +365,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 20
                             ]
                         }
@@ -347,9 +383,19 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "38532e82f3d975ef8fd20cb67547ad4141a4aa36",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index 80fe8ba..0d0b543 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -1,3 +1,2 @@",
+        "-var one, two = 1, 2",
+        "-var zero = 0",
+        " var zero = 0",
+        "+var one, two = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5cc9846fff4ba05c5be09b9a8c110b587bd8b62c"
+    "shas": "eb7d7dcbf668189e8a180beda45aa6bbcbeb817d..ab6d3f53b7dda2803a06b9ea08447a5ff7a3ae54"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-test",
@@ -360,11 +406,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 13
                             ]
                         }
@@ -378,9 +424,17 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "5cc9846fff4ba05c5be09b9a8c110b587bd8b62c",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index 0d0b543..c4a6ab5 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -1,2 +1 @@",
+        "-var zero = 0",
+        " var one, two = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "2a85e7f986b54fc05cac2eb26b0f40847c04b903"
+    "shas": "ab6d3f53b7dda2803a06b9ea08447a5ff7a3ae54..ba8ea109550f5ea74bcca7e3856ddb339611f0de"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-rest-test",
@@ -391,11 +445,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -406,11 +460,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 20
                             ]
                         }
@@ -424,7 +478,14 @@
     "filePaths": [
         "var-declarations-without-types.go"
     ],
-    "sha1": "2a85e7f986b54fc05cac2eb26b0f40847c04b903",
+    "patch": [
+        "diff --git a/var-declarations-without-types.go b/var-declarations-without-types.go",
+        "index c4a6ab5..e69de29 100644",
+        "--- a/var-declarations-without-types.go",
+        "+++ b/var-declarations-without-types.go",
+        "@@ -1 +0,0 @@",
+        "-var one, two = 1, 2"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "560d069610442142d3191d7af8ea8e1a2ebfb6ca"
+    "shas": "ba8ea109550f5ea74bcca7e3856ddb339611f0de..e8cad3a47721767f585896752477a07578a6ae45"
 }]

test/corpus/diff-summaries/go/variadic-function-declarations.json

@@ -7,11 +7,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -22,11 +22,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -37,11 +37,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 23
                             ]
                         }
@@ -55,9 +55,18 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "1011eae016159133bb9b3305fa29900aa6f06827",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index e69de29..e9d461f 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -0,0 +1,3 @@",
+        "+func f1(a ...*int) {}",
+        "+func f2(...int) {}",
+        "+func f3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "55231bf51a6d46385791a80a387bba6b481cce3a"
+    "shas": "256c131008b104fa15d57c0f3ff56131c11337fe..b6ef32833f1cf331e26caedfd359c593f9b370b9"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-replacement-insert-test",
@@ -68,11 +77,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -83,11 +92,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -98,11 +107,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 23
                             ]
                         }
@@ -113,11 +122,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 22
                             ]
                         }
@@ -128,11 +137,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 19
                             ]
                         }
@@ -143,11 +152,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 23
                             ]
                         }
@@ -161,9 +170,24 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "55231bf51a6d46385791a80a387bba6b481cce3a",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index e9d461f..1e4f816 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -1,3 +1,9 @@",
+        "+func g1(a ...*int) {}",
+        "+func g2(...int) {}",
+        "+func g3(a, ...bool) {}",
+        "+func f1(a ...*int) {}",
+        "+func f2(...int) {}",
+        "+func f3(a, ...bool) {}",
+        " func f1(a ...*int) {}",
+        " func f2(...int) {}",
+        " func f3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f61b087e33996e9582f497ed495b150158b0030f"
+    "shas": "b6ef32833f1cf331e26caedfd359c593f9b370b9..ef0f85884738262f219743f46d645a73d12f5b99"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-insert-test",
@@ -175,81 +199,81 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the f1 function of the 'main' module"
+                    "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the f1 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g2' identifier with the 'f2' identifier in the f2 function of the 'main' module"
+                    "summary": "Replaced the 'g2' identifier with the 'f2' identifier in the f2 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g3' identifier with the 'f3' identifier in the f3 function of the 'main' module"
+                    "summary": "Replaced the 'g3' identifier with the 'f3' identifier in the f3 function"
                 }
             ]
         },
@@ -258,9 +282,24 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "f61b087e33996e9582f497ed495b150158b0030f",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index 1e4f816..3198ec6 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        "-func g1(a ...*int) {}",
+        "-func g2(...int) {}",
+        "-func g3(a, ...bool) {}",
+        "+func f1(a ...*int) {}",
+        "+func f2(...int) {}",
+        "+func f3(a, ...bool) {}",
+        " func f1(a ...*int) {}",
+        " func f2(...int) {}",
+        " func f3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "b6501ace5d04c639c61e4600f543ec61a1557b1b"
+    "shas": "ef0f85884738262f219743f46d645a73d12f5b99..6920ba9ae6296e24e09e55ea342020521f5443b7"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-replacement-test",
@@ -272,81 +311,81 @@
                         "replace": [
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    3,
+                                    1,
                                     6
                                 ],
                                 "end": [
-                                    3,
+                                    1,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the g1 function of the 'main' module"
+                    "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the g1 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    4,
+                                    2,
                                     6
                                 ],
                                 "end": [
-                                    4,
+                                    2,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f2' identifier with the 'g2' identifier in the g2 function of the 'main' module"
+                    "summary": "Replaced the 'f2' identifier with the 'g2' identifier in the g2 function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             },
                             {
                                 "start": [
-                                    5,
+                                    3,
                                     6
                                 ],
                                 "end": [
-                                    5,
+                                    3,
                                     8
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f3' identifier with the 'g3' identifier in the g3 function of the 'main' module"
+                    "summary": "Replaced the 'f3' identifier with the 'g3' identifier in the g3 function"
                 }
             ]
         },
@@ -355,9 +394,24 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "b6501ace5d04c639c61e4600f543ec61a1557b1b",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index 3198ec6..1e4f816 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -1,6 +1,6 @@",
+        "-func f1(a ...*int) {}",
+        "-func f2(...int) {}",
+        "-func f3(a, ...bool) {}",
+        "+func g1(a ...*int) {}",
+        "+func g2(...int) {}",
+        "+func g3(a, ...bool) {}",
+        " func f1(a ...*int) {}",
+        " func f2(...int) {}",
+        " func f3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "5c6438d74774c5505b9710c5095be94697ab5fdc"
+    "shas": "6920ba9ae6296e24e09e55ea342020521f5443b7..ffa8638d6bc29fe639cc3a3bdcb94d61b5c35336"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-replacement-test",
@@ -368,11 +422,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -383,11 +437,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -398,11 +452,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 23
                             ]
                         }
@@ -413,11 +467,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 22
                             ]
                         }
@@ -428,11 +482,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 19
                             ]
                         }
@@ -443,11 +497,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 23
                             ]
                         }
@@ -458,11 +512,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                4,
                                 1
                             ],
                             "end": [
-                                6,
+                                4,
                                 22
                             ]
                         }
@@ -473,11 +527,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                7,
+                                5,
                                 1
                             ],
                             "end": [
-                                7,
+                                5,
                                 19
                             ]
                         }
@@ -488,11 +542,11 @@
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                6,
                                 1
                             ],
                             "end": [
-                                8,
+                                6,
                                 23
                             ]
                         }
@@ -506,9 +560,27 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "5c6438d74774c5505b9710c5095be94697ab5fdc",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index 1e4f816..99d1e54 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -1,9 +1,6 @@",
+        "-func g1(a ...*int) {}",
+        "-func g2(...int) {}",
+        "-func g3(a, ...bool) {}",
+        "-func f1(a ...*int) {}",
+        "-func f2(...int) {}",
+        "-func f3(a, ...bool) {}",
+        " func f1(a ...*int) {}",
+        " func f2(...int) {}",
+        " func f3(a, ...bool) {}",
+        "+func g1(a ...*int) {}",
+        "+func g2(...int) {}",
+        "+func g3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "e9c290c1f1bfc40557b2a947889eacec12be44fc"
+    "shas": "ffa8638d6bc29fe639cc3a3bdcb94d61b5c35336..724f49666d07410a3e8ec439bb133609ed92d2aa"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-test",
@@ -519,11 +591,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -534,11 +606,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -549,11 +621,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 23
                             ]
                         }
@@ -567,9 +639,21 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "e9c290c1f1bfc40557b2a947889eacec12be44fc",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index 99d1e54..4a0a10b 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -1,6 +1,3 @@",
+        "-func f1(a ...*int) {}",
+        "-func f2(...int) {}",
+        "-func f3(a, ...bool) {}",
+        " func g1(a ...*int) {}",
+        " func g2(...int) {}",
+        " func g3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "f13f83e149b557f9ae2a7d43a03f1bfb49bbcedd"
+    "shas": "724f49666d07410a3e8ec439bb133609ed92d2aa..6d26c7b498f60c3ccc84002c96dc08b024d685c7"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-rest-test",
@@ -580,11 +664,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                3,
+                                1,
                                 1
                             ],
                             "end": [
-                                3,
+                                1,
                                 22
                             ]
                         }
@@ -595,11 +679,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
+                                2,
                                 1
                             ],
                             "end": [
-                                4,
+                                2,
                                 19
                             ]
                         }
@@ -610,11 +694,11 @@
                     "span": {
                         "delete": {
                             "start": [
-                                5,
+                                3,
                                 1
                             ],
                             "end": [
-                                5,
+                                3,
                                 23
                             ]
                         }
@@ -628,7 +712,16 @@
     "filePaths": [
         "variadic-function-declarations.go"
     ],
-    "sha1": "f13f83e149b557f9ae2a7d43a03f1bfb49bbcedd",
+    "patch": [
+        "diff --git a/variadic-function-declarations.go b/variadic-function-declarations.go",
+        "index 4a0a10b..e69de29 100644",
+        "--- a/variadic-function-declarations.go",
+        "+++ b/variadic-function-declarations.go",
+        "@@ -1,3 +0,0 @@",
+        "-func g1(a ...*int) {}",
+        "-func g2(...int) {}",
+        "-func g3(a, ...bool) {}"
+    ],
     "gitDir": "test/corpus/repos/go",
-    "sha2": "cbfe90e40b3f1a5f8f1a76f1e2b9dbebe28783ee"
+    "shas": "6d26c7b498f60c3ccc84002c96dc08b024d685c7..d533fb4333ed523cd36d6f2bb4f1c31eb61596f1"
 }]

test/corpus/diff-summaries/javascript/anonymous-function.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "c3ba4a1505773022c8c9750803b2f78c821f80a1",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index e69de29..b592868 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -0,0 +1 @@",
+        "+function(a,b) { return a + b; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b5bdaebe1a62c35afbab412c48b69be687db7d09"
+    "shas": "5f4dfa791577127cebc7f5fa8c7d94b7427980f3..2e9eda4d95ac6cbdd16de3ad1464523de63ffb44"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "b5bdaebe1a62c35afbab412c48b69be687db7d09",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index b592868..e1de356 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -1 +1,3 @@",
+        "+function(b,c) { return b * c; }",
+        "+function(a,b) { return a + b; }",
+        " function(a,b) { return a + b; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "79300c371f63ca7d92884cf2e4cb676518313a20"
+    "shas": "2e9eda4d95ac6cbdd16de3ad1464523de63ffb44..d6d789dd70b74b099621405aaab5cbb25e1a47eb"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-insert-test",
@@ -195,9 +211,19 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "79300c371f63ca7d92884cf2e4cb676518313a20",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index e1de356..4ca0d4c 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function(b,c) { return b * c; }",
+        "+function(a,b) { return a + b; }",
+        " function(a,b) { return a + b; }",
+        " function(a,b) { return a + b; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "016507d5f7e94b37702891fc7b0d62b850b6e225"
+    "shas": "d6d789dd70b74b099621405aaab5cbb25e1a47eb..d40be86ea2ce078c6a426ce0a8c252a71892113a"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-test",
@@ -319,9 +345,19 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "016507d5f7e94b37702891fc7b0d62b850b6e225",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index 4ca0d4c..e1de356 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function(a,b) { return a + b; }",
+        "+function(b,c) { return b * c; }",
+        " function(a,b) { return a + b; }",
+        " function(a,b) { return a + b; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3fb4175329fcd15fec0bbc2fc1bf9180bdf4fbcd"
+    "shas": "d40be86ea2ce078c6a426ce0a8c252a71892113a..fbe8b2947cb17ec793516f3368dd2f787bccfe66"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-replacement-test",
@@ -380,9 +416,19 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "3fb4175329fcd15fec0bbc2fc1bf9180bdf4fbcd",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index e1de356..afdaccf 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -1,3 +1,2 @@",
+        "-function(b,c) { return b * c; }",
+        "-function(a,b) { return a + b; }",
+        " function(a,b) { return a + b; }",
+        "+function(b,c) { return b * c; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "690cd36fd94756b8e231d0e5134619fe533b1a87"
+    "shas": "fbe8b2947cb17ec793516f3368dd2f787bccfe66..260e74caf2632a2de525e1341d76ed31cc8cf2bf"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-test",
@@ -411,9 +457,17 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "690cd36fd94756b8e231d0e5134619fe533b1a87",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index afdaccf..9f1856f 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -1,2 +1 @@",
+        "-function(a,b) { return a + b; }",
+        " function(b,c) { return b * c; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9b5d868b31faea679ddb9fe61b59042398eb187a"
+    "shas": "260e74caf2632a2de525e1341d76ed31cc8cf2bf..f425fbe0cbbd72279ea1a69e34baa8e341700a09"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-rest-test",
@@ -442,7 +496,14 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "9b5d868b31faea679ddb9fe61b59042398eb187a",
+    "patch": [
+        "diff --git a/anonymous-function.js b/anonymous-function.js",
+        "index 9f1856f..e69de29 100644",
+        "--- a/anonymous-function.js",
+        "+++ b/anonymous-function.js",
+        "@@ -1 +0,0 @@",
+        "-function(b,c) { return b * c; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9fd0f7aee44dbf83b9a380bad5755081b4246e77"
+    "shas": "f425fbe0cbbd72279ea1a69e34baa8e341700a09..2a5f85a471c9c83f2e835139afa5eb7bfecd546a"
 }]

test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "9fd0f7aee44dbf83b9a380bad5755081b4246e77",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index e69de29..4a26ae8 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -0,0 +1 @@",
+        "+function() { return 'hi'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3f71749ad94ee55259b0185c358235d8ac903467"
+    "shas": "2a5f85a471c9c83f2e835139afa5eb7bfecd546a..a2527ab39dbaa7651e66e24f3d143d11060841f6"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "3f71749ad94ee55259b0185c358235d8ac903467",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index 4a26ae8..c31dd4b 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -1 +1,3 @@",
+        "+function() { return 'hello'; }",
+        "+function() { return 'hi'; }",
+        " function() { return 'hi'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0863179c63f1167cdfb18c909a4085cc496937f6"
+    "shas": "a2527ab39dbaa7651e66e24f3d143d11060841f6..4b3321e8a707ad91af6735319257f7f68fb593b7"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "0863179c63f1167cdfb18c909a4085cc496937f6",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index c31dd4b..6b1efa4 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function() { return 'hello'; }",
+        "+function() { return 'hi'; }",
+        " function() { return 'hi'; }",
+        " function() { return 'hi'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "694e7e4dbf661db0da87a68db68975fe34fdba3f"
+    "shas": "4b3321e8a707ad91af6735319257f7f68fb593b7..a01626612654464812b9cedaad745f686edc8138"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "694e7e4dbf661db0da87a68db68975fe34fdba3f",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index 6b1efa4..c31dd4b 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function() { return 'hi'; }",
+        "+function() { return 'hello'; }",
+        " function() { return 'hi'; }",
+        " function() { return 'hi'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "353eeb99fc286d0683f1d698a8f6212ce4699acd"
+    "shas": "a01626612654464812b9cedaad745f686edc8138..d640dfcedbbda8708bb8c679b2b96460e63e8e53"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "353eeb99fc286d0683f1d698a8f6212ce4699acd",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index c31dd4b..b8e05c0 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -1,3 +1,2 @@",
+        "-function() { return 'hello'; }",
+        "-function() { return 'hi'; }",
+        " function() { return 'hi'; }",
+        "+function() { return 'hello'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9862380b35add3763257a9f558bf4ff02427d9cf"
+    "shas": "d640dfcedbbda8708bb8c679b2b96460e63e8e53..f1436a17d64c050a7d6aa15fe0876ce3fc4176f0"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "9862380b35add3763257a9f558bf4ff02427d9cf",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index b8e05c0..ce1ef83 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -1,2 +1 @@",
+        "-function() { return 'hi'; }",
+        " function() { return 'hello'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e42905606a9100ef0e06cb728b265e6d772e9a9f"
+    "shas": "f1436a17d64c050a7d6aa15fe0876ce3fc4176f0..1bd2372f874ec3588d5510b5c7fa50c378b5e665"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "e42905606a9100ef0e06cb728b265e6d772e9a9f",
+    "patch": [
+        "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
+        "index ce1ef83..e69de29 100644",
+        "--- a/anonymous-parameterless-function.js",
+        "+++ b/anonymous-parameterless-function.js",
+        "@@ -1 +0,0 @@",
+        "-function() { return 'hello'; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8662f58f1d7ce21fddcefecae990742a5d1398dc"
+    "shas": "1bd2372f874ec3588d5510b5c7fa50c378b5e665..e66b1b20abc596d2b560eaa80f1749c79816f9ff"
 }]

test/corpus/diff-summaries/javascript/array.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "9ccab273233837d842e68ec909416aab24ff359a",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index e69de29..3335582 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -0,0 +1 @@",
+        "+[ \"item1\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b653c66def8445f3ba4880fee2c049196d273774"
+    "shas": "654a538b26c9b4c8637e6c2e4cd497c93e690310..cbf013688399920af101ea056e9fba5ecba0601d"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "b653c66def8445f3ba4880fee2c049196d273774",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index 3335582..cf37d7c 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -1 +1,3 @@",
+        "+[ \"item1\", \"item2\" ];",
+        "+[ \"item1\" ];",
+        " [ \"item1\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c055d2c11306c9f9cbb2ed0d9f0b638b953f7b4a"
+    "shas": "cbf013688399920af101ea056e9fba5ecba0601d..87e3b9ed3c5f26c596ad2b5da90359174c84f53c"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-insert-test",
@@ -102,9 +118,19 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "c055d2c11306c9f9cbb2ed0d9f0b638b953f7b4a",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index cf37d7c..c2cb17f 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -1,3 +1,3 @@",
+        "-[ \"item1\", \"item2\" ];",
+        "+[ \"item1\" ];",
+        " [ \"item1\" ];",
+        " [ \"item1\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "074894088cf9d55ae3bcdbb3a8e4270b8d2a0c26"
+    "shas": "87e3b9ed3c5f26c596ad2b5da90359174c84f53c..ea49177e8ff82b772f7347682975cb1fa5e7b012"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-test",
@@ -133,9 +159,19 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "074894088cf9d55ae3bcdbb3a8e4270b8d2a0c26",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index c2cb17f..cf37d7c 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -1,3 +1,3 @@",
+        "-[ \"item1\" ];",
+        "+[ \"item1\", \"item2\" ];",
+        " [ \"item1\" ];",
+        " [ \"item1\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7e646e80e9fabf33c78eca4122ac60e146b52423"
+    "shas": "ea49177e8ff82b772f7347682975cb1fa5e7b012..1e28fd793a6ab61ed59b28d8ee56b55be7ad79ec"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-replacement-test",
@@ -194,9 +230,19 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "7e646e80e9fabf33c78eca4122ac60e146b52423",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index cf37d7c..a4d92b8 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -1,3 +1,2 @@",
+        "-[ \"item1\", \"item2\" ];",
+        "-[ \"item1\" ];",
+        " [ \"item1\" ];",
+        "+[ \"item1\", \"item2\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c61cc49cb2088ca7e12614a4b31e181f5a0e97d6"
+    "shas": "1e28fd793a6ab61ed59b28d8ee56b55be7ad79ec..fdc62b5a013932e082ba61a576b8fb54cd1d0791"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-test",
@@ -225,9 +271,17 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "c61cc49cb2088ca7e12614a4b31e181f5a0e97d6",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index a4d92b8..7f2f50e 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -1,2 +1 @@",
+        "-[ \"item1\" ];",
+        " [ \"item1\", \"item2\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9601453a391957f917ee112f1e6abce225b21bac"
+    "shas": "fdc62b5a013932e082ba61a576b8fb54cd1d0791..9e91959fe3d3ec022474f242a8456b900fdfd8d2"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-rest-test",
@@ -256,7 +310,14 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "9601453a391957f917ee112f1e6abce225b21bac",
+    "patch": [
+        "diff --git a/array.js b/array.js",
+        "index 7f2f50e..e69de29 100644",
+        "--- a/array.js",
+        "+++ b/array.js",
+        "@@ -1 +0,0 @@",
+        "-[ \"item1\", \"item2\" ];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e1f7c5a495d4e15d24ac325f6dec565f21f021e8"
+    "shas": "9e91959fe3d3ec022474f242a8456b900fdfd8d2..0bdf412036a9a6aea51108a20404c37541fffcfb"
 }]

test/corpus/diff-summaries/javascript/arrow-function.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "1a65f6b31571ca180a7067af4efe0b804b5bd17f",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index e69de29..9ef167c 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -0,0 +1 @@",
+        "+(f, g) => { return h; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d8b95c6c259bbc1031068e76b71ee165a32fcc90"
+    "shas": "d700dc51fee7a3dd557906dcdf46d426285d7955..edda3c60ac532d534d84539648fa827ff18a6c59"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "d8b95c6c259bbc1031068e76b71ee165a32fcc90",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index 9ef167c..92dea6f 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -1 +1,3 @@",
+        "+(f, g) => { return g; };",
+        "+(f, g) => { return h; };",
+        " (f, g) => { return h; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "38971f3bb12072ce71a8af2e61b40128e2e04335"
+    "shas": "edda3c60ac532d534d84539648fa827ff18a6c59..63fd87f8cafc4a46f2927f9825cc20e5f116a093"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "38971f3bb12072ce71a8af2e61b40128e2e04335",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index 92dea6f..8f5bb51 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-(f, g) => { return g; };",
+        "+(f, g) => { return h; };",
+        " (f, g) => { return h; };",
+        " (f, g) => { return h; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0bad91b1393996893c42c7ca6cea6b485ed79f3d"
+    "shas": "63fd87f8cafc4a46f2927f9825cc20e5f116a093..29b18be738dde19aa61343c5f4e54bf83f4b30ea"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "0bad91b1393996893c42c7ca6cea6b485ed79f3d",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index 8f5bb51..92dea6f 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-(f, g) => { return h; };",
+        "+(f, g) => { return g; };",
+        " (f, g) => { return h; };",
+        " (f, g) => { return h; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "22eb88fd92a0f54db863a2c99e7f6cefd573d70c"
+    "shas": "29b18be738dde19aa61343c5f4e54bf83f4b30ea..d92f900ef9873f273da632ea9c54adcd7acc7961"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "22eb88fd92a0f54db863a2c99e7f6cefd573d70c",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index 92dea6f..acab9a9 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -1,3 +1,2 @@",
+        "-(f, g) => { return g; };",
+        "-(f, g) => { return h; };",
+        " (f, g) => { return h; };",
+        "+(f, g) => { return g; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ce32c18979a6f118f1a64d68058aea090fbd6ffa"
+    "shas": "d92f900ef9873f273da632ea9c54adcd7acc7961..243f2be7291992566bd0ab2c2caef9e7ac13e02d"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "ce32c18979a6f118f1a64d68058aea090fbd6ffa",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index acab9a9..ef1be25 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -1,2 +1 @@",
+        "-(f, g) => { return h; };",
+        " (f, g) => { return g; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "555a09419c1aeebf5676d25753625cc4a6558f9b"
+    "shas": "243f2be7291992566bd0ab2c2caef9e7ac13e02d..3128237c6d11459cf7d3e9add902e7be8d38710b"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "555a09419c1aeebf5676d25753625cc4a6558f9b",
+    "patch": [
+        "diff --git a/arrow-function.js b/arrow-function.js",
+        "index ef1be25..e69de29 100644",
+        "--- a/arrow-function.js",
+        "+++ b/arrow-function.js",
+        "@@ -1 +0,0 @@",
+        "-(f, g) => { return g; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "843b9d83e2acc3f1bf014abc4e2402e1a783d3f6"
+    "shas": "3128237c6d11459cf7d3e9add902e7be8d38710b..5cab8720cde055f6d78f5c5deaf8980b89a434e1"
 }]

test/corpus/diff-summaries/javascript/assignment.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "f5dfc0945ffae36e0f9784dcfeb8472344055afc",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index e69de29..6882fe5 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -0,0 +1 @@",
+        "+x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6fc2b9a8bdab5a87aeb8214b88ddafb278098394"
+    "shas": "10c888c0caabf36cb211a96640afbe435dfad3fb..6a5eb86577a86881fdd53c3db17dd589617b887e"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "6fc2b9a8bdab5a87aeb8214b88ddafb278098394",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index 6882fe5..fb4cba4 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -1 +1,3 @@",
+        "+x = 1;",
+        "+x = 0;",
+        " x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "45ee00517df6dd2f5c12523b82f4ae9c361cbbab"
+    "shas": "6a5eb86577a86881fdd53c3db17dd589617b887e..79ca8610276bd0cc32d257702e20ec268187f1b6"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "45ee00517df6dd2f5c12523b82f4ae9c361cbbab",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index fb4cba4..42e16c6 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -1,3 +1,3 @@",
+        "-x = 1;",
+        "+x = 0;",
+        " x = 0;",
+        " x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c68a9ee4c0811ebc8bc6a97087ad578bda055575"
+    "shas": "79ca8610276bd0cc32d257702e20ec268187f1b6..c3da25392def8e82aaf0179cdd8cc51849d805c8"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "c68a9ee4c0811ebc8bc6a97087ad578bda055575",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index 42e16c6..fb4cba4 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -1,3 +1,3 @@",
+        "-x = 0;",
+        "+x = 1;",
+        " x = 0;",
+        " x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "aa18ede37e29b97d5478771c02f899c26ed29ec8"
+    "shas": "c3da25392def8e82aaf0179cdd8cc51849d805c8..be4979757f9464e59b4b7fb7dbdce17f4f362029"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "aa18ede37e29b97d5478771c02f899c26ed29ec8",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index fb4cba4..11fe15d 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -1,3 +1,2 @@",
+        "-x = 1;",
+        "-x = 0;",
+        " x = 0;",
+        "+x = 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e34fae4bc40de3527a8af142718f5034b8c89464"
+    "shas": "be4979757f9464e59b4b7fb7dbdce17f4f362029..592d4d9a24fe20282bbaa1cf66bbe20959d47ae5"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "e34fae4bc40de3527a8af142718f5034b8c89464",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index 11fe15d..198b8f8 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -1,2 +1 @@",
+        "-x = 0;",
+        " x = 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "844f1b80889b328b7de377506a20fd1e07722c3c"
+    "shas": "592d4d9a24fe20282bbaa1cf66bbe20959d47ae5..f0b77709f5be6c1d671a943d73b8fbb12344762e"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "844f1b80889b328b7de377506a20fd1e07722c3c",
+    "patch": [
+        "diff --git a/assignment.js b/assignment.js",
+        "index 198b8f8..e69de29 100644",
+        "--- a/assignment.js",
+        "+++ b/assignment.js",
+        "@@ -1 +0,0 @@",
+        "-x = 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "45a5360969a82ef1602c4fd2629a242bd75a1edf"
+    "shas": "f0b77709f5be6c1d671a943d73b8fbb12344762e..83f3153b76f49e077237997c965dc6f3c3a159bc"
 }]

test/corpus/diff-summaries/javascript/bitwise-operator.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "761fc16b7840013a3a30a594193222af2c710535",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index e69de29..021cf6a 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -0,0 +1 @@",
+        "+i >> j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ae0665071ff8d408f9dba2bc188c7ee5e6d72c8e"
+    "shas": "5edf134e2ccb0fa1cd27b2e07b4279575f1a5f0d..e2e6f5b9a61fa806befb17711cf3ae52dd20f725"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "ae0665071ff8d408f9dba2bc188c7ee5e6d72c8e",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index 021cf6a..3e0b6c1 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -1 +1,3 @@",
+        "+i >> k;",
+        "+i >> j;",
+        " i >> j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "30a3708b6b22a2fecb6a2e10ac27b6945a87f9f7"
+    "shas": "e2e6f5b9a61fa806befb17711cf3ae52dd20f725..de455af0e3ab990d8f20a4555d4bf28324551ed0"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "30a3708b6b22a2fecb6a2e10ac27b6945a87f9f7",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index 3e0b6c1..18853d1 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-i >> k;",
+        "+i >> j;",
+        " i >> j;",
+        " i >> j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b5a0645c9262b7ef092240be639ac5cf0758cf64"
+    "shas": "de455af0e3ab990d8f20a4555d4bf28324551ed0..59f5fd5cc14501c063c3ec3b9563503a4f22537b"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "b5a0645c9262b7ef092240be639ac5cf0758cf64",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index 18853d1..3e0b6c1 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-i >> j;",
+        "+i >> k;",
+        " i >> j;",
+        " i >> j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d2dc484eb040a787945e88294a926f120fed4e12"
+    "shas": "59f5fd5cc14501c063c3ec3b9563503a4f22537b..24328d0f069d5e61a5926bedf6e0a074361d7477"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "d2dc484eb040a787945e88294a926f120fed4e12",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index 3e0b6c1..ee7d8de 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -1,3 +1,2 @@",
+        "-i >> k;",
+        "-i >> j;",
+        " i >> j;",
+        "+i >> k;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8411bfe78b348cf56e382a55f6c1bd8541bda049"
+    "shas": "24328d0f069d5e61a5926bedf6e0a074361d7477..083807f60ce4fd39ee7612cb97e2dc2351a09203"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "8411bfe78b348cf56e382a55f6c1bd8541bda049",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index ee7d8de..2800c8c 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -1,2 +1 @@",
+        "-i >> j;",
+        " i >> k;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "12c46cd84849f5766fff9bdf00c5b8357667c02b"
+    "shas": "083807f60ce4fd39ee7612cb97e2dc2351a09203..1bceab9d521db6e74ccfca50dae11d9ac030a4bc"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "12c46cd84849f5766fff9bdf00c5b8357667c02b",
+    "patch": [
+        "diff --git a/bitwise-operator.js b/bitwise-operator.js",
+        "index 2800c8c..e69de29 100644",
+        "--- a/bitwise-operator.js",
+        "+++ b/bitwise-operator.js",
+        "@@ -1 +0,0 @@",
+        "-i >> k;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "149d0a9500261cd37b696c4ab2527d34f0133522"
+    "shas": "1bceab9d521db6e74ccfca50dae11d9ac030a4bc..4e47562dd59646a6c6c55ab138660495394bc5c9"
 }]

test/corpus/diff-summaries/javascript/boolean-operator.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "0f277a98ca88f6c1e02d2811fa15b32c1909edf0",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index e69de29..7280a98 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -0,0 +1 @@",
+        "+i || j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d039a78308a35a509cecb57ba239162e939925ae"
+    "shas": "69248e3fdb3e6ab7da864ef7bd3a915aeefd3cc4..697a361cfb8bcfd14631209deb6159679d166115"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "d039a78308a35a509cecb57ba239162e939925ae",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index 7280a98..fe3f306 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -1 +1,3 @@",
+        "+i && j;",
+        "+i || j;",
+        " i || j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9f2ce7d364ba8f68e4aaf3f2a1bc525afb0fbcfc"
+    "shas": "697a361cfb8bcfd14631209deb6159679d166115..2829490ad0cdc2f954145a2698444d5daf1da199"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-insert-test",
@@ -84,9 +100,19 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "9f2ce7d364ba8f68e4aaf3f2a1bc525afb0fbcfc",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index fe3f306..273c0ee 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-i && j;",
+        "+i || j;",
+        " i || j;",
+        " i || j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9f9d0f34d19c5335218140e896e56cca5483085c"
+    "shas": "2829490ad0cdc2f954145a2698444d5daf1da199..8a66944201f7ad0fc2ee8fcdcaff607125c8cc0f"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-test",
@@ -97,9 +123,19 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "9f9d0f34d19c5335218140e896e56cca5483085c",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index 273c0ee..fe3f306 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-i || j;",
+        "+i && j;",
+        " i || j;",
+        " i || j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b7735561df1e286eb16fbd6d6f12c40f33f0d884"
+    "shas": "8a66944201f7ad0fc2ee8fcdcaff607125c8cc0f..0658cb117a6a6719f8464948c86e3e278d8c2a95"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-replacement-test",
@@ -128,9 +164,19 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "b7735561df1e286eb16fbd6d6f12c40f33f0d884",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index fe3f306..7f4873c 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -1,3 +1,2 @@",
+        "-i && j;",
+        "-i || j;",
+        " i || j;",
+        "+i && j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4209ac85ff7d9fdbe9ac2d309fefec0af45d0702"
+    "shas": "0658cb117a6a6719f8464948c86e3e278d8c2a95..35f6d8f480c9f8645a3c0d8f9fa5339059a6380a"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-test",
@@ -159,9 +205,17 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "4209ac85ff7d9fdbe9ac2d309fefec0af45d0702",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index 7f4873c..c6921d1 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -1,2 +1 @@",
+        "-i || j;",
+        " i && j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2ee56bee510724715c14244f51c38c55b13ed274"
+    "shas": "35f6d8f480c9f8645a3c0d8f9fa5339059a6380a..2b07585de8be3e4334361368f2dc465278842434"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-rest-test",
@@ -190,7 +244,14 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "2ee56bee510724715c14244f51c38c55b13ed274",
+    "patch": [
+        "diff --git a/boolean-operator.js b/boolean-operator.js",
+        "index c6921d1..e69de29 100644",
+        "--- a/boolean-operator.js",
+        "+++ b/boolean-operator.js",
+        "@@ -1 +0,0 @@",
+        "-i && j;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "761fc16b7840013a3a30a594193222af2c710535"
+    "shas": "2b07585de8be3e4334361368f2dc465278842434..5edf134e2ccb0fa1cd27b2e07b4279575f1a5f0d"
 }]

test/corpus/diff-summaries/javascript/chained-callbacks.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "0dd5a42b7e992a63ee0e46bbbc58699dd09f6851",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index e69de29..ce9ee1e 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -0,0 +1 @@",
+        "+this.map(function (a) { return a.b; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5a141e4ade0038fbde994ab77049a38a1565b976"
+    "shas": "1512ae1cef2a096ce2723ce98334e4ce0e4bc82b..2a014ee8fd6ea4f8ce5b6bae0ca35a4fa6462deb"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "5a141e4ade0038fbde994ab77049a38a1565b976",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index ce9ee1e..acba744 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -1 +1,3 @@",
+        "+this.reduce(function (a) { return b.a; })",
+        "+this.map(function (a) { return a.b; })",
+        " this.map(function (a) { return a.b; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8bb88ee35fe50732fa664a022dab4f67d4fad2a3"
+    "shas": "2a014ee8fd6ea4f8ce5b6bae0ca35a4fa6462deb..6a6e1ae99abc9cae5f8ac31aac43836380944603"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-insert-test",
@@ -168,9 +184,19 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "8bb88ee35fe50732fa664a022dab4f67d4fad2a3",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index acba744..7390534 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -1,3 +1,3 @@",
+        "-this.reduce(function (a) { return b.a; })",
+        "+this.map(function (a) { return a.b; })",
+        " this.map(function (a) { return a.b; })",
+        " this.map(function (a) { return a.b; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "20f50a2164ac72df558b6ba29253a750d0e43b30"
+    "shas": "6a6e1ae99abc9cae5f8ac31aac43836380944603..c86429cb689c74e2ce3988c8bc257a365734cbe3"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-test",
@@ -265,9 +291,19 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "20f50a2164ac72df558b6ba29253a750d0e43b30",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index 7390534..acba744 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -1,3 +1,3 @@",
+        "-this.map(function (a) { return a.b; })",
+        "+this.reduce(function (a) { return b.a; })",
+        " this.map(function (a) { return a.b; })",
+        " this.map(function (a) { return a.b; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0df44200409e2bc7040f464d19c0105073aa8e0a"
+    "shas": "c86429cb689c74e2ce3988c8bc257a365734cbe3..c4df0b8afdd73cae6d89a9098ae38d9c3085dbb8"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-replacement-test",
@@ -326,9 +362,19 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "0df44200409e2bc7040f464d19c0105073aa8e0a",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index acba744..c4db432 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -1,3 +1,2 @@",
+        "-this.reduce(function (a) { return b.a; })",
+        "-this.map(function (a) { return a.b; })",
+        " this.map(function (a) { return a.b; })",
+        "+this.reduce(function (a) { return b.a; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7e75f5dee9344c80bf09a677752c16c9ca0ee945"
+    "shas": "c4df0b8afdd73cae6d89a9098ae38d9c3085dbb8..8b7dbbb0ca20e47dfed24fb3eb3a790721d2e9d0"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-test",
@@ -357,9 +403,17 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "7e75f5dee9344c80bf09a677752c16c9ca0ee945",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index c4db432..e593419 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -1,2 +1 @@",
+        "-this.map(function (a) { return a.b; })",
+        " this.reduce(function (a) { return b.a; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0313d7b16c660931a9fcba9a02f3f79dcb16ad95"
+    "shas": "8b7dbbb0ca20e47dfed24fb3eb3a790721d2e9d0..e2c2e86db834a0ab3c6006c6385e90d780851357"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-rest-test",
@@ -388,7 +442,14 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "0313d7b16c660931a9fcba9a02f3f79dcb16ad95",
+    "patch": [
+        "diff --git a/chained-callbacks.js b/chained-callbacks.js",
+        "index e593419..e69de29 100644",
+        "--- a/chained-callbacks.js",
+        "+++ b/chained-callbacks.js",
+        "@@ -1 +0,0 @@",
+        "-this.reduce(function (a) { return b.a; })"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1a9472e94c365639f5f2b5c519a06c2daf17c630"
+    "shas": "e2c2e86db834a0ab3c6006c6385e90d780851357..5ef42771e35b5af39f3befe137fedf40f174a5c7"
 }]

test/corpus/diff-summaries/javascript/chained-property-access.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "d634acd5aed3ab7ef4a9914234758a3bf356d2c4",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index e69de29..5914a55 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -0,0 +1 @@",
+        "+return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "723940f8df7814d9f0fb1ea03dddbff771d80ac8"
+    "shas": "71feda9fd80ab60adab5cf81748710b2a610173f..02c42e637780aeb5874c5f740ba764a0b606d950"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "723940f8df7814d9f0fb1ea03dddbff771d80ac8",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index 5914a55..7095976 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -1 +1,3 @@",
+        "+return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )",
+        "+return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4d9c7053f056b963074f086d40020195bff90c32"
+    "shas": "02c42e637780aeb5874c5f740ba764a0b606d950..eb64ebf3bc9351da0d4cbb59cdfc44d7152b090e"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-insert-test",
@@ -141,9 +157,19 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "4d9c7053f056b963074f086d40020195bff90c32",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index 7095976..98df938 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -1,3 +1,3 @@",
+        "-return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )",
+        "+return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b0faefc21e5b571d399056063f96cfbf810a503f"
+    "shas": "eb64ebf3bc9351da0d4cbb59cdfc44d7152b090e..d87ef7df3e23f3b4837c9dd09aeca869774aa731"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-test",
@@ -211,9 +237,19 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "b0faefc21e5b571d399056063f96cfbf810a503f",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index 98df938..7095976 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -1,3 +1,3 @@",
+        "-return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        "+return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )",
+        " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ea742ea1e997a7a1241d1e719c3b313d8a42067c"
+    "shas": "d87ef7df3e23f3b4837c9dd09aeca869774aa731..2e00036e857c5aa6af0eb4ab23bd4cbb28bd90a2"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-replacement-test",
@@ -272,9 +308,19 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "ea742ea1e997a7a1241d1e719c3b313d8a42067c",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index 7095976..7b764ca 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -1,3 +1,2 @@",
+        "-return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )",
+        "-return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        "+return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5517a9b89409234d2dc3cbf17aa526d72bc12479"
+    "shas": "2e00036e857c5aa6af0eb4ab23bd4cbb28bd90a2..5eb335f13f0dea85c75b4d5f174832b08af8a0e6"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-test",
@@ -303,9 +349,17 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "5517a9b89409234d2dc3cbf17aa526d72bc12479",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index 7b764ca..5d6d3a0 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -1,2 +1 @@",
+        "-return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )",
+        " return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "66cacfd430f02a62b6976e31fdc0a53ae019dd5e"
+    "shas": "5eb335f13f0dea85c75b4d5f174832b08af8a0e6..054acb661f91e8a5b9096d552c5b3410bacc4811"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-rest-test",
@@ -334,7 +388,14 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "66cacfd430f02a62b6976e31fdc0a53ae019dd5e",
+    "patch": [
+        "diff --git a/chained-property-access.js b/chained-property-access.js",
+        "index 5d6d3a0..e69de29 100644",
+        "--- a/chained-property-access.js",
+        "+++ b/chained-property-access.js",
+        "@@ -1 +0,0 @@",
+        "-return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0dd5a42b7e992a63ee0e46bbbc58699dd09f6851"
+    "shas": "054acb661f91e8a5b9096d552c5b3410bacc4811..1512ae1cef2a096ce2723ce98334e4ce0e4bc82b"
 }]

test/corpus/diff-summaries/javascript/class.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "559546b09a86fffc79e8283d8f7567d491c07e90",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index e69de29..8f6ae64 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -0,0 +1 @@",
+        "+class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0ac57022cf74cb78426a1df060ce3ac2ff83cd71"
+    "shas": "f6dfeb42af9db740677fd60341ea39da711f7c81..f071d25d12bb0086a285449efbe5cfaeeed8e436"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "0ac57022cf74cb78426a1df060ce3ac2ff83cd71",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index 8f6ae64..b509437 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -1 +1,3 @@",
+        "+class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }",
+        "+class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5bbc894719630d0236a85728f425e98a4ef3487b"
+    "shas": "f071d25d12bb0086a285449efbe5cfaeeed8e436..ba736a07888eb4991323c035f2bf78fe1650ea56"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-insert-test",
@@ -105,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'foo' identifier with the 'one' identifier in the one method of the 'Foo' class"
+                    "summary": "Replaced the 'foo' identifier with the 'one' identifier in the 'one(a)' method of the 'Foo' class"
                 },
                 {
                     "span": {
@@ -120,7 +136,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'two' method in the Foo class"
+                    "summary": "Added the 'two(b)' method in the Foo class"
                 },
                 {
                     "span": {
@@ -135,7 +151,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'three' method in the Foo class"
+                    "summary": "Added the 'three(c)' method in the Foo class"
                 },
                 {
                     "span": {
@@ -150,7 +166,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'bar' method in the Foo class"
+                    "summary": "Deleted the 'bar(b)' method in the Foo class"
                 },
                 {
                     "span": {
@@ -165,7 +181,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'baz' method in the Foo class"
+                    "summary": "Deleted the 'baz(c)' method in the Foo class"
                 }
             ]
         },
@@ -174,9 +190,19 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "5bbc894719630d0236a85728f425e98a4ef3487b",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index b509437..c4f5c91 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -1,3 +1,3 @@",
+        "-class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }",
+        "+class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7e7e2be0141ca3710f3a774caa03f4704e9d3586"
+    "shas": "ba736a07888eb4991323c035f2bf78fe1650ea56..c99d7b8dc9cff808ef1e6010caa4573ad1694d9b"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-test",
@@ -208,7 +234,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'foo' identifier in the foo method of the 'Foo' class"
+                    "summary": "Replaced the 'one' identifier with the 'foo' identifier in the 'foo(a)' method of the 'Foo' class"
                 },
                 {
                     "span": {
@@ -223,7 +249,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'bar' method in the Foo class"
+                    "summary": "Added the 'bar(b)' method in the Foo class"
                 },
                 {
                     "span": {
@@ -238,7 +264,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'baz' method in the Foo class"
+                    "summary": "Added the 'baz(c)' method in the Foo class"
                 },
                 {
                     "span": {
@@ -253,7 +279,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'two' method in the Foo class"
+                    "summary": "Deleted the 'two(b)' method in the Foo class"
                 },
                 {
                     "span": {
@@ -268,7 +294,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'three' method in the Foo class"
+                    "summary": "Deleted the 'three(c)' method in the Foo class"
                 }
             ]
         },
@@ -277,9 +303,19 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "7e7e2be0141ca3710f3a774caa03f4704e9d3586",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index c4f5c91..b509437 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -1,3 +1,3 @@",
+        "-class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        "+class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }",
+        " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f67a4f59fd14475400023beebe947c59aea5f3ea"
+    "shas": "c99d7b8dc9cff808ef1e6010caa4573ad1694d9b..75a0caa880f62a0706ff723f555a9ec1f0c53c29"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-replacement-test",
@@ -338,9 +374,19 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "f67a4f59fd14475400023beebe947c59aea5f3ea",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index b509437..b1ef404 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -1,3 +1,2 @@",
+        "-class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }",
+        "-class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        "+class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ef1f76b5f01fce4b330b99a4ebf3b128c03b7cb1"
+    "shas": "75a0caa880f62a0706ff723f555a9ec1f0c53c29..4231a3b306d145aa37ceb879ef6f8da6221e54b8"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-test",
@@ -369,9 +415,17 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "ef1f76b5f01fce4b330b99a4ebf3b128c03b7cb1",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index b1ef404..2c17f72 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -1,2 +1 @@",
+        "-class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }",
+        " class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "db58ab719fe45f004df748e0e6248d756f7ad9f3"
+    "shas": "4231a3b306d145aa37ceb879ef6f8da6221e54b8..d5627235989da4028cfcb15c4b1ee2bdc544fd31"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-rest-test",
@@ -400,7 +454,14 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "db58ab719fe45f004df748e0e6248d756f7ad9f3",
+    "patch": [
+        "diff --git a/class.js b/class.js",
+        "index 2c17f72..e69de29 100644",
+        "--- a/class.js",
+        "+++ b/class.js",
+        "@@ -1 +0,0 @@",
+        "-class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9ccab273233837d842e68ec909416aab24ff359a"
+    "shas": "d5627235989da4028cfcb15c4b1ee2bdc544fd31..654a538b26c9b4c8637e6c2e4cd497c93e690310"
 }]

test/corpus/diff-summaries/javascript/comma-operator.json

@@ -40,9 +40,16 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "653a2a2b908c1963d4682a6e4b6e89f1aa17b275",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index e69de29..cff019f 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -0,0 +1 @@",
+        "+a = 1, b = 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7d8c6c9fdcb9ab7e9f40ae14efc813ae2b67e19e"
+    "shas": "ec86aaba01801d01aca70fd31403642be1e2d438..b0a5f928a8a4594bb176a56275c43ccab6e2e2a0"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-insert-test",
@@ -101,9 +108,18 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "7d8c6c9fdcb9ab7e9f40ae14efc813ae2b67e19e",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index cff019f..93ece10 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -1 +1,3 @@",
+        "+c = {d: (3, 4 + 5, 6)};",
+        "+a = 1, b = 2;",
+        " a = 1, b = 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "40847aa7f589fd835e91320d43628d16fd37ef15"
+    "shas": "b0a5f928a8a4594bb176a56275c43ccab6e2e2a0..315b46ccdb9a45c374b4ed1cc51a062d74c13a78"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-insert-test",
@@ -162,9 +178,19 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "40847aa7f589fd835e91320d43628d16fd37ef15",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index 93ece10..f738c2d 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-c = {d: (3, 4 + 5, 6)};",
+        "+a = 1, b = 2;",
+        " a = 1, b = 2;",
+        " a = 1, b = 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b244fddf952c3cadad8f104cc2ee2abbf93dafcf"
+    "shas": "315b46ccdb9a45c374b4ed1cc51a062d74c13a78..30cf69eb0cc5543fe53be82f29cd0e0371e30cd1"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-test",
@@ -223,9 +249,19 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "b244fddf952c3cadad8f104cc2ee2abbf93dafcf",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index f738c2d..93ece10 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-a = 1, b = 2;",
+        "+c = {d: (3, 4 + 5, 6)};",
+        " a = 1, b = 2;",
+        " a = 1, b = 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f40060278cf7bbaca75632570dbadc10067591bb"
+    "shas": "30cf69eb0cc5543fe53be82f29cd0e0371e30cd1..a454c132f64a253a51cbf1a1455e74fca9343c23"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-replacement-test",
@@ -299,9 +335,19 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "f40060278cf7bbaca75632570dbadc10067591bb",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index 93ece10..297e28d 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -1,3 +1,2 @@",
+        "-c = {d: (3, 4 + 5, 6)};",
+        "-a = 1, b = 2;",
+        " a = 1, b = 2;",
+        "+c = {d: (3, 4 + 5, 6)};"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "67e74b7145a061c1d8f576792167aab68c6be809"
+    "shas": "a454c132f64a253a51cbf1a1455e74fca9343c23..db24ea61ad00e73c91b0a4b616f333a5eac48f29"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-test",
@@ -345,9 +391,17 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "67e74b7145a061c1d8f576792167aab68c6be809",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index 297e28d..421bc7f 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -1,2 +1 @@",
+        "-a = 1, b = 2;",
+        " c = {d: (3, 4 + 5, 6)};"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "12ce4e2077d01b8c8209ad272f1d0f715d9b0124"
+    "shas": "db24ea61ad00e73c91b0a4b616f333a5eac48f29..4ec8128c2ab11f7bf00c002d0fec6c8601b14c16"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-rest-test",
@@ -376,7 +430,14 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "12ce4e2077d01b8c8209ad272f1d0f715d9b0124",
+    "patch": [
+        "diff --git a/comma-operator.js b/comma-operator.js",
+        "index 421bc7f..e69de29 100644",
+        "--- a/comma-operator.js",
+        "+++ b/comma-operator.js",
+        "@@ -1 +0,0 @@",
+        "-c = {d: (3, 4 + 5, 6)};"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "26df3b54cd036f1ed2bff8a0ca225ad680e23432"
+    "shas": "4ec8128c2ab11f7bf00c002d0fec6c8601b14c16..0ccf8092231ebc8ac92cc60fe614f1681bc03a89"
 }]

test/corpus/diff-summaries/javascript/comment.json

@@ -7,9 +7,16 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "51cb9277c2233716e2f002c08a23656f70425838",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index e69de29..a5821d2 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -0,0 +1 @@",
+        "+// This is a property"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "98ef3ccd95e55e93513f790185e4fc83ed93def2"
+    "shas": "81bc4513ad3979452e9e95586a5fbc9ca66eeadc..522a93132b55605393a0f7a5421f3d1f7b0d4a8c"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-insert-test",
@@ -20,9 +27,20 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "98ef3ccd95e55e93513f790185e4fc83ed93def2",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index a5821d2..761aa7a 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -1 +1,5 @@",
+        "+/*",
+        "+ * This is a method",
+        "+*/",
+        "+// This is a property",
+        " // This is a property"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1ac3dd727429b94a67241d8941f5360892a30fae"
+    "shas": "522a93132b55605393a0f7a5421f3d1f7b0d4a8c..f0aa09e8712b14d61160b16073cac5fbd0276038"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-insert-test",
@@ -33,9 +51,21 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "1ac3dd727429b94a67241d8941f5360892a30fae",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index 761aa7a..3b33406 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -1,5 +1,3 @@",
+        "-/*",
+        "- * This is a method",
+        "-*/",
+        "+// This is a property",
+        " // This is a property",
+        " // This is a property"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "722ca07f3cc31c8d961494547fab727ec588e3d8"
+    "shas": "f0aa09e8712b14d61160b16073cac5fbd0276038..9402b254de81dabcddcbd6d7308911822b6f0f59"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-test",
@@ -46,9 +76,21 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "722ca07f3cc31c8d961494547fab727ec588e3d8",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index 3b33406..761aa7a 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -1,3 +1,5 @@",
+        "-// This is a property",
+        "+/*",
+        "+ * This is a method",
+        "+*/",
+        " // This is a property",
+        " // This is a property"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ddbe0bb45770aad94db0b3db41bb85c6cf8667ea"
+    "shas": "9402b254de81dabcddcbd6d7308911822b6f0f59..ba788116c40403584cd03df9976350810a9b1162"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-replacement-test",
@@ -59,9 +101,21 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "ddbe0bb45770aad94db0b3db41bb85c6cf8667ea",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index 761aa7a..c2a8148 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -1,5 +1,4 @@",
+        "+// This is a property",
+        " /*",
+        "  * This is a method",
+        " */",
+        "-// This is a property",
+        "-// This is a property"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "16f46467d4d4394f04d1098d53f86503eb75c645"
+    "shas": "ba788116c40403584cd03df9976350810a9b1162..05a2041be1630b8a7309163d4b863cd8966adbe0"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-test",
@@ -72,9 +126,19 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "16f46467d4d4394f04d1098d53f86503eb75c645",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index c2a8148..7c74dcd 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -1,4 +1,3 @@",
+        "-// This is a property",
+        " /*",
+        "  * This is a method",
+        " */"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9be6ce33b023b9caecb8a2b0d01d7b040aa4da21"
+    "shas": "05a2041be1630b8a7309163d4b863cd8966adbe0..28ae9fb48ab99b60a709d3168a82f53017fa27a0"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-rest-test",
@@ -85,7 +149,16 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "9be6ce33b023b9caecb8a2b0d01d7b040aa4da21",
+    "patch": [
+        "diff --git a/comment.js b/comment.js",
+        "index 7c74dcd..e69de29 100644",
+        "--- a/comment.js",
+        "+++ b/comment.js",
+        "@@ -1,3 +0,0 @@",
+        "-/*",
+        "- * This is a method",
+        "-*/"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3061e328305d93ca2fd3a8aa7a86d645c4c28b15"
+    "shas": "28ae9fb48ab99b60a709d3168a82f53017fa27a0..8f7edd21ecef61769b82fb5a60a881f31ce30a01"
 }]

test/corpus/diff-summaries/javascript/constructor-call.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "3bd8ebcbe86dd538120a517b6420d768e8ce2b4c",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index e69de29..9d723b9 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -0,0 +1 @@",
+        "+new module.Klass(1, \"two\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ce70ddd02a33da6279c6bf17d449df82c8832841"
+    "shas": "b1ed87edc6bf561edc524058ab781a95970a3258..692f777ed1db0b3284bd2728f6c651425e20ab34"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "ce70ddd02a33da6279c6bf17d449df82c8832841",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index 9d723b9..2c91b11 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -1 +1,3 @@",
+        "+new module.Klass(1, \"three\");",
+        "+new module.Klass(1, \"two\");",
+        " new module.Klass(1, \"two\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8487448225b5505389343c8393596e17ce1a54e8"
+    "shas": "692f777ed1db0b3284bd2728f6c651425e20ab34..e4d96364ed5caab5be836020193ea527a6cd6e55"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "8487448225b5505389343c8393596e17ce1a54e8",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index 2c91b11..892f542 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -1,3 +1,3 @@",
+        "-new module.Klass(1, \"three\");",
+        "+new module.Klass(1, \"two\");",
+        " new module.Klass(1, \"two\");",
+        " new module.Klass(1, \"two\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0eba0fb788d00016c7515ce5c38c413191448474"
+    "shas": "e4d96364ed5caab5be836020193ea527a6cd6e55..c5f5c7389717f787423d9698a3e0593a965ffbd5"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "0eba0fb788d00016c7515ce5c38c413191448474",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index 892f542..2c91b11 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -1,3 +1,3 @@",
+        "-new module.Klass(1, \"two\");",
+        "+new module.Klass(1, \"three\");",
+        " new module.Klass(1, \"two\");",
+        " new module.Klass(1, \"two\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c1e0930ce2d9e9d05f967ee7857e1a8b7e80b9a2"
+    "shas": "c5f5c7389717f787423d9698a3e0593a965ffbd5..d17799b023d4e85c6e1d97220121da96a1323970"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "c1e0930ce2d9e9d05f967ee7857e1a8b7e80b9a2",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index 2c91b11..cd77b98 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -1,3 +1,2 @@",
+        "-new module.Klass(1, \"three\");",
+        "-new module.Klass(1, \"two\");",
+        " new module.Klass(1, \"two\");",
+        "+new module.Klass(1, \"three\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "723818ee1046fdbb4aed30a93ec6cc212062fdcd"
+    "shas": "d17799b023d4e85c6e1d97220121da96a1323970..ddc3d491ed287b5aee714bedf5c2de5ba46770ce"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "723818ee1046fdbb4aed30a93ec6cc212062fdcd",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index cd77b98..75f6a29 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -1,2 +1 @@",
+        "-new module.Klass(1, \"two\");",
+        " new module.Klass(1, \"three\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5899cfa5983c7be3dc0c389ca1d0288fb608e98b"
+    "shas": "ddc3d491ed287b5aee714bedf5c2de5ba46770ce..e0a37e9237220e1382c4502fdfbbb4cc10cf04e0"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "5899cfa5983c7be3dc0c389ca1d0288fb608e98b",
+    "patch": [
+        "diff --git a/constructor-call.js b/constructor-call.js",
+        "index 75f6a29..e69de29 100644",
+        "--- a/constructor-call.js",
+        "+++ b/constructor-call.js",
+        "@@ -1 +0,0 @@",
+        "-new module.Klass(1, \"three\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "012105d0edaef241c26098d6e1680dab22bacbbc"
+    "shas": "e0a37e9237220e1382c4502fdfbbb4cc10cf04e0..41ab7cb7dc378bf229f7a08f1a03c0676483f435"
 }]

test/corpus/diff-summaries/javascript/delete-operator.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "979a03e21696fd6d2f5ef3c8c8e7473810cfc7c9",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index e69de29..c83346d 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -0,0 +1 @@",
+        "+delete thing['prop'];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b2de3290891a273baacbb28e1b384ac0f6e791ac"
+    "shas": "b5645de0a9c0002d8f44d302c200dd88ff113f52..d1aaae4cff971b6bd6647c77427eab5789728dea"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "b2de3290891a273baacbb28e1b384ac0f6e791ac",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index c83346d..7c8b990 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -1 +1,3 @@",
+        "+delete thing.prop",
+        "+delete thing['prop'];",
+        " delete thing['prop'];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c15e1d0affd79055bf356a9576a0ccda17249a6f"
+    "shas": "d1aaae4cff971b6bd6647c77427eab5789728dea..6444b777c04540c4e0229617aaadcf274dbe092f"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "c15e1d0affd79055bf356a9576a0ccda17249a6f",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index 7c8b990..f506e36 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-delete thing.prop",
+        "+delete thing['prop'];",
+        " delete thing['prop'];",
+        " delete thing['prop'];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "947df4dfc78c0a7a15d61a245059d9cc66e52823"
+    "shas": "6444b777c04540c4e0229617aaadcf274dbe092f..ce69f237ff3cf767d8814435ffa957dadfeafa37"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "947df4dfc78c0a7a15d61a245059d9cc66e52823",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index f506e36..7c8b990 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-delete thing['prop'];",
+        "+delete thing.prop",
+        " delete thing['prop'];",
+        " delete thing['prop'];"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f1f49151fc821413654af49d74417c7b200bbb46"
+    "shas": "ce69f237ff3cf767d8814435ffa957dadfeafa37..71f7d6db03225cbfcc31f2bbd6ab589e9183c55c"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "f1f49151fc821413654af49d74417c7b200bbb46",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index 7c8b990..2dfe079 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -1,3 +1,2 @@",
+        "-delete thing.prop",
+        "-delete thing['prop'];",
+        " delete thing['prop'];",
+        "+delete thing.prop"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9f515bdf829eb8bc34256b20f43923933e001f30"
+    "shas": "71f7d6db03225cbfcc31f2bbd6ab589e9183c55c..629c83e185f6ed3c97976cc604dfb3c5f455c11b"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "9f515bdf829eb8bc34256b20f43923933e001f30",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index 2dfe079..9d68dfb 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -1,2 +1 @@",
+        "-delete thing['prop'];",
+        " delete thing.prop"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9c59c645ed8417f8fd39ce4094a07c7fcdc009c3"
+    "shas": "629c83e185f6ed3c97976cc604dfb3c5f455c11b..cf1e4c5bef7af55d4866d7be93a24a523edbbf4f"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "9c59c645ed8417f8fd39ce4094a07c7fcdc009c3",
+    "patch": [
+        "diff --git a/delete-operator.js b/delete-operator.js",
+        "index 9d68dfb..e69de29 100644",
+        "--- a/delete-operator.js",
+        "+++ b/delete-operator.js",
+        "@@ -1 +0,0 @@",
+        "-delete thing.prop"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "003fa853280eb9156b63626be54039b1bc67ea49"
+    "shas": "cf1e4c5bef7af55d4866d7be93a24a523edbbf4f..56f88d5286e94da2b11b7f6d0a35aa836d4f5921"
 }]

test/corpus/diff-summaries/javascript/do-while-statement.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "ec8ba8297edb4d6d8dbc00d6f028116e0b58abe8",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index e69de29..d1ec804 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -0,0 +1 @@",
+        "+do { console.log(insert); } while (true);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "33549ab5882710be4c88bcfdf659400ce67f5c1d"
+    "shas": "cd322134775da8db98f5a151ec8e2f5d9eddd3cf..2b58702fac7ff187b0f41a31b6fae16718c0ec4c"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "33549ab5882710be4c88bcfdf659400ce67f5c1d",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index d1ec804..d9a410d 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -1 +1,3 @@",
+        "+do { console.log(replacement); } while (false);",
+        "+do { console.log(insert); } while (true);",
+        " do { console.log(insert); } while (true);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "969fbb30a28a983aaea07a0caf168258283b9e01"
+    "shas": "2b58702fac7ff187b0f41a31b6fae16718c0ec4c..fa2041b0ae98229dc1322fda8ebaa2d98dd4b1f7"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-insert-test",
@@ -141,9 +157,19 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "969fbb30a28a983aaea07a0caf168258283b9e01",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index d9a410d..4197835 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-do { console.log(replacement); } while (false);",
+        "+do { console.log(insert); } while (true);",
+        " do { console.log(insert); } while (true);",
+        " do { console.log(insert); } while (true);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b568ea7e0a262c3819571cb8b2b2286eb182583c"
+    "shas": "fa2041b0ae98229dc1322fda8ebaa2d98dd4b1f7..c7d0a76295cd609ed29a5c857ff2d885eefb3610"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-test",
@@ -211,9 +237,19 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "b568ea7e0a262c3819571cb8b2b2286eb182583c",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index 4197835..d9a410d 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-do { console.log(insert); } while (true);",
+        "+do { console.log(replacement); } while (false);",
+        " do { console.log(insert); } while (true);",
+        " do { console.log(insert); } while (true);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4ae8d06981390b10da59e0f4c795f7d62606283e"
+    "shas": "c7d0a76295cd609ed29a5c857ff2d885eefb3610..8887ecec6e5dc8852e1f29ffe74c0b79c304e04e"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-replacement-test",
@@ -272,9 +308,19 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "4ae8d06981390b10da59e0f4c795f7d62606283e",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index d9a410d..c5291b4 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -1,3 +1,2 @@",
+        "-do { console.log(replacement); } while (false);",
+        "-do { console.log(insert); } while (true);",
+        " do { console.log(insert); } while (true);",
+        "+do { console.log(replacement); } while (false);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f79ad68ff3a0efaed28e9aa75314d2f4705de647"
+    "shas": "8887ecec6e5dc8852e1f29ffe74c0b79c304e04e..888367feff9a28c449258cd99afd8ac90e069f76"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-test",
@@ -303,9 +349,17 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "f79ad68ff3a0efaed28e9aa75314d2f4705de647",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index c5291b4..6085cb1 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -1,2 +1 @@",
+        "-do { console.log(insert); } while (true);",
+        " do { console.log(replacement); } while (false);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7472b66a363abaae79b52faab6dff2465746424d"
+    "shas": "888367feff9a28c449258cd99afd8ac90e069f76..622706434ac7e362f28c08d79f7d8302ec086757"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-rest-test",
@@ -334,7 +388,14 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "7472b66a363abaae79b52faab6dff2465746424d",
+    "patch": [
+        "diff --git a/do-while-statement.js b/do-while-statement.js",
+        "index 6085cb1..e69de29 100644",
+        "--- a/do-while-statement.js",
+        "+++ b/do-while-statement.js",
+        "@@ -1 +0,0 @@",
+        "-do { console.log(replacement); } while (false);"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1c17753ae9931d9d5b151bab4498c78c5b31c6c1"
+    "shas": "622706434ac7e362f28c08d79f7d8302ec086757..2795ba48a13af4b2c6f240761fd880dc6cd10c2b"
 }]

test/corpus/diff-summaries/javascript/export.json

@@ -175,9 +175,26 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "7b67ddbc527cc15d1cbac33725dc0c4d79472c8c",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index e69de29..dcd9320 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -0,0 +1,11 @@",
+        "+export { name1, name2, name3, nameN };",
+        "+export { variable1 as name1, variable2 as name2, nameN };",
+        "+export let name1, name2, nameN;",
+        "+export let name1 = value1, name2 = value2, name3, nameN;",
+        "+export default namedFunction;",
+        "+export default function () { };",
+        "+export default function name1() { };",
+        "+export { name1 as default };",
+        "+export * from 'foo';",
+        "+export { name1, name2, nameN } from 'foo';",
+        "+export { import1 as name1, import2 as name2, nameN } from 'bar';"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cd9386b43e1ada367135a44899e2043964488f66"
+    "shas": "0eb14098d9cfc48fe7ffb44e37c71cb6cb58c878..5e2e89a442ac0f099046b72d57acaa03dc011ed9"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-insert-test",
@@ -521,9 +538,40 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "cd9386b43e1ada367135a44899e2043964488f66",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index dcd9320..c8b53ff 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -1,3 +1,25 @@",
+        "+export { name4, name5, name6, nameZ };",
+        "+export { variable2 as name2, variable3 as name3, nameY };",
+        "+export let name3, name4, nameT;",
+        "+export let name2 = value2, name3 = value3, name4, nameO;",
+        "+export default otherNamedFunction;",
+        "+export default function newName1() {};",
+        "+export default function () {};",
+        "+export { name2 as statement };",
+        "+export * from 'baz';",
+        "+export { name7, name8, nameP } from 'buzz';",
+        "+export { import6 as name6, import7 as name7, nameB } from 'fizz';",
+        "+export { name1, name2, name3, nameN };",
+        "+export { variable1 as name1, variable2 as name2, nameN };",
+        "+export let name1, name2, nameN;",
+        "+export let name1 = value1, name2 = value2, name3, nameN;",
+        "+export default namedFunction;",
+        "+export default function () { };",
+        "+export default function name1() { };",
+        "+export { name1 as default };",
+        "+export * from 'foo';",
+        "+export { name1, name2, nameN } from 'foo';",
+        "+export { import1 as name1, import2 as name2, nameN } from 'bar';",
+        " export { name1, name2, name3, nameN };",
+        " export { variable1 as name1, variable2 as name2, nameN };",
+        " export let name1, name2, nameN;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5960bd1b757244b4df82cae4bceabe2055ac9c04"
+    "shas": "5e2e89a442ac0f099046b72d57acaa03dc011ed9..9e81bf04d8f7a930fb0a612fc5230af600c7c5d2"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-insert-test",
@@ -1254,9 +1302,40 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "5960bd1b757244b4df82cae4bceabe2055ac9c04",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index c8b53ff..ad3f21a 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -1,14 +1,14 @@",
+        "-export { name4, name5, name6, nameZ };",
+        "-export { variable2 as name2, variable3 as name3, nameY };",
+        "-export let name3, name4, nameT;",
+        "-export let name2 = value2, name3 = value3, name4, nameO;",
+        "-export default otherNamedFunction;",
+        "-export default function newName1() {};",
+        "-export default function () {};",
+        "-export { name2 as statement };",
+        "-export * from 'baz';",
+        "-export { name7, name8, nameP } from 'buzz';",
+        "-export { import6 as name6, import7 as name7, nameB } from 'fizz';",
+        "+export { name1, name2, name3, nameN };",
+        "+export { variable1 as name1, variable2 as name2, nameN };",
+        "+export let name1, name2, nameN;",
+        "+export let name1 = value1, name2 = value2, name3, nameN;",
+        "+export default namedFunction;",
+        "+export default function () { };",
+        "+export default function name1() { };",
+        "+export { name1 as default };",
+        "+export * from 'foo';",
+        "+export { name1, name2, nameN } from 'foo';",
+        "+export { import1 as name1, import2 as name2, nameN } from 'bar';",
+        " export { name1, name2, name3, nameN };",
+        " export { variable1 as name1, variable2 as name2, nameN };",
+        " export let name1, name2, nameN;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3e09142eeccf41374af934cc1a492e1660a202be"
+    "shas": "9e81bf04d8f7a930fb0a612fc5230af600c7c5d2..d1bc421a42e531d555179f1135e64e9f19d57095"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-test",
@@ -1678,9 +1757,40 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "3e09142eeccf41374af934cc1a492e1660a202be",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index ad3f21a..c8b53ff 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -1,14 +1,14 @@",
+        "-export { name1, name2, name3, nameN };",
+        "-export { variable1 as name1, variable2 as name2, nameN };",
+        "-export let name1, name2, nameN;",
+        "-export let name1 = value1, name2 = value2, name3, nameN;",
+        "-export default namedFunction;",
+        "-export default function () { };",
+        "-export default function name1() { };",
+        "-export { name1 as default };",
+        "-export * from 'foo';",
+        "-export { name1, name2, nameN } from 'foo';",
+        "-export { import1 as name1, import2 as name2, nameN } from 'bar';",
+        "+export { name4, name5, name6, nameZ };",
+        "+export { variable2 as name2, variable3 as name3, nameY };",
+        "+export let name3, name4, nameT;",
+        "+export let name2 = value2, name3 = value3, name4, nameO;",
+        "+export default otherNamedFunction;",
+        "+export default function newName1() {};",
+        "+export default function () {};",
+        "+export { name2 as statement };",
+        "+export * from 'baz';",
+        "+export { name7, name8, nameP } from 'buzz';",
+        "+export { import6 as name6, import7 as name7, nameB } from 'fizz';",
+        " export { name1, name2, name3, nameN };",
+        " export { variable1 as name1, variable2 as name2, nameN };",
+        " export let name1, name2, nameN;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b1d4ad7f530f1b762b1a4fc4f4d7597666b3f4ec"
+    "shas": "d1bc421a42e531d555179f1135e64e9f19d57095..61d845cfdc6aaaba0c4fa01fb8ca41f79556ac37"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-replacement-test",
@@ -2189,9 +2299,55 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "b1d4ad7f530f1b762b1a4fc4f4d7597666b3f4ec",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index c8b53ff..281c672 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -1,25 +1,3 @@",
+        "-export { name4, name5, name6, nameZ };",
+        "-export { variable2 as name2, variable3 as name3, nameY };",
+        "-export let name3, name4, nameT;",
+        "-export let name2 = value2, name3 = value3, name4, nameO;",
+        "-export default otherNamedFunction;",
+        "-export default function newName1() {};",
+        "-export default function () {};",
+        "-export { name2 as statement };",
+        "-export * from 'baz';",
+        "-export { name7, name8, nameP } from 'buzz';",
+        "-export { import6 as name6, import7 as name7, nameB } from 'fizz';",
+        "-export { name1, name2, name3, nameN };",
+        "-export { variable1 as name1, variable2 as name2, nameN };",
+        "-export let name1, name2, nameN;",
+        "-export let name1 = value1, name2 = value2, name3, nameN;",
+        "-export default namedFunction;",
+        "-export default function () { };",
+        "-export default function name1() { };",
+        "-export { name1 as default };",
+        "-export * from 'foo';",
+        "-export { name1, name2, nameN } from 'foo';",
+        "-export { import1 as name1, import2 as name2, nameN } from 'bar';",
+        " export { name1, name2, name3, nameN };",
+        " export { variable1 as name1, variable2 as name2, nameN };",
+        " export let name1, name2, nameN;",
+        "@@ -31,3 +9,14 @@ export { name1 as default };",
+        " export * from 'foo';",
+        " export { name1, name2, nameN } from 'foo';",
+        " export { import1 as name1, import2 as name2, nameN } from 'bar';",
+        "+export { name4, name5, name6, nameZ };",
+        "+export { variable2 as name2, variable3 as name3, nameY };",
+        "+export let name3, name4, nameT;",
+        "+export let name2 = value2, name3 = value3, name4, nameO;",
+        "+export default otherNamedFunction;",
+        "+export default function newName1() {};",
+        "+export default function () {};",
+        "+export { name2 as statement };",
+        "+export * from 'baz';",
+        "+export { name7, name8, nameP } from 'buzz';",
+        "+export { import6 as name6, import7 as name7, nameB } from 'fizz';"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ef3fc45439ff4e4a2a491636770addcee77c5796"
+    "shas": "61d845cfdc6aaaba0c4fa01fb8ca41f79556ac37..06bbce70f8962416f84a41ea00019bfb28b73bf9"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-test",
@@ -2370,9 +2526,29 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "ef3fc45439ff4e4a2a491636770addcee77c5796",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index 281c672..e105ba7 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -1,14 +1,3 @@",
+        "-export { name1, name2, name3, nameN };",
+        "-export { variable1 as name1, variable2 as name2, nameN };",
+        "-export let name1, name2, nameN;",
+        "-export let name1 = value1, name2 = value2, name3, nameN;",
+        "-export default namedFunction;",
+        "-export default function () { };",
+        "-export default function name1() { };",
+        "-export { name1 as default };",
+        "-export * from 'foo';",
+        "-export { name1, name2, nameN } from 'foo';",
+        "-export { import1 as name1, import2 as name2, nameN } from 'bar';",
+        " export { name4, name5, name6, nameZ };",
+        " export { variable2 as name2, variable3 as name3, nameY };",
+        " export let name3, name4, nameT;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b108c428f25f1605b690e84daa6f1c8afbcb8466"
+    "shas": "06bbce70f8962416f84a41ea00019bfb28b73bf9..d1daa5ccf312ddb7b243f8adf15955fac3df1d63"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-rest-test",
@@ -2551,7 +2727,24 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "b108c428f25f1605b690e84daa6f1c8afbcb8466",
+    "patch": [
+        "diff --git a/export.js b/export.js",
+        "index e105ba7..e69de29 100644",
+        "--- a/export.js",
+        "+++ b/export.js",
+        "@@ -1,11 +0,0 @@",
+        "-export { name4, name5, name6, nameZ };",
+        "-export { variable2 as name2, variable3 as name3, nameY };",
+        "-export let name3, name4, nameT;",
+        "-export let name2 = value2, name3 = value3, name4, nameO;",
+        "-export default otherNamedFunction;",
+        "-export default function newName1() {};",
+        "-export default function () {};",
+        "-export { name2 as statement };",
+        "-export * from 'baz';",
+        "-export { name7, name8, nameP } from 'buzz';",
+        "-export { import6 as name6, import7 as name7, nameB } from 'fizz';"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ddc540ac245ab0b5fd645525c53e4326f07dd253"
+    "shas": "d1daa5ccf312ddb7b243f8adf15955fac3df1d63..925b73e9fde76236d0b037d687edcc925a5cef9a"
 }]

test/corpus/diff-summaries/javascript/false.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "04aded71e587d0bada2c50fd567023d9de7f477c",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index e69de29..8a63946 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -0,0 +1 @@",
+        "+false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "74941c080527d8accd5c74955fd31110e7be5509"
+    "shas": "a56c14e19dec2910d36460e4fca6496da46f6240..6b1a30d6be2d43907c3a1faf581db6c9fe6cc88a"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "74941c080527d8accd5c74955fd31110e7be5509",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index 8a63946..86574b1 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -1 +1,3 @@",
+        "+return false;",
+        "+false;",
+        " false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ef20d47afcee8970df0617a652b700e2ea002d85"
+    "shas": "6b1a30d6be2d43907c3a1faf581db6c9fe6cc88a..122e0fae24e99d4f534bb461d9d5fa2900c70e55"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-insert-test",
@@ -117,9 +133,19 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "ef20d47afcee8970df0617a652b700e2ea002d85",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index 86574b1..7bae7c5 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -1,3 +1,3 @@",
+        "-return false;",
+        "+false;",
+        " false;",
+        " false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c5ca8f1fedc05537db6d2a923dc63933396e1bc3"
+    "shas": "122e0fae24e99d4f534bb461d9d5fa2900c70e55..6d5ec0ada3f32284c9922934304c708333da7e1f"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-test",
@@ -163,9 +189,19 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "c5ca8f1fedc05537db6d2a923dc63933396e1bc3",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index 7bae7c5..86574b1 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -1,3 +1,3 @@",
+        "-false;",
+        "+return false;",
+        " false;",
+        " false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "38316340683de061a83087c8aa02ae1abbb37479"
+    "shas": "6d5ec0ada3f32284c9922934304c708333da7e1f..7291f772ca242bae0a92ab87c1ab6ec2be28d4c1"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-replacement-test",
@@ -224,9 +260,19 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "38316340683de061a83087c8aa02ae1abbb37479",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index 86574b1..85b5be9 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -1,3 +1,2 @@",
+        "-return false;",
+        "-false;",
+        " false;",
+        "+return false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3e4d9841d8064e0e35fb4b0fb5a6240ac7f538e6"
+    "shas": "7291f772ca242bae0a92ab87c1ab6ec2be28d4c1..018e3b49010dd5359d8071f4a856b6ccef409645"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-test",
@@ -255,9 +301,17 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "3e4d9841d8064e0e35fb4b0fb5a6240ac7f538e6",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index 85b5be9..1f328b3 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -1,2 +1 @@",
+        "-false;",
+        " return false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7bee29b9f6ea9ffdaf9141f171828b9e5a3b4e47"
+    "shas": "018e3b49010dd5359d8071f4a856b6ccef409645..bda912eec94150ac764d032b1243ec8dba01f3f0"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-rest-test",
@@ -286,7 +340,14 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "7bee29b9f6ea9ffdaf9141f171828b9e5a3b4e47",
+    "patch": [
+        "diff --git a/false.js b/false.js",
+        "index 1f328b3..e69de29 100644",
+        "--- a/false.js",
+        "+++ b/false.js",
+        "@@ -1 +0,0 @@",
+        "-return false;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "559546b09a86fffc79e8283d8f7567d491c07e90"
+    "shas": "bda912eec94150ac764d032b1243ec8dba01f3f0..f6dfeb42af9db740677fd60341ea39da711f7c81"
 }]

test/corpus/diff-summaries/javascript/for-in-statement.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "59c52a0ddb5e652e5b5108d0724541989a6d83aa",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index e69de29..f928287 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -0,0 +1 @@",
+        "+for (thing in things) { thing(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "29b666fa2472eecf7b9d073a0293fc0d86cbee77"
+    "shas": "75f87f22428c68545ebb3f876a1b09caf59d75c9..1d91306ffc69509679ae514ecc2a3403dc94aefb"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "29b666fa2472eecf7b9d073a0293fc0d86cbee77",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index f928287..4a482e9 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -1 +1,3 @@",
+        "+for (item in items) { item(); }",
+        "+for (thing in things) { thing(); }",
+        " for (thing in things) { thing(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b7391d72e98da90810b11a4ac0ed9027c4ddec08"
+    "shas": "1d91306ffc69509679ae514ecc2a3403dc94aefb..2f951d1d02db4475f786a87f7077648822ef26d3"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-insert-test",
@@ -168,9 +184,19 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "b7391d72e98da90810b11a4ac0ed9027c4ddec08",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index 4a482e9..e949baf 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (item in items) { item(); }",
+        "+for (thing in things) { thing(); }",
+        " for (thing in things) { thing(); }",
+        " for (thing in things) { thing(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "02ace41153aabc248b4f4c3bbe70edd6cf930933"
+    "shas": "2f951d1d02db4475f786a87f7077648822ef26d3..31f13f455d1c9d9efae42c7695abae57acf4684a"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-test",
@@ -265,9 +291,19 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "02ace41153aabc248b4f4c3bbe70edd6cf930933",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index e949baf..4a482e9 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (thing in things) { thing(); }",
+        "+for (item in items) { item(); }",
+        " for (thing in things) { thing(); }",
+        " for (thing in things) { thing(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "843d56f80f3f9e2e7f2940b4f9382415fb00907c"
+    "shas": "31f13f455d1c9d9efae42c7695abae57acf4684a..20bf2c4356e71329f5e131bec7be78669308acc8"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-replacement-test",
@@ -326,9 +362,19 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "843d56f80f3f9e2e7f2940b4f9382415fb00907c",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index 4a482e9..6b5f12a 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -1,3 +1,2 @@",
+        "-for (item in items) { item(); }",
+        "-for (thing in things) { thing(); }",
+        " for (thing in things) { thing(); }",
+        "+for (item in items) { item(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0d0d6478c7e57258561455f0ce7b3d3f416f5ae5"
+    "shas": "20bf2c4356e71329f5e131bec7be78669308acc8..cc6e8abe393b4d3c5e2b919a60c832b78ad0a4cd"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-test",
@@ -357,9 +403,17 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "0d0d6478c7e57258561455f0ce7b3d3f416f5ae5",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index 6b5f12a..a3d8882 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -1,2 +1 @@",
+        "-for (thing in things) { thing(); }",
+        " for (item in items) { item(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "90c8a228bd3e7b8106f7a6461b376abc0055ec37"
+    "shas": "cc6e8abe393b4d3c5e2b919a60c832b78ad0a4cd..71a7b11ea45ba6cae99bbc5d1bdad0c7eb526a3b"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-rest-test",
@@ -388,7 +442,14 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "90c8a228bd3e7b8106f7a6461b376abc0055ec37",
+    "patch": [
+        "diff --git a/for-in-statement.js b/for-in-statement.js",
+        "index a3d8882..e69de29 100644",
+        "--- a/for-in-statement.js",
+        "+++ b/for-in-statement.js",
+        "@@ -1 +0,0 @@",
+        "-for (item in items) { item(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d2246a50ed33ef4c748bfdaf80bbf4eb41cc6c57"
+    "shas": "71a7b11ea45ba6cae99bbc5d1bdad0c7eb526a3b..d1b2bee18a7da4fefa2a4786b2f692fc5795f48c"
 }]

test/corpus/diff-summaries/javascript/for-loop-with-in-statement.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "d42f86b317b470d5207108107a9710b5a66b7693",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index e69de29..c467478 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -0,0 +1 @@",
+        "+for (key in something && i = 0; i < n; i++) { doSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "71e0fa7e41a874b0a5d718c95f074ace55cc9232"
+    "shas": "1c2dbb18fb6fc930b3d0e6bb31a559a853be5c63..974a2623d96129b8a5eb74659c0040931fe6597a"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "71e0fa7e41a874b0a5d718c95f074ace55cc9232",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index c467478..0147d31 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -1 +1,3 @@",
+        "+for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }",
+        "+for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        " for (key in something && i = 0; i < n; i++) { doSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6bac9b37cf2cf093c337582d9de14afa128fed17"
+    "shas": "974a2623d96129b8a5eb74659c0040931fe6597a..37f9b64351b20f87cdd2d65e794e8b43ea684959"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-insert-test",
@@ -141,9 +157,19 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "6bac9b37cf2cf093c337582d9de14afa128fed17",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index 0147d31..306fa88 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }",
+        "+for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        " for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        " for (key in something && i = 0; i < n; i++) { doSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "149bca27f95242b5072ce36f019f298a300f97d3"
+    "shas": "37f9b64351b20f87cdd2d65e794e8b43ea684959..639c4e9d99aa30a48f0403a42eaf81f85a194e22"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-test",
@@ -211,9 +237,19 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "149bca27f95242b5072ce36f019f298a300f97d3",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index 306fa88..0147d31 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        "+for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }",
+        " for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        " for (key in something && i = 0; i < n; i++) { doSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0a7c075c24681bfa818dffe5a91a41c59d533fcc"
+    "shas": "639c4e9d99aa30a48f0403a42eaf81f85a194e22..8d475ef797fcd08a47c73f033c305642c4279115"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-replacement-test",
@@ -272,9 +308,19 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "0a7c075c24681bfa818dffe5a91a41c59d533fcc",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index 0147d31..f23fa31 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -1,3 +1,2 @@",
+        "-for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }",
+        "-for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        " for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        "+for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9ecf6acc87328e9ca74836a467411d20838ceeae"
+    "shas": "8d475ef797fcd08a47c73f033c305642c4279115..d2051aee8f163a567cf3a5ff4060579795e0a2a1"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-test",
@@ -303,9 +349,17 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "9ecf6acc87328e9ca74836a467411d20838ceeae",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index f23fa31..e968160 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -1,2 +1 @@",
+        "-for (key in something && i = 0; i < n; i++) { doSomething(); }",
+        " for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e1f719858553a9e12274fec57ae67a38a67719b3"
+    "shas": "d2051aee8f163a567cf3a5ff4060579795e0a2a1..068a5eccf07c8be3b3a95d6eceadf7062d7b942d"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-rest-test",
@@ -334,7 +388,14 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "e1f719858553a9e12274fec57ae67a38a67719b3",
+    "patch": [
+        "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
+        "index e968160..e69de29 100644",
+        "--- a/for-loop-with-in-statement.js",
+        "+++ b/for-loop-with-in-statement.js",
+        "@@ -1 +0,0 @@",
+        "-for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f9d31193b2e0de3664fd90baf4bf0f036eed7805"
+    "shas": "068a5eccf07c8be3b3a95d6eceadf7062d7b942d..9c2fa1f20200ecb26074ec348c75c13c22138f87"
 }]

test/corpus/diff-summaries/javascript/for-of-statement.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "f9d31193b2e0de3664fd90baf4bf0f036eed7805",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index e69de29..1ed2754 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -0,0 +1 @@",
+        "+for (let item of items) { process(item); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fdb12c1fe737ef373806b4986172a03007e238c1"
+    "shas": "9c2fa1f20200ecb26074ec348c75c13c22138f87..c46e44d842f77789f61d1f25221f0449f2d580c5"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "fdb12c1fe737ef373806b4986172a03007e238c1",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index 1ed2754..ab20ded 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -1 +1,3 @@",
+        "+for (let thing of things) { process(thing); };",
+        "+for (let item of items) { process(item); };",
+        " for (let item of items) { process(item); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "940950f103116ec45a222f21de8cdbcc49f48795"
+    "shas": "c46e44d842f77789f61d1f25221f0449f2d580c5..1c06836a9dafef9518b54b9409dc10e9e4402666"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-insert-test",
@@ -168,9 +184,19 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "940950f103116ec45a222f21de8cdbcc49f48795",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index ab20ded..19561a3 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (let thing of things) { process(thing); };",
+        "+for (let item of items) { process(item); };",
+        " for (let item of items) { process(item); };",
+        " for (let item of items) { process(item); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "682b758ed60acc11b5c83d746f3822ef9e4f870c"
+    "shas": "1c06836a9dafef9518b54b9409dc10e9e4402666..4c79ce75c12d7e2b77bd33d6f7e4f1d839ee88a8"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-test",
@@ -265,9 +291,19 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "682b758ed60acc11b5c83d746f3822ef9e4f870c",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index 19561a3..ab20ded 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (let item of items) { process(item); };",
+        "+for (let thing of things) { process(thing); };",
+        " for (let item of items) { process(item); };",
+        " for (let item of items) { process(item); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "661909ac91a22c549b5ba5e40a492192452e9126"
+    "shas": "4c79ce75c12d7e2b77bd33d6f7e4f1d839ee88a8..cd97645bfe60051a1bbd7a490394b00b6df48a7d"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-replacement-test",
@@ -326,9 +362,19 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "661909ac91a22c549b5ba5e40a492192452e9126",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index ab20ded..62db34f 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -1,3 +1,2 @@",
+        "-for (let thing of things) { process(thing); };",
+        "-for (let item of items) { process(item); };",
+        " for (let item of items) { process(item); };",
+        "+for (let thing of things) { process(thing); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9e29ecdff2b47416f53acc8e1acd4d51415dedf8"
+    "shas": "cd97645bfe60051a1bbd7a490394b00b6df48a7d..3fd962ae8d2bc510b50e7e85ef1ce4ad04375eb8"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-test",
@@ -357,9 +403,17 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "9e29ecdff2b47416f53acc8e1acd4d51415dedf8",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index 62db34f..5170ce4 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -1,2 +1 @@",
+        "-for (let item of items) { process(item); };",
+        " for (let thing of things) { process(thing); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "bbd14a09e7756c7f89efaaa9bfde692fcd16a0e2"
+    "shas": "3fd962ae8d2bc510b50e7e85ef1ce4ad04375eb8..821a3c7b8a7b00f8a8ad7967aed163a12f042d10"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-rest-test",
@@ -388,7 +442,14 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "bbd14a09e7756c7f89efaaa9bfde692fcd16a0e2",
+    "patch": [
+        "diff --git a/for-of-statement.js b/for-of-statement.js",
+        "index 5170ce4..e69de29 100644",
+        "--- a/for-of-statement.js",
+        "+++ b/for-of-statement.js",
+        "@@ -1 +0,0 @@",
+        "-for (let thing of things) { process(thing); };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a155a2bd652ca5aaa95ea8e31c7eac9662aa07f9"
+    "shas": "821a3c7b8a7b00f8a8ad7967aed163a12f042d10..0b1a50d075cdb5202c523f929502c24a9fce63ce"
 }]

test/corpus/diff-summaries/javascript/for-statement.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "3b37b1f1ec583cf921f87b304b606d12b388bcd5",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index e69de29..2f51258 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -0,0 +1 @@",
+        "+for (i = 0, init(); i < 10; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b871597febfb405a61f6fe7b2bc357fb03aeafe3"
+    "shas": "eaeb10729b105d290f4091fea5f04c34030bb5a5..40bfcf71debc3d20926578f5d788f319165ccdbb"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "b871597febfb405a61f6fe7b2bc357fb03aeafe3",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index 2f51258..095241f 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -1 +1,3 @@",
+        "+for (i = 0, init(); i < 100; i++) { log(i); }",
+        "+for (i = 0, init(); i < 10; i++) { log(i); }",
+        " for (i = 0, init(); i < 10; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9b1d937b78222de41c3c5144f67f075bb43e2c13"
+    "shas": "40bfcf71debc3d20926578f5d788f319165ccdbb..14acd05cf2f47feba3234c70af8afe86828370ce"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "9b1d937b78222de41c3c5144f67f075bb43e2c13",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index 095241f..9b0e26d 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (i = 0, init(); i < 100; i++) { log(i); }",
+        "+for (i = 0, init(); i < 10; i++) { log(i); }",
+        " for (i = 0, init(); i < 10; i++) { log(i); }",
+        " for (i = 0, init(); i < 10; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c650295f1ecd192eaeae937b7f6175202839a1ea"
+    "shas": "14acd05cf2f47feba3234c70af8afe86828370ce..26784319f5f567d3017095b6f9d0ca081043b817"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "c650295f1ecd192eaeae937b7f6175202839a1ea",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index 9b0e26d..095241f 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -1,3 +1,3 @@",
+        "-for (i = 0, init(); i < 10; i++) { log(i); }",
+        "+for (i = 0, init(); i < 100; i++) { log(i); }",
+        " for (i = 0, init(); i < 10; i++) { log(i); }",
+        " for (i = 0, init(); i < 10; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "92349c8f6582da8eee5c83e7e9d6a7e159b6bd79"
+    "shas": "26784319f5f567d3017095b6f9d0ca081043b817..5b15f8e9f8b68a8e4f4ba6ec6642a3cb37db7c60"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "92349c8f6582da8eee5c83e7e9d6a7e159b6bd79",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index 095241f..39af699 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -1,3 +1,2 @@",
+        "-for (i = 0, init(); i < 100; i++) { log(i); }",
+        "-for (i = 0, init(); i < 10; i++) { log(i); }",
+        " for (i = 0, init(); i < 10; i++) { log(i); }",
+        "+for (i = 0, init(); i < 100; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ba90f5edb467195216326c4f5da878084a2247c8"
+    "shas": "5b15f8e9f8b68a8e4f4ba6ec6642a3cb37db7c60..70806220f9fba3804c162aed68cdfcb25c39ff0a"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "ba90f5edb467195216326c4f5da878084a2247c8",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index 39af699..de8ae87 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -1,2 +1 @@",
+        "-for (i = 0, init(); i < 10; i++) { log(i); }",
+        " for (i = 0, init(); i < 100; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c20c08f9fc64911ac52a4f87ca4a60c7fb4c76b5"
+    "shas": "70806220f9fba3804c162aed68cdfcb25c39ff0a..9d01a0008d001fc966736db7d1583e0415da98fd"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "c20c08f9fc64911ac52a4f87ca4a60c7fb4c76b5",
+    "patch": [
+        "diff --git a/for-statement.js b/for-statement.js",
+        "index de8ae87..e69de29 100644",
+        "--- a/for-statement.js",
+        "+++ b/for-statement.js",
+        "@@ -1 +0,0 @@",
+        "-for (i = 0, init(); i < 100; i++) { log(i); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f5dfc0945ffae36e0f9784dcfeb8472344055afc"
+    "shas": "9d01a0008d001fc966736db7d1583e0415da98fd..10c888c0caabf36cb211a96640afbe435dfad3fb"
 }]

test/corpus/diff-summaries/javascript/function-call-args.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "6087206d2569a100e711f522134188e6f4477aec",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index e69de29..699333d 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -0,0 +1 @@",
+        "+someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2a33781a84e417f58c35f1842a5756a306d96e16"
+    "shas": "5d5d40b2fa515dfcb7494d9b83f22687c56de0f5..d2a8bcf4eb5c5193cb358f09a81b0239be2a84ad"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "2a33781a84e417f58c35f1842a5756a306d96e16",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index 699333d..3f4ee6e 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -1 +1,3 @@",
+        "+someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)",
+        "+someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "00cbc206ce3e849a4f008481a388fe2cd16cdab0"
+    "shas": "d2a8bcf4eb5c5193cb358f09a81b0239be2a84ad..539cee544c8600977bd76181a692ef4e27c4b759"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-insert-test",
@@ -249,9 +265,19 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "00cbc206ce3e849a4f008481a388fe2cd16cdab0",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index 3f4ee6e..dc419cb 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -1,3 +1,3 @@",
+        "-someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)",
+        "+someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fe0562a6af2ef816cd033495c6dab8a098e9abd1"
+    "shas": "539cee544c8600977bd76181a692ef4e27c4b759..f808e14f78dbe08885649be38dff25564f90fd98"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-test",
@@ -427,9 +453,19 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "fe0562a6af2ef816cd033495c6dab8a098e9abd1",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index dc419cb..3f4ee6e 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -1,3 +1,3 @@",
+        "-someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        "+someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)",
+        " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3ffd66b0af62a4993f1ec9cec204e476a4b8f571"
+    "shas": "f808e14f78dbe08885649be38dff25564f90fd98..6df8cc03d89ad9408f10b3e84a8168891e16c824"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-replacement-test",
@@ -488,9 +524,19 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "3ffd66b0af62a4993f1ec9cec204e476a4b8f571",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index 3f4ee6e..cae967b 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -1,3 +1,2 @@",
+        "-someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)",
+        "-someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        "+someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ee3a4e126eb1e8e72d6066c91087fb820fe81f81"
+    "shas": "6df8cc03d89ad9408f10b3e84a8168891e16c824..8fe5a2260c0258b29e266f904dcdb1dbe02d4c10"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-test",
@@ -519,9 +565,17 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "ee3a4e126eb1e8e72d6066c91087fb820fe81f81",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index cae967b..0d19573 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -1,2 +1 @@",
+        "-someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)",
+        " someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f68da3ce3086b28dbf986f818ff4e85b20f72a1c"
+    "shas": "8fe5a2260c0258b29e266f904dcdb1dbe02d4c10..657ddea03b3413ea6f2d4e8546403ec115769828"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-rest-test",
@@ -550,7 +604,14 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "f68da3ce3086b28dbf986f818ff4e85b20f72a1c",
+    "patch": [
+        "diff --git a/function-call-args.js b/function-call-args.js",
+        "index 0d19573..e69de29 100644",
+        "--- a/function-call-args.js",
+        "+++ b/function-call-args.js",
+        "@@ -1 +0,0 @@",
+        "-someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3bd8ebcbe86dd538120a517b6420d768e8ce2b4c"
+    "shas": "657ddea03b3413ea6f2d4e8546403ec115769828..b1ed87edc6bf561edc524058ab781a95970a3258"
 }]

test/corpus/diff-summaries/javascript/function-call.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "1a9472e94c365639f5f2b5c519a06c2daf17c630",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index e69de29..8bd95e0 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -0,0 +1 @@",
+        "+someFunction(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "aea81a7aab8e43746db84c917498d022cad8f88b"
+    "shas": "5ef42771e35b5af39f3befe137fedf40f174a5c7..00b36bff0934786a0071eff76e45c17c464e432a"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "aea81a7aab8e43746db84c917498d022cad8f88b",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index 8bd95e0..6bb4cf3 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -1 +1,3 @@",
+        "+someFunction(arg1, \"arg3\");",
+        "+someFunction(arg1, \"arg2\");",
+        " someFunction(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a665ddd2de9f0b3f6cb01dac3885746472685a02"
+    "shas": "00b36bff0934786a0071eff76e45c17c464e432a..520cba16d2faea8fd35a81086ea0a0b2405bf082"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "a665ddd2de9f0b3f6cb01dac3885746472685a02",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index 6bb4cf3..b38c232 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -1,3 +1,3 @@",
+        "-someFunction(arg1, \"arg3\");",
+        "+someFunction(arg1, \"arg2\");",
+        " someFunction(arg1, \"arg2\");",
+        " someFunction(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3c91447c23d8af65a9d5b3fdad3d2223dc9c9b8c"
+    "shas": "520cba16d2faea8fd35a81086ea0a0b2405bf082..8f84b861874020df6e144f16bbccb5221b1543e4"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "3c91447c23d8af65a9d5b3fdad3d2223dc9c9b8c",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index b38c232..6bb4cf3 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -1,3 +1,3 @@",
+        "-someFunction(arg1, \"arg2\");",
+        "+someFunction(arg1, \"arg3\");",
+        " someFunction(arg1, \"arg2\");",
+        " someFunction(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "92454603aeea12b9db63daaf4ff448a3ad866fc6"
+    "shas": "8f84b861874020df6e144f16bbccb5221b1543e4..718e8939aaef9685a140e371b050e8933450a215"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "92454603aeea12b9db63daaf4ff448a3ad866fc6",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index 6bb4cf3..3e15c6a 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -1,3 +1,2 @@",
+        "-someFunction(arg1, \"arg3\");",
+        "-someFunction(arg1, \"arg2\");",
+        " someFunction(arg1, \"arg2\");",
+        "+someFunction(arg1, \"arg3\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b5ba13c145b484c83750280711b5a8dbf9339b2a"
+    "shas": "718e8939aaef9685a140e371b050e8933450a215..35112398ed93567a624e79597194400f3a6ba5ed"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "b5ba13c145b484c83750280711b5a8dbf9339b2a",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index 3e15c6a..1add64b 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -1,2 +1 @@",
+        "-someFunction(arg1, \"arg2\");",
+        " someFunction(arg1, \"arg3\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "200d34900ee17186bda5fbf861a3960c8e0053e4"
+    "shas": "35112398ed93567a624e79597194400f3a6ba5ed..2928901cff45e08e275b3c7cc5559704326f2974"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "200d34900ee17186bda5fbf861a3960c8e0053e4",
+    "patch": [
+        "diff --git a/function-call.js b/function-call.js",
+        "index 1add64b..e69de29 100644",
+        "--- a/function-call.js",
+        "+++ b/function-call.js",
+        "@@ -1 +0,0 @@",
+        "-someFunction(arg1, \"arg3\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3a19dee8da1e0544c2cf975d850a6ce707912b35"
+    "shas": "2928901cff45e08e275b3c7cc5559704326f2974..f8662860eb083b9e95b5cc1c706a7872a4779532"
 }]

test/corpus/diff-summaries/javascript/function.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "e1f7c5a495d4e15d24ac325f6dec565f21f021e8",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index e69de29..2d8d739 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -0,0 +1 @@",
+        "+function(arg1, arg2) { arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "455ba4c6c459945e9e0b6573b760bfc01872bc8b"
+    "shas": "0bdf412036a9a6aea51108a20404c37541fffcfb..c76e13ba716fc18e9924e1f4675845f61823c9c7"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "455ba4c6c459945e9e0b6573b760bfc01872bc8b",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index 2d8d739..4389406 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -1 +1,3 @@",
+        "+function(arg1, arg2) { arg1; };",
+        "+function(arg1, arg2) { arg2; };",
+        " function(arg1, arg2) { arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e35bc26ef80c01c7cdb9df4798e88f65218ef8ce"
+    "shas": "c76e13ba716fc18e9924e1f4675845f61823c9c7..7c1485f22ad0c4bc98a22cdb8d341d2eb97fcab8"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "e35bc26ef80c01c7cdb9df4798e88f65218ef8ce",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index 4389406..924c99e 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function(arg1, arg2) { arg1; };",
+        "+function(arg1, arg2) { arg2; };",
+        " function(arg1, arg2) { arg2; };",
+        " function(arg1, arg2) { arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5af7a461ecb37a187cb4d0dd737515a509719343"
+    "shas": "7c1485f22ad0c4bc98a22cdb8d341d2eb97fcab8..9e13719e7c1614958c3528e609d7ac1cfb068fe6"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "5af7a461ecb37a187cb4d0dd737515a509719343",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index 924c99e..4389406 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function(arg1, arg2) { arg2; };",
+        "+function(arg1, arg2) { arg1; };",
+        " function(arg1, arg2) { arg2; };",
+        " function(arg1, arg2) { arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7fcdacc4180764cd579544563fe7d417836107fc"
+    "shas": "9e13719e7c1614958c3528e609d7ac1cfb068fe6..e36301a0b4cc27e38d4c77c49f97e1a6ba816fbb"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "7fcdacc4180764cd579544563fe7d417836107fc",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index 4389406..254dbcf 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -1,3 +1,2 @@",
+        "-function(arg1, arg2) { arg1; };",
+        "-function(arg1, arg2) { arg2; };",
+        " function(arg1, arg2) { arg2; };",
+        "+function(arg1, arg2) { arg1; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "835c69b492570d68dca9ae3872aa6b4b6a03711d"
+    "shas": "e36301a0b4cc27e38d4c77c49f97e1a6ba816fbb..fbc7371a528f691d2e0b43ceed413fab19186b82"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "835c69b492570d68dca9ae3872aa6b4b6a03711d",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index 254dbcf..b37e867 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -1,2 +1 @@",
+        "-function(arg1, arg2) { arg2; };",
+        " function(arg1, arg2) { arg1; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4dca254a8f7653c50a99376f33b14d25f8d8693c"
+    "shas": "fbc7371a528f691d2e0b43ceed413fab19186b82..dd37f0a24f8a677191eb11c1dad4119d46e35d14"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "4dca254a8f7653c50a99376f33b14d25f8d8693c",
+    "patch": [
+        "diff --git a/function.js b/function.js",
+        "index b37e867..e69de29 100644",
+        "--- a/function.js",
+        "+++ b/function.js",
+        "@@ -1 +0,0 @@",
+        "-function(arg1, arg2) { arg1; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1a65f6b31571ca180a7067af4efe0b804b5bd17f"
+    "shas": "dd37f0a24f8a677191eb11c1dad4119d46e35d14..d700dc51fee7a3dd557906dcdf46d426285d7955"
 }]

test/corpus/diff-summaries/javascript/generator-function.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "843b9d83e2acc3f1bf014abc4e2402e1a783d3f6",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index e69de29..04e8a59 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -0,0 +1 @@",
+        "+function *generateStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "586ddf785c2a8b750ab5e2e67d4e29b6881a7d11"
+    "shas": "5cab8720cde055f6d78f5c5deaf8980b89a434e1..8ff6dd40a182ab5500d976f04b8d0e919d045ddc"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "586ddf785c2a8b750ab5e2e67d4e29b6881a7d11",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index 04e8a59..ed5c037 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -1 +1,3 @@",
+        "+function *generateNewStuff(arg1, arg2) { yield; yield arg2; };",
+        "+function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9643e5115018e8e937c15f554ff18317207ec7f4"
+    "shas": "8ff6dd40a182ab5500d976f04b8d0e919d045ddc..e3273bce016747d95cbc043e14d23cda41b65129"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "9643e5115018e8e937c15f554ff18317207ec7f4",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index ed5c037..0895c3f 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function *generateNewStuff(arg1, arg2) { yield; yield arg2; };",
+        "+function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "25ab3575daed7a51443fda5100dd29edf156e2f8"
+    "shas": "e3273bce016747d95cbc043e14d23cda41b65129..3dd2a62eface3915c946a63ecef0c9134bf5b9be"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "25ab3575daed7a51443fda5100dd29edf156e2f8",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index 0895c3f..ed5c037 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -1,3 +1,3 @@",
+        "-function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        "+function *generateNewStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2913ec725e62b2faa79bab6d5e99d8b11ecd45c4"
+    "shas": "3dd2a62eface3915c946a63ecef0c9134bf5b9be..9a4d77ff9359a6c8fe9ab42d88157282b742e1be"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "2913ec725e62b2faa79bab6d5e99d8b11ecd45c4",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index ed5c037..1dae105 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -1,3 +1,2 @@",
+        "-function *generateNewStuff(arg1, arg2) { yield; yield arg2; };",
+        "-function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        "+function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4c912eda971c27f0ba64a9c4cc42508efcca09ad"
+    "shas": "9a4d77ff9359a6c8fe9ab42d88157282b742e1be..63a8b6f6c41bdd248590069ba8f59d53a3b0992f"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "4c912eda971c27f0ba64a9c4cc42508efcca09ad",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index 1dae105..5846d1c 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -1,2 +1 @@",
+        "-function *generateStuff(arg1, arg2) { yield; yield arg2; };",
+        " function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8565f60ebc7b85fb023e32db0bf098e5f9db48cf"
+    "shas": "63a8b6f6c41bdd248590069ba8f59d53a3b0992f..2087f684c9ba7fa39876477f2eacf8b9b12949fa"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "8565f60ebc7b85fb023e32db0bf098e5f9db48cf",
+    "patch": [
+        "diff --git a/generator-function.js b/generator-function.js",
+        "index 5846d1c..e69de29 100644",
+        "--- a/generator-function.js",
+        "+++ b/generator-function.js",
+        "@@ -1 +0,0 @@",
+        "-function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "437d13155925d96902bc67c5d88d607d97762adf"
+    "shas": "2087f684c9ba7fa39876477f2eacf8b9b12949fa..973cce7b94116a9e6e8b399f9f0a50bd107fb9b5"
 }]

test/corpus/diff-summaries/javascript/identifier.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "e0e3afdc072a442646b858257a8842112c729449",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index e69de29..1cf4ad0 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -0,0 +1 @@",
+        "+theVar;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7d5c31114093f1169f023a98ed1b141aed1020a4"
+    "shas": "2642fef686808ac2a6c5edde323e87257f4f2983..369e63ae9927770fe9ca2fd662ca648e43ab72e5"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "7d5c31114093f1169f023a98ed1b141aed1020a4",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index 1cf4ad0..888855a 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -1 +1,3 @@",
+        "+theVar2",
+        "+theVar;",
+        " theVar;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "23e48376eafe46181894d00f9ab5ddbdfa250c35"
+    "shas": "369e63ae9927770fe9ca2fd662ca648e43ab72e5..ee416c16400890b8f6351b1c8113657cb7671eb7"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "23e48376eafe46181894d00f9ab5ddbdfa250c35",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index 888855a..60e041c 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -1,3 +1,3 @@",
+        "-theVar2",
+        "+theVar;",
+        " theVar;",
+        " theVar;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dd258400725f6814173e344e4273a17edaa1974d"
+    "shas": "ee416c16400890b8f6351b1c8113657cb7671eb7..13d808ca205317e4c1b13c036517ed17cdde1da3"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "dd258400725f6814173e344e4273a17edaa1974d",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index 60e041c..888855a 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -1,3 +1,3 @@",
+        "-theVar;",
+        "+theVar2",
+        " theVar;",
+        " theVar;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c7c6fa74ce3bbcfd516baa8794504835aef30d24"
+    "shas": "13d808ca205317e4c1b13c036517ed17cdde1da3..1f1988b798d7bd2558d1d050b242ef4afbd52629"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "c7c6fa74ce3bbcfd516baa8794504835aef30d24",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index 888855a..fbc7b28 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -1,3 +1,2 @@",
+        "-theVar2",
+        "-theVar;",
+        " theVar;",
+        "+theVar2"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "01a282ae6900beefd7af33d2e0e16dbde0ee755c"
+    "shas": "1f1988b798d7bd2558d1d050b242ef4afbd52629..6408b95d2773e060ccc2c624b319447b326c8a51"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "01a282ae6900beefd7af33d2e0e16dbde0ee755c",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index fbc7b28..7276d95 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -1,2 +1 @@",
+        "-theVar;",
+        " theVar2"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3226b408c1def23bb83ecccadebfb8f845871e60"
+    "shas": "6408b95d2773e060ccc2c624b319447b326c8a51..011d19e2d6ea45758e3df50809069437b44911b5"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "3226b408c1def23bb83ecccadebfb8f845871e60",
+    "patch": [
+        "diff --git a/identifier.js b/identifier.js",
+        "index 7276d95..e69de29 100644",
+        "--- a/identifier.js",
+        "+++ b/identifier.js",
+        "@@ -1 +0,0 @@",
+        "-theVar2"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b3470025ee263454110f25252e09c359560d1bd5"
+    "shas": "011d19e2d6ea45758e3df50809069437b44911b5..5180fa74c7ae39b3c2cb94b9b5498307af385e5c"
 }]

test/corpus/diff-summaries/javascript/if-else.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "54d43b3c10fed335e753e25a550cd47511bf14e1",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index e69de29..d81ebad 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -0,0 +1 @@",
+        "+if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "650c28440a549f6362cfbf568c8b446a1903c958"
+    "shas": "ee538d5b471190fe27f80e1defc319f36f5f9c38..d5f532daeb84c4dd664519d388575b8891e7e25a"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "650c28440a549f6362cfbf568c8b446a1903c958",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index d81ebad..6bb0eaa 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -1 +1,3 @@",
+        "+if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o",
+        "+if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "20c59882c320fb6791c0c529a947330214303d24"
+    "shas": "d5f532daeb84c4dd664519d388575b8891e7e25a..539d5f1eb9ec34131ed8d31c596c38285f83e6bf"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-insert-test",
@@ -105,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g' identifier with the 'x' identifier"
+                    "summary": "Replaced the 'g' identifier with the 'x' identifier in the 'x' if statement"
                 },
                 {
                     "span": {
@@ -132,7 +148,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'h' identifier with the 'y' identifier"
+                    "summary": "Replaced the 'h' identifier with the 'y' identifier in the 'x' if statement"
                 },
                 {
                     "span": {
@@ -159,7 +175,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'i' identifier with the 'a' identifier"
+                    "summary": "Replaced the 'i' identifier with the 'a' identifier in the 'a' if statement"
                 },
                 {
                     "span": {
@@ -174,7 +190,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' identifier"
+                    "summary": "Added the 'b' identifier in the 'a' if statement"
                 },
                 {
                     "span": {
@@ -189,7 +205,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'j' identifier"
+                    "summary": "Deleted the 'j' identifier in the 'a' if statement"
                 },
                 {
                     "span": {
@@ -216,7 +232,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'k' identifier with the 'c' identifier"
+                    "summary": "Replaced the 'k' identifier with the 'c' identifier in the 'c' if statement"
                 },
                 {
                     "span": {
@@ -243,7 +259,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'l' identifier with the 'd' identifier"
+                    "summary": "Replaced the 'l' identifier with the 'd' identifier in the 'c' if statement"
                 },
                 {
                     "span": {
@@ -270,7 +286,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'm' identifier with the 'e' identifier"
+                    "summary": "Replaced the 'm' identifier with the 'e' identifier in the 'e' if statement"
                 },
                 {
                     "span": {
@@ -285,7 +301,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f' identifier"
+                    "summary": "Added the 'f' identifier in the 'e' if statement"
                 },
                 {
                     "span": {
@@ -300,7 +316,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'n' identifier"
+                    "summary": "Deleted the 'n' identifier in the 'e' if statement"
                 },
                 {
                     "span": {
@@ -327,7 +343,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'o' identifier with the 'g' identifier"
+                    "summary": "Replaced the 'o' identifier with the 'g' identifier in the 'e' if statement"
                 }
             ]
         },
@@ -336,9 +352,19 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "20c59882c320fb6791c0c529a947330214303d24",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index 6bb0eaa..2034be1 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -1,3 +1,3 @@",
+        "-if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o",
+        "+if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fbf74c5787cd8b79a2cc6be34bf3908549621cdb"
+    "shas": "539d5f1eb9ec34131ed8d31c596c38285f83e6bf..f525e3671aa6d43caf17c2582f3c746f07570b7a"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-test",
@@ -370,7 +396,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x' identifier with the 'g' identifier"
+                    "summary": "Replaced the 'x' identifier with the 'g' identifier in the 'g' if statement"
                 },
                 {
                     "span": {
@@ -397,7 +423,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'y' identifier with the 'h' identifier"
+                    "summary": "Replaced the 'y' identifier with the 'h' identifier in the 'g' if statement"
                 },
                 {
                     "span": {
@@ -424,7 +450,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'i' identifier"
+                    "summary": "Replaced the 'a' identifier with the 'i' identifier in the 'i' if statement"
                 },
                 {
                     "span": {
@@ -439,7 +465,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'j' identifier"
+                    "summary": "Added the 'j' identifier in the 'i' if statement"
                 },
                 {
                     "span": {
@@ -454,7 +480,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' identifier"
+                    "summary": "Deleted the 'b' identifier in the 'i' if statement"
                 },
                 {
                     "span": {
@@ -481,7 +507,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c' identifier with the 'k' identifier"
+                    "summary": "Replaced the 'c' identifier with the 'k' identifier in the 'k' if statement"
                 },
                 {
                     "span": {
@@ -508,7 +534,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'd' identifier with the 'l' identifier"
+                    "summary": "Replaced the 'd' identifier with the 'l' identifier in the 'k' if statement"
                 },
                 {
                     "span": {
@@ -535,7 +561,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'e' identifier with the 'm' identifier"
+                    "summary": "Replaced the 'e' identifier with the 'm' identifier in the 'm' if statement"
                 },
                 {
                     "span": {
@@ -550,7 +576,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'n' identifier"
+                    "summary": "Added the 'n' identifier in the 'm' if statement"
                 },
                 {
                     "span": {
@@ -565,7 +591,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f' identifier"
+                    "summary": "Deleted the 'f' identifier in the 'm' if statement"
                 },
                 {
                     "span": {
@@ -592,7 +618,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g' identifier with the 'o' identifier"
+                    "summary": "Replaced the 'g' identifier with the 'o' identifier in the 'm' if statement"
                 }
             ]
         },
@@ -601,9 +627,19 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "fbf74c5787cd8b79a2cc6be34bf3908549621cdb",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index 2034be1..6bb0eaa 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -1,3 +1,3 @@",
+        "-if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        "+if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o",
+        " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6b56fa332a9b893353bd4ab5acfe375b4b478cc6"
+    "shas": "f525e3671aa6d43caf17c2582f3c746f07570b7a..9fce9df9688253990d3fcfa4eb8f2280aa1c0c7c"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-replacement-test",
@@ -662,9 +698,19 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "6b56fa332a9b893353bd4ab5acfe375b4b478cc6",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index 6bb0eaa..e26d6c4 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -1,3 +1,2 @@",
+        "-if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o",
+        "-if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        "+if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "29013b75d9d4db569f8d4f1641d87dd973724eae"
+    "shas": "9fce9df9688253990d3fcfa4eb8f2280aa1c0c7c..f5b900cb596f7084a32ca9441f01e9be4b1e27dd"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-test",
@@ -693,9 +739,17 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "29013b75d9d4db569f8d4f1641d87dd973724eae",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index e26d6c4..1a55d0b 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -1,2 +1 @@",
+        "-if (x) y; else if (a) b; else if (c) d; else if (e) f; else g",
+        " if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "279becd75ae220a302f98e5f9360e948ab2dd01c"
+    "shas": "f5b900cb596f7084a32ca9441f01e9be4b1e27dd..c3bb4c6e35fc4755d18a5e0fb53d5410a476c039"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-rest-test",
@@ -724,7 +778,14 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "279becd75ae220a302f98e5f9360e948ab2dd01c",
+    "patch": [
+        "diff --git a/if-else.js b/if-else.js",
+        "index 1a55d0b..e69de29 100644",
+        "--- a/if-else.js",
+        "+++ b/if-else.js",
+        "@@ -1 +0,0 @@",
+        "-if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2dee917afc37bf88e9b7405744f9b8877a4c68c3"
+    "shas": "c3bb4c6e35fc4755d18a5e0fb53d5410a476c039..dffe792710a5ad52de12ed62e48340a71e5c9227"
 }]

test/corpus/diff-summaries/javascript/if.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "dc9aa0f5ce2176319c7eb9475db8787876afb4d9",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index e69de29..52d4b4f 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -0,0 +1 @@",
+        "+if (x) { log(y); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "69f411176d7219c08562a4cb0d8c4eca25694610"
+    "shas": "4951403c16600a8ebe50779236bcbc480c823807..3ab04d08f09b5d896597f687046696c6cec1cf08"
 }
 ,{
     "testCaseDescription": "javascript-if-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "69f411176d7219c08562a4cb0d8c4eca25694610",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index 52d4b4f..ae4ee32 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -1 +1,3 @@",
+        "+if (a.b) { log(c); d; }",
+        "+if (x) { log(y); }",
+        " if (x) { log(y); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c429c8c2238a29d93ae024dc83871a5fec81e9bb"
+    "shas": "3ab04d08f09b5d896597f687046696c6cec1cf08..c5c2097ab589ca6e4187e2bae6455468ececcb93"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "c429c8c2238a29d93ae024dc83871a5fec81e9bb",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index ae4ee32..df55832 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -1,3 +1,3 @@",
+        "-if (a.b) { log(c); d; }",
+        "+if (x) { log(y); }",
+        " if (x) { log(y); }",
+        " if (x) { log(y); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8dfaa25d65e0850b25ac1fe3518e33d227f4400b"
+    "shas": "c5c2097ab589ca6e4187e2bae6455468ececcb93..2f37518e72e7f3ea87111886870a575d8dc4369a"
 }
 ,{
     "testCaseDescription": "javascript-if-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "8dfaa25d65e0850b25ac1fe3518e33d227f4400b",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index df55832..ae4ee32 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -1,3 +1,3 @@",
+        "-if (x) { log(y); }",
+        "+if (a.b) { log(c); d; }",
+        " if (x) { log(y); }",
+        " if (x) { log(y); }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c883527a3f28132042272cd97a8d0df1a7979ab6"
+    "shas": "2f37518e72e7f3ea87111886870a575d8dc4369a..3eaefb1b0937e7789aac874832358df33b530310"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "c883527a3f28132042272cd97a8d0df1a7979ab6",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index ae4ee32..38b83ef 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -1,3 +1,2 @@",
+        "-if (a.b) { log(c); d; }",
+        "-if (x) { log(y); }",
+        " if (x) { log(y); }",
+        "+if (a.b) { log(c); d; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "71c0d8d6182309053691d133c3110dd9c9690fef"
+    "shas": "3eaefb1b0937e7789aac874832358df33b530310..0e72c4d71d418eefb3726b7e5bc0232a5aad7db6"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "71c0d8d6182309053691d133c3110dd9c9690fef",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index 38b83ef..f67163b 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -1,2 +1 @@",
+        "-if (x) { log(y); }",
+        " if (a.b) { log(c); d; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8c3981d5ce473f0be35cdd782df52ac7c8597fc0"
+    "shas": "0e72c4d71d418eefb3726b7e5bc0232a5aad7db6..b81dbad2ec8358dd3e22e71cca5eea1c286769a8"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "8c3981d5ce473f0be35cdd782df52ac7c8597fc0",
+    "patch": [
+        "diff --git a/if.js b/if.js",
+        "index f67163b..e69de29 100644",
+        "--- a/if.js",
+        "+++ b/if.js",
+        "@@ -1 +0,0 @@",
+        "-if (a.b) { log(c); d; }"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "54d43b3c10fed335e753e25a550cd47511bf14e1"
+    "shas": "b81dbad2ec8358dd3e22e71cca5eea1c286769a8..ee538d5b471190fe27f80e1defc319f36f5f9c38"
 }]

test/corpus/diff-summaries/javascript/import.json

@@ -130,9 +130,23 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "1011ea99d2c513437073a38030c1290fcc06cac4",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index e69de29..491cb15 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -0,0 +1,8 @@",
+        "+import defaultMember from \"foo\";",
+        "+import * as name from \"aardvark\";",
+        "+import { member } from \"ant\";",
+        "+import { member1 , member2 } from \"antelope\";",
+        "+import { member1 , member2 as alias2 } from \"ant-eater\";",
+        "+import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        "+import defaultMember, * as name from \"alligator\";",
+        "+import \"arctic-tern\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "40bc61d9d0c547e336e8a44b5e90f7db3c90f585"
+    "shas": "94d7e0ef831c81697b130d8e7c032b876c270e33..bddd7205c75f938fdef876cad00d2a3130c8a056"
 }
 ,{
     "testCaseDescription": "javascript-import-replacement-insert-test",
@@ -386,9 +400,34 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "40bc61d9d0c547e336e8a44b5e90f7db3c90f585",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index 491cb15..045c536 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -1,3 +1,19 @@",
+        "+import defaultMember from \"babirusa\";",
+        "+import * as otherName from \"baboon\";",
+        "+import { element } from \"badger\";",
+        "+import { element1 , element2 } from \"bald-eagle\";",
+        "+import { element1 , element2 as elementAlias2 } from \"bandicoot\";",
+        "+import defaultMember, { element1, element2 as elementAlias2 } from \"banteng\";",
+        "+import defaultMember, * as element from \"barbet\";",
+        "+import \"basilisk\";",
+        "+import defaultMember from \"foo\";",
+        "+import * as name from \"aardvark\";",
+        "+import { member } from \"ant\";",
+        "+import { member1 , member2 } from \"antelope\";",
+        "+import { member1 , member2 as alias2 } from \"ant-eater\";",
+        "+import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        "+import defaultMember, * as name from \"alligator\";",
+        "+import \"arctic-tern\";",
+        " import defaultMember from \"foo\";",
+        " import * as name from \"aardvark\";",
+        " import { member } from \"ant\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "433f5cbcd86af87576fdb9ec6b2d9851f5632d4d"
+    "shas": "bddd7205c75f938fdef876cad00d2a3130c8a056..2f4516215b92d79082b1f806ec0ac74a2e18726c"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-insert-test",
@@ -660,9 +699,34 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "433f5cbcd86af87576fdb9ec6b2d9851f5632d4d",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index 045c536..cbad5a4 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -1,11 +1,11 @@",
+        "-import defaultMember from \"babirusa\";",
+        "-import * as otherName from \"baboon\";",
+        "-import { element } from \"badger\";",
+        "-import { element1 , element2 } from \"bald-eagle\";",
+        "-import { element1 , element2 as elementAlias2 } from \"bandicoot\";",
+        "-import defaultMember, { element1, element2 as elementAlias2 } from \"banteng\";",
+        "-import defaultMember, * as element from \"barbet\";",
+        "-import \"basilisk\";",
+        "+import defaultMember from \"foo\";",
+        "+import * as name from \"aardvark\";",
+        "+import { member } from \"ant\";",
+        "+import { member1 , member2 } from \"antelope\";",
+        "+import { member1 , member2 as alias2 } from \"ant-eater\";",
+        "+import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        "+import defaultMember, * as name from \"alligator\";",
+        "+import \"arctic-tern\";",
+        " import defaultMember from \"foo\";",
+        " import * as name from \"aardvark\";",
+        " import { member } from \"ant\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fd76bae4b8cceb60c08b9f3c5cad5c89e5f9794e"
+    "shas": "2f4516215b92d79082b1f806ec0ac74a2e18726c..f6b32da510dd536120c67a2e13e3c5f17ca08a62"
 }
 ,{
     "testCaseDescription": "javascript-import-replacement-test",
@@ -934,9 +998,34 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "fd76bae4b8cceb60c08b9f3c5cad5c89e5f9794e",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index cbad5a4..045c536 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -1,11 +1,11 @@",
+        "-import defaultMember from \"foo\";",
+        "-import * as name from \"aardvark\";",
+        "-import { member } from \"ant\";",
+        "-import { member1 , member2 } from \"antelope\";",
+        "-import { member1 , member2 as alias2 } from \"ant-eater\";",
+        "-import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        "-import defaultMember, * as name from \"alligator\";",
+        "-import \"arctic-tern\";",
+        "+import defaultMember from \"babirusa\";",
+        "+import * as otherName from \"baboon\";",
+        "+import { element } from \"badger\";",
+        "+import { element1 , element2 } from \"bald-eagle\";",
+        "+import { element1 , element2 as elementAlias2 } from \"bandicoot\";",
+        "+import defaultMember, { element1, element2 as elementAlias2 } from \"banteng\";",
+        "+import defaultMember, * as element from \"barbet\";",
+        "+import \"basilisk\";",
+        " import defaultMember from \"foo\";",
+        " import * as name from \"aardvark\";",
+        " import { member } from \"ant\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2dd6289f8d933a4704f37ac94ddf156032a92a00"
+    "shas": "f6b32da510dd536120c67a2e13e3c5f17ca08a62..9d51ffb2d1950579de47c825eca14557ae9cefc8"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-replacement-test",
@@ -1310,9 +1399,46 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "2dd6289f8d933a4704f37ac94ddf156032a92a00",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index 045c536..873ff75 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -1,19 +1,3 @@",
+        "-import defaultMember from \"babirusa\";",
+        "-import * as otherName from \"baboon\";",
+        "-import { element } from \"badger\";",
+        "-import { element1 , element2 } from \"bald-eagle\";",
+        "-import { element1 , element2 as elementAlias2 } from \"bandicoot\";",
+        "-import defaultMember, { element1, element2 as elementAlias2 } from \"banteng\";",
+        "-import defaultMember, * as element from \"barbet\";",
+        "-import \"basilisk\";",
+        "-import defaultMember from \"foo\";",
+        "-import * as name from \"aardvark\";",
+        "-import { member } from \"ant\";",
+        "-import { member1 , member2 } from \"antelope\";",
+        "-import { member1 , member2 as alias2 } from \"ant-eater\";",
+        "-import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        "-import defaultMember, * as name from \"alligator\";",
+        "-import \"arctic-tern\";",
+        " import defaultMember from \"foo\";",
+        " import * as name from \"aardvark\";",
+        " import { member } from \"ant\";",
+        "@@ -22,3 +6,11 @@ import { member1 , member2 as alias2 } from \"ant-eater\";",
+        " import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        " import defaultMember, * as name from \"alligator\";",
+        " import \"arctic-tern\";",
+        "+import defaultMember from \"babirusa\";",
+        "+import * as otherName from \"baboon\";",
+        "+import { element } from \"badger\";",
+        "+import { element1 , element2 } from \"bald-eagle\";",
+        "+import { element1 , element2 as elementAlias2 } from \"bandicoot\";",
+        "+import defaultMember, { element1, element2 as elementAlias2 } from \"banteng\";",
+        "+import defaultMember, * as element from \"barbet\";",
+        "+import \"basilisk\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1719ae08e72d065a121f9a962a48b33288f90868"
+    "shas": "9d51ffb2d1950579de47c825eca14557ae9cefc8..d8a44ed18d0fd2d59c8bfff2e97409d01face666"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-test",
@@ -1446,9 +1572,26 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "1719ae08e72d065a121f9a962a48b33288f90868",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index 873ff75..db72339 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -1,11 +1,3 @@",
+        "-import defaultMember from \"foo\";",
+        "-import * as name from \"aardvark\";",
+        "-import { member } from \"ant\";",
+        "-import { member1 , member2 } from \"antelope\";",
+        "-import { member1 , member2 as alias2 } from \"ant-eater\";",
+        "-import defaultMember, { member1, member2 as alias2 } from \"anaconda\";",
+        "-import defaultMember, * as name from \"alligator\";",
+        "-import \"arctic-tern\";",
+        " import defaultMember from \"babirusa\";",
+        " import * as otherName from \"baboon\";",
+        " import { element } from \"badger\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "193d82337dbb90df9252043dea7fe42e407ccc0e"
+    "shas": "d8a44ed18d0fd2d59c8bfff2e97409d01face666..b5659554207c6b66f77467f2277c99b1686f8e02"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-rest-test",
@@ -1582,7 +1725,21 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "193d82337dbb90df9252043dea7fe42e407ccc0e",
+    "patch": [
+        "diff --git a/import.js b/import.js",
+        "index db72339..e69de29 100644",
+        "--- a/import.js",
+        "+++ b/import.js",
+        "@@ -1,8 +0,0 @@",
+        "-import defaultMember from \"babirusa\";",
+        "-import * as otherName from \"baboon\";",
+        "-import { element } from \"badger\";",
+        "-import { element1 , element2 } from \"bald-eagle\";",
+        "-import { element1 , element2 as elementAlias2 } from \"bandicoot\";",
+        "-import defaultMember, { element1, element2 as elementAlias2 } from \"banteng\";",
+        "-import defaultMember, * as element from \"barbet\";",
+        "-import \"basilisk\";"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7b67ddbc527cc15d1cbac33725dc0c4d79472c8c"
+    "shas": "b5659554207c6b66f77467f2277c99b1686f8e02..0eb14098d9cfc48fe7ffb44e37c71cb6cb58c878"
 }]

test/corpus/diff-summaries/javascript/math-assignment-operator.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "cf3bb492593b241390a7cfd11dbdbd3d251a4177",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index e69de29..7150d6e 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -0,0 +1 @@",
+        "+x += 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5e3008d3df1c58d4ffb6fc9245ba0c50d5ad50e5"
+    "shas": "5da04c6d20aa6fdedbc205bf855829ccd10687f3..5ec631f6610cf3cc1f773396df8e13b4b814129c"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "5e3008d3df1c58d4ffb6fc9245ba0c50d5ad50e5",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index 7150d6e..0bf97e7 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -1 +1,3 @@",
+        "+x += 2;",
+        "+x += 1;",
+        " x += 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8437fbfaf6631316f57d0d1c1a72f2e3922f393d"
+    "shas": "5ec631f6610cf3cc1f773396df8e13b4b814129c..b0a185f38a22e6745bb368f017c102214337c4cb"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "8437fbfaf6631316f57d0d1c1a72f2e3922f393d",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index 0bf97e7..ad04937 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-x += 2;",
+        "+x += 1;",
+        " x += 1;",
+        " x += 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b40e39c6b8bb1409ba0d98c4479e37d7467f7ee6"
+    "shas": "b0a185f38a22e6745bb368f017c102214337c4cb..38cc878f5583067ae28923541b036488434aff2b"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "b40e39c6b8bb1409ba0d98c4479e37d7467f7ee6",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index ad04937..0bf97e7 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-x += 1;",
+        "+x += 2;",
+        " x += 1;",
+        " x += 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "392a9f0d59a7bf5d3b18769cd84c20687b82ac4a"
+    "shas": "38cc878f5583067ae28923541b036488434aff2b..156edc8d14ab30f0157138c24b7694cec8a4bb67"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "392a9f0d59a7bf5d3b18769cd84c20687b82ac4a",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index 0bf97e7..7127545 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -1,3 +1,2 @@",
+        "-x += 2;",
+        "-x += 1;",
+        " x += 1;",
+        "+x += 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b6960087a76266fca12fa88acfce88a499a43397"
+    "shas": "156edc8d14ab30f0157138c24b7694cec8a4bb67..185343b45e80feb8176e8a5a0ee4ec9bbe0fb637"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "b6960087a76266fca12fa88acfce88a499a43397",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index 7127545..94d1472 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -1,2 +1 @@",
+        "-x += 1;",
+        " x += 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "04d6487122e380aaa06d6fceb345e3a36f0e749a"
+    "shas": "185343b45e80feb8176e8a5a0ee4ec9bbe0fb637..8ff3bab42e216d76eeba9d8c9c04f66c9c99eb7d"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "04d6487122e380aaa06d6fceb345e3a36f0e749a",
+    "patch": [
+        "diff --git a/math-assignment-operator.js b/math-assignment-operator.js",
+        "index 94d1472..e69de29 100644",
+        "--- a/math-assignment-operator.js",
+        "+++ b/math-assignment-operator.js",
+        "@@ -1 +0,0 @@",
+        "-x += 2;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d42f86b317b470d5207108107a9710b5a66b7693"
+    "shas": "8ff3bab42e216d76eeba9d8c9c04f66c9c99eb7d..1c2dbb18fb6fc930b3d0e6bb31a559a853be5c63"
 }]

test/corpus/diff-summaries/javascript/math-operator.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "012105d0edaef241c26098d6e1680dab22bacbbc",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index e69de29..0344667 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -0,0 +1 @@",
+        "+i + j * 3 - j % 5;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5098eaf4a2d14d5002b653133b243ec1ea36e0a6"
+    "shas": "41ab7cb7dc378bf229f7a08f1a03c0676483f435..1571de07c19283348c86a4d81f61c63270a37d3f"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "5098eaf4a2d14d5002b653133b243ec1ea36e0a6",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index 0344667..79f5f20 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -1 +1,3 @@",
+        "+i + j * 2 - j % 4;",
+        "+i + j * 3 - j % 5;",
+        " i + j * 3 - j % 5;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "44d7073ad770d7db6888b668d150cae2288ab60f"
+    "shas": "1571de07c19283348c86a4d81f61c63270a37d3f..97979c27333f35afb7288063c45a2f25cf5e1808"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-insert-test",
@@ -141,9 +157,19 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "44d7073ad770d7db6888b668d150cae2288ab60f",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index 79f5f20..284561c 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-i + j * 2 - j % 4;",
+        "+i + j * 3 - j % 5;",
+        " i + j * 3 - j % 5;",
+        " i + j * 3 - j % 5;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1a22b412a511ec382bb6930aa92007e097c5031e"
+    "shas": "97979c27333f35afb7288063c45a2f25cf5e1808..d8320eb8219fb470d6ac17996f9d74b61fe7e6ee"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-replacement-test",
@@ -211,9 +237,19 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "1a22b412a511ec382bb6930aa92007e097c5031e",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index 284561c..79f5f20 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -1,3 +1,3 @@",
+        "-i + j * 3 - j % 5;",
+        "+i + j * 2 - j % 4;",
+        " i + j * 3 - j % 5;",
+        " i + j * 3 - j % 5;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "02f4915a4e73427c0982a2981df44a07f162a3dd"
+    "shas": "d8320eb8219fb470d6ac17996f9d74b61fe7e6ee..ca05a18c434755562d8787734dd2aa347af4ffca"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-replacement-test",
@@ -272,9 +308,19 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "02f4915a4e73427c0982a2981df44a07f162a3dd",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index 79f5f20..d1055f7 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -1,3 +1,2 @@",
+        "-i + j * 2 - j % 4;",
+        "-i + j * 3 - j % 5;",
+        " i + j * 3 - j % 5;",
+        "+i + j * 2 - j % 4;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "66f958a4880c2ba4f36c4df0f3b7941a0a958408"
+    "shas": "ca05a18c434755562d8787734dd2aa347af4ffca..4f0d2886b18d7b66ad3b3d0222b5c4040ebfbf05"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-test",
@@ -303,9 +349,17 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "66f958a4880c2ba4f36c4df0f3b7941a0a958408",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index d1055f7..79ba2b3 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -1,2 +1 @@",
+        "-i + j * 3 - j % 5;",
+        " i + j * 2 - j % 4;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6c30506adfccd4e508ef479cdbfd0772ef191fd9"
+    "shas": "4f0d2886b18d7b66ad3b3d0222b5c4040ebfbf05..c7c1c352742d04515a004d1c08642b78cf1e83cf"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-rest-test",
@@ -334,7 +388,14 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "6c30506adfccd4e508ef479cdbfd0772ef191fd9",
+    "patch": [
+        "diff --git a/math-operator.js b/math-operator.js",
+        "index 79ba2b3..e69de29 100644",
+        "--- a/math-operator.js",
+        "+++ b/math-operator.js",
+        "@@ -1 +0,0 @@",
+        "-i + j * 2 - j % 4;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0f277a98ca88f6c1e02d2811fa15b32c1909edf0"
+    "shas": "c7c1c352742d04515a004d1c08642b78cf1e83cf..69248e3fdb3e6ab7da864ef7bd3a915aeefd3cc4"
 }]

test/corpus/diff-summaries/javascript/member-access-assignment.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "45a5360969a82ef1602c4fd2629a242bd75a1edf",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index e69de29..7a99e30 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -0,0 +1 @@",
+        "+y.x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8765d002f676f7054f0639dedf551abd07ffe542"
+    "shas": "83f3153b76f49e077237997c965dc6f3c3a159bc..e3b5bd418d494825d815573a2dd33bb71bee5d48"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "8765d002f676f7054f0639dedf551abd07ffe542",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index 7a99e30..3204006 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -1 +1,3 @@",
+        "+y.x = 1;",
+        "+y.x = 0;",
+        " y.x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9c2a1db0fae9b9a45b97e622cc42f4290679e8c6"
+    "shas": "e3b5bd418d494825d815573a2dd33bb71bee5d48..1da355d7b96efcfa960001b22e4bc94e5be102bd"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "9c2a1db0fae9b9a45b97e622cc42f4290679e8c6",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index 3204006..94893a3 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -1,3 +1,3 @@",
+        "-y.x = 1;",
+        "+y.x = 0;",
+        " y.x = 0;",
+        " y.x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f2ba98a2189e8e9a03a40c5de8b6e2965ba598e2"
+    "shas": "1da355d7b96efcfa960001b22e4bc94e5be102bd..f2443f2327ec99428bb7538077575ea11136f8bd"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "f2ba98a2189e8e9a03a40c5de8b6e2965ba598e2",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index 94893a3..3204006 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -1,3 +1,3 @@",
+        "-y.x = 0;",
+        "+y.x = 1;",
+        " y.x = 0;",
+        " y.x = 0;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "acd420ac3e3fd87da90be56d4e9c3f4dd7159d78"
+    "shas": "f2443f2327ec99428bb7538077575ea11136f8bd..396adf86163adae31b6cbe282ed485497c4f42a4"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "acd420ac3e3fd87da90be56d4e9c3f4dd7159d78",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index 3204006..8d78a24 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -1,3 +1,2 @@",
+        "-y.x = 1;",
+        "-y.x = 0;",
+        " y.x = 0;",
+        "+y.x = 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "92a6f737b4ae488f87a9b653899cabd2f7040a8e"
+    "shas": "396adf86163adae31b6cbe282ed485497c4f42a4..ebd783b11d81b4c31d3883606aa0ee7019afb1c3"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "92a6f737b4ae488f87a9b653899cabd2f7040a8e",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index 8d78a24..799018d 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -1,2 +1 @@",
+        "-y.x = 0;",
+        " y.x = 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e3455e03e05976466cf133e6def4b5e4dd884ba7"
+    "shas": "ebd783b11d81b4c31d3883606aa0ee7019afb1c3..f0a86404c7e04e9a627fd8464879a14361a379bd"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "e3455e03e05976466cf133e6def4b5e4dd884ba7",
+    "patch": [
+        "diff --git a/member-access-assignment.js b/member-access-assignment.js",
+        "index 799018d..e69de29 100644",
+        "--- a/member-access-assignment.js",
+        "+++ b/member-access-assignment.js",
+        "@@ -1 +0,0 @@",
+        "-y.x = 1;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "05616ce185cfef047b0a9726d34dc39afb476f00"
+    "shas": "f0a86404c7e04e9a627fd8464879a14361a379bd..faf582893e706ae259a0482d65d424fbcf137bb2"
 }]

test/corpus/diff-summaries/javascript/member-access.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "00c3afcb0bf345232b8117cd6726492a096d4c5a",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index e69de29..3c837c9 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -0,0 +1 @@",
+        "+x.someProperty;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4012ca981630076b37c5b20c17b61e31a98e736c"
+    "shas": "0cbc55e481f01ab536c7832c5ebbc21d7f9e9021..9a5f4f1bbfa04d4b229b51802ca72129a31b1953"
 }
 ,{
     "testCaseDescription": "javascript-member-access-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "4012ca981630076b37c5b20c17b61e31a98e736c",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index 3c837c9..858131a 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -1 +1,3 @@",
+        "+x.someOtherProperty",
+        "+x.someProperty;",
+        " x.someProperty;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3ca0614bd090cac0b08aa17bb7eb1aac488a8681"
+    "shas": "9a5f4f1bbfa04d4b229b51802ca72129a31b1953..93677ca22426294b752c658707b4052a3a3220ed"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "3ca0614bd090cac0b08aa17bb7eb1aac488a8681",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index 858131a..5ed8a8d 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -1,3 +1,3 @@",
+        "-x.someOtherProperty",
+        "+x.someProperty;",
+        " x.someProperty;",
+        " x.someProperty;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c066db999bc7bb13d01702bd53263b18e1af3da6"
+    "shas": "93677ca22426294b752c658707b4052a3a3220ed..df73936014819634cde8e6741fef45116b094d93"
 }
 ,{
     "testCaseDescription": "javascript-member-access-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "c066db999bc7bb13d01702bd53263b18e1af3da6",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index 5ed8a8d..858131a 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -1,3 +1,3 @@",
+        "-x.someProperty;",
+        "+x.someOtherProperty",
+        " x.someProperty;",
+        " x.someProperty;"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "96988bb802db16817c452669fa0a715dadfb0e8a"
+    "shas": "df73936014819634cde8e6741fef45116b094d93..94c28d92c27008e7f21ed463e683fdfbda0b8287"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "96988bb802db16817c452669fa0a715dadfb0e8a",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index 858131a..81f5f46 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -1,3 +1,2 @@",
+        "-x.someOtherProperty",
+        "-x.someProperty;",
+        " x.someProperty;",
+        "+x.someOtherProperty"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cdc91909a89d63ae08b39ff4d6787bad3001c54a"
+    "shas": "94c28d92c27008e7f21ed463e683fdfbda0b8287..38ee25545f8644cee42edb45ef2f7b29b26892d5"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "cdc91909a89d63ae08b39ff4d6787bad3001c54a",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index 81f5f46..8329c77 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -1,2 +1 @@",
+        "-x.someProperty;",
+        " x.someOtherProperty"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "07ebf2e9216478041a23449ff3aa79e25dd6a5da"
+    "shas": "38ee25545f8644cee42edb45ef2f7b29b26892d5..6188b94ce3872e80b40738d01c4853a467d502c2"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "07ebf2e9216478041a23449ff3aa79e25dd6a5da",
+    "patch": [
+        "diff --git a/member-access.js b/member-access.js",
+        "index 8329c77..e69de29 100644",
+        "--- a/member-access.js",
+        "+++ b/member-access.js",
+        "@@ -1 +0,0 @@",
+        "-x.someOtherProperty"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3703258beda4cec843b8f1d61576e214ffd3651b"
+    "shas": "6188b94ce3872e80b40738d01c4853a467d502c2..bcba202e709aea072f614c126e2a5bb356cbf3fe"
 }]

test/corpus/diff-summaries/javascript/method-call.json

@@ -25,9 +25,16 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "3a19dee8da1e0544c2cf975d850a6ce707912b35",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index e69de29..07ab90c 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -0,0 +1 @@",
+        "+object.someMethod(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d65701648386aeedc450735d2d231ad241b0e62e"
+    "shas": "f8662860eb083b9e95b5cc1c706a7872a4779532..616ca3e3b4a298f69107bd17d20b8fe2e5fd3d80"
 }
 ,{
     "testCaseDescription": "javascript-method-call-replacement-insert-test",
@@ -71,9 +78,18 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "d65701648386aeedc450735d2d231ad241b0e62e",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index 07ab90c..9341e17 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -1 +1,3 @@",
+        "+object.someMethod(arg1, \"arg3\");",
+        "+object.someMethod(arg1, \"arg2\");",
+        " object.someMethod(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "66cc70211c2edf4ff6090e439a410da10a6ffb8f"
+    "shas": "616ca3e3b4a298f69107bd17d20b8fe2e5fd3d80..1ddf2d53694021927a1783fc78ab68dca0508ce9"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-insert-test",
@@ -114,9 +130,19 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "66cc70211c2edf4ff6090e439a410da10a6ffb8f",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index 9341e17..f6ada2d 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -1,3 +1,3 @@",
+        "-object.someMethod(arg1, \"arg3\");",
+        "+object.someMethod(arg1, \"arg2\");",
+        " object.someMethod(arg1, \"arg2\");",
+        " object.someMethod(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "42b4144cde71d8c7afc757f4881794449cdf0fc5"
+    "shas": "1ddf2d53694021927a1783fc78ab68dca0508ce9..741134e42738870aeb25a8395d4a656ddd86bf4b"
 }
 ,{
     "testCaseDescription": "javascript-method-call-replacement-test",
@@ -157,9 +183,19 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "42b4144cde71d8c7afc757f4881794449cdf0fc5",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index f6ada2d..9341e17 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -1,3 +1,3 @@",
+        "-object.someMethod(arg1, \"arg2\");",
+        "+object.someMethod(arg1, \"arg3\");",
+        " object.someMethod(arg1, \"arg2\");",
+        " object.someMethod(arg1, \"arg2\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fcd77d257692d8e35ec4ab1b7b308f9701f6021c"
+    "shas": "741134e42738870aeb25a8395d4a656ddd86bf4b..4778b03d41ac4397158cf93d091d520be85bfc34"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-replacement-test",
@@ -218,9 +254,19 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "fcd77d257692d8e35ec4ab1b7b308f9701f6021c",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index 9341e17..894dcf6 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -1,3 +1,2 @@",
+        "-object.someMethod(arg1, \"arg3\");",
+        "-object.someMethod(arg1, \"arg2\");",
+        " object.someMethod(arg1, \"arg2\");",
+        "+object.someMethod(arg1, \"arg3\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c0ee844e49724d0ecebc7320ff9753669ded229b"
+    "shas": "4778b03d41ac4397158cf93d091d520be85bfc34..b2b8e482425d3459e6e1cab14dd7c6201bfa516e"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-test",
@@ -249,9 +295,17 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "c0ee844e49724d0ecebc7320ff9753669ded229b",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index 894dcf6..a82528c 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -1,2 +1 @@",
+        "-object.someMethod(arg1, \"arg2\");",
+        " object.someMethod(arg1, \"arg3\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "297e775c0aa3afe5cca15accc9b466c2f095ea56"
+    "shas": "b2b8e482425d3459e6e1cab14dd7c6201bfa516e..54e0a5e18b235909c85caf03159b380559d9c68d"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-rest-test",
@@ -280,7 +334,14 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "297e775c0aa3afe5cca15accc9b466c2f095ea56",
+    "patch": [
+        "diff --git a/method-call.js b/method-call.js",
+        "index a82528c..e69de29 100644",
+        "--- a/method-call.js",
+        "+++ b/method-call.js",
+        "@@ -1 +0,0 @@",
+        "-object.someMethod(arg1, \"arg3\");"
+    ],
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6087206d2569a100e711f522134188e6f4477aec"
+    "shas": "54e0a5e18b235909c85caf03159b380559d9c68d..5d5d40b2fa515dfcb7494d9b83f22687c56de0f5"
 }]