Update go tests

semantic-diff.cabal

@@ -48,6 +48,7 @@ library
                      , Renderer.Patch
                      , Renderer.Split
                      , Renderer.Summary
+                     , Renderer.SExpression
                      , SemanticDiff
                      , SES
                      , Source

src/Category.hs

@@ -122,8 +122,8 @@ data Category
   | Interpolation
   -- | A subshell command (e.g. `ls -la` in Ruby)
   | Subshell
-  -- | A conditional assignment expression.
-  | ConditionalAssignment
+  -- | Operator assignment, e.g. a ||= b, a += 1 in Ruby.
+  | OperatorAssignment
   -- | A yield statement.
   | Yield
   -- | An until expression.
@@ -165,6 +165,28 @@ data Category
   | DictionaryTy
   | StructTy
   | Struct
+  -- | A break statement, e.g. break; in JavaScript.
+  | Break
+  -- | A continue statement, e.g. continue; in JavaScript.
+  | Continue
+  -- | A binary statement, e.g. a | b in Ruby.
+  | Binary
+  -- | A unary statement, e.g. !a in Ruby.
+  | Unary
+  -- | A constant, e.g `Foo::Bar` in Ruby.
+  | Constant
+  -- | A superclass, e.g `< Foo` in Ruby.
+  | Superclass
+  -- | A singleton class declaration, e.g. `class << self;end` in Ruby
+  | SingletonClass
+  -- | A range expression, e.g. `1..10` in Ruby.
+  | RangeExpression
+  -- | A scope resolution operator, e.g. `Foo::bar` in Ruby.
+  | ScopeOperator
+  -- | A BEGIN {} block of statements.
+  | BeginBlock
+  -- | An END {} block of statements.
+  | EndBlock
   deriving (Eq, Generic, Ord, Show)
 
 -- Instances
@@ -225,7 +247,7 @@ instance Arbitrary Category where
     , pure Export
     , pure Interpolation
     , pure Subshell
-    , pure ConditionalAssignment
+    , pure OperatorAssignment
     , pure Yield
     , pure Until
     , pure Unless
@@ -253,6 +275,13 @@ instance Arbitrary Category where
     , pure BlockParameter
     , pure ArrayTy
     , pure DictionaryTy
+    , pure Break
+    , pure Continue
+    , pure Binary
+    , pure Unary
+    , pure Constant
+    , pure Superclass
+    , pure SingletonClass
     , Other <$> arbitrary
     ]
 

src/DiffSummary.hs

@@ -3,7 +3,7 @@
 
 module DiffSummary (diffSummaries, DiffSummary(..), DiffInfo(..), diffToDiffSummaries, isBranchInfo, isErrorSummary, JSONSummary(..)) where
 
-import Prologue hiding (intercalate)
+import Prologue
 import Diff
 import Patch
 import Term
@@ -13,8 +13,7 @@ import Syntax as S
 import Category as C
 import Data.Functor.Both hiding (fst, snd)
 import qualified Data.Functor.Both as Both
-import Data.Text (intercalate)
-import qualified Data.Text as Text (head)
+import qualified Data.Text as Text
 import Test.QuickCheck hiding (Fixed)
 import Patch.Arbitrary()
 import Data.Record
@@ -45,7 +44,7 @@ identifiable term = isIdentifiable (unwrap term) term
           S.MethodCall{} -> Identifiable
           S.Function{} -> Identifiable
           S.Assignment{} -> Identifiable
-          S.MathAssignment{} -> Identifiable
+          S.OperatorAssignment{} -> Identifiable
           S.VarAssignment{} -> Identifiable
           S.SubscriptAccess{} -> Identifiable
           S.Module{} -> Identifiable
@@ -59,10 +58,10 @@ identifiable term = isIdentifiable (unwrap term) term
           S.If{} -> Identifiable
           S.Try{} -> Identifiable
           S.Switch{} -> Identifiable
-          S.Case{} -> Identifiable
           S.Rescue{} -> Identifiable
           S.Pair{} -> Identifiable
           S.Struct{} -> Identifiable
+          S.BlockStatement{} -> Identifiable
           _ -> Unidentifiable
 
 data JSONSummary summary span = JSONSummary { summary :: summary, span :: span }
@@ -77,8 +76,8 @@ isErrorSummary :: JSONSummary summary span -> Bool
 isErrorSummary ErrorSummary{} = True
 isErrorSummary _ = False
 
-data DiffInfo = LeafInfo { categoryName :: Text, termName :: Text, sourceSpan :: SourceSpan }
- | BranchInfo { branches :: [ DiffInfo ], categoryName :: Text, branchType :: Branch }
+data DiffInfo = LeafInfo { leafCategory :: Category, termName :: Text, sourceSpan :: SourceSpan }
+ | BranchInfo { branches :: [ DiffInfo ], branchCategory :: Category, branchType :: Branch }
  | ErrorInfo { errorSpan :: SourceSpan, termName :: Text }
  | HideInfo -- Hide/Strip from summary output entirely.
  deriving (Eq, Show)
@@ -123,7 +122,7 @@ summaries = \case
   p@(Replace i1 i2) -> zipWith (\a b ->
     JSONSummary
      {
-      summary = summary (prefixWithPatch p This a) <+> "with" <+> determiner i1 <+> summary b
+      summary = summary (prefixWithPatch p This a) <+> "with" <+> summary b
     , span = SourceSpans $ These (span a) (span b)
     }) (toLeafInfos i1) (toLeafInfos i2)
   p@(Insert info) -> prefixWithPatch p That <$> toLeafInfos info
@@ -135,51 +134,49 @@ prefixWithPatch patch constructor = prefixWithThe (patchToPrefix patch)
   where
     prefixWithThe prefix jsonSummary = jsonSummary
       {
-        summary = prefix <+> determiner' patch <+> summary jsonSummary
+        summary = prefix <+> summary jsonSummary
       , span = SourceSpans $ constructor (span jsonSummary)
       }
     patchToPrefix = \case
       (Replace _ _) -> "Replaced"
       (Insert _) -> "Added"
       (Delete _) -> "Deleted"
-    determiner' = determiner . these identity identity const . unPatch
-
--- Optional determiner (e.g. "the") to tie together summary statements.
-determiner :: DiffInfo -> Doc
-determiner (LeafInfo "number" _ _) = ""
-determiner (LeafInfo "integer" _ _) = ""
-determiner (LeafInfo "float" _ _) = ""
-determiner (LeafInfo "boolean" _ _) = ""
-determiner (LeafInfo "begin statement" _ _) = "a"
-determiner (LeafInfo "select 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 _ _) = maybe "" determiner (snd <$> unsnoc bs)
-determiner _ = "the"
 
 toLeafInfos :: DiffInfo -> [JSONSummary Doc SourceSpan]
 toLeafInfos err@ErrorInfo{..} = pure $ ErrorSummary (pretty err) errorSpan
 toLeafInfos BranchInfo{..} = branches >>= toLeafInfos
 toLeafInfos HideInfo = []
-toLeafInfos leaf = pure . flip JSONSummary (sourceSpan leaf) $ case leaf of
-  (LeafInfo "number" termName _) -> squotes $ toDoc termName
-  (LeafInfo "float" termName _) -> squotes $ toDoc termName
-  (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@"select 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
-  (LeafInfo cName@"subshell command" termName _) -> toDoc termName <+> toDoc cName
-  LeafInfo{..} -> squotes (toDoc termName) <+> toDoc categoryName
-  node -> panic $ "Expected a leaf info but got a: " <> show node
+toLeafInfos LeafInfo{..} = pure $ JSONSummary (summary leafCategory termName) sourceSpan
+  where
+    summary :: Category -> Text -> Doc
+    summary category termName = case category of
+      C.NumberLiteral -> squotes $ toDoc termName
+      C.IntegerLiteral -> squotes $ toDoc termName
+      C.Boolean -> squotes $ toDoc termName
+      C.StringLiteral -> termAndCategoryName
+      C.Export -> termAndCategoryName
+      C.Import -> termAndCategoryName
+      C.Subshell -> termAndCategoryName
+      C.AnonymousFunction -> "an" <+> toDoc termName <+> "function"
+      C.Begin -> categoryName'
+      C.Select -> categoryName'
+      C.Else -> categoryName'
+      C.Ensure -> categoryName'
+      C.Break -> categoryName'
+      C.Continue -> categoryName'
+      C.BeginBlock -> categoryName'
+      C.EndBlock -> categoryName'
+      C.Yield | Text.null termName -> categoryName'
+      C.Return | Text.null termName -> categoryName'
+      _ -> "the" <+> squotes (toDoc termName) <+> toDoc categoryName
+      where
+        termAndCategoryName = "the" <+> toDoc termName <+> toDoc categoryName
+        categoryName = toCategoryName category
+        categoryName' = case categoryName of
+          name | startsWithVowel name -> "an" <+> toDoc name
+               | otherwise -> "a" <+> toDoc name
+        startsWithVowel text = getAny $ foldMap (Any . flip Text.isPrefixOf text) vowels
+        vowels = Text.singleton <$> ("aeiouAEIOU" :: [Char])
 
 -- Returns a text representing a specific term given a source and a term.
 toTermName :: forall leaf fields. (HasCategory leaf, DefaultFields fields) => Source Char -> SyntaxTerm leaf fields -> Text
@@ -223,12 +220,12 @@ toTermName source term = case unwrap term of
   S.Case expr _ -> termNameFromSource expr
   S.Switch expr _ -> toTermName' expr
   S.Ternary expr _ -> toTermName' expr
-  S.MathAssignment id _ -> toTermName' id
+  S.OperatorAssignment id _ -> toTermName' id
   S.Operator _ -> termNameFromSource term
-  S.Object _ kvs -> "{ " <> intercalate ", " (toTermName' <$> kvs) <> " }"
+  S.Object _ kvs -> "{ " <> Text.intercalate ", " (toTermName' <$> kvs) <> " }"
   S.Pair k v -> toKeyName k <> toArgName v
-  S.Return expr -> maybe "empty" toTermName' expr
-  S.Yield expr -> maybe "empty" toTermName' expr
+  S.Return children -> Text.intercalate ", " (termNameFromSource <$> children)
+  S.Yield children -> Text.intercalate ", " (termNameFromSource <$> children)
   S.Error _ -> termNameFromSource term
   S.If expr _ -> termNameFromSource expr
   S.For clauses _ -> termNameFromChildren term clauses
@@ -246,19 +243,21 @@ toTermName source term = case unwrap term of
   S.Module identifier _ -> toTermName' identifier
   S.Import identifier [] -> termNameFromSource identifier
   S.Import identifier exprs -> termNameFromChildren term exprs <> " from " <> toTermName' identifier
-  S.Export Nothing expr -> "{ " <> intercalate ", " (termNameFromSource <$> expr) <> " }"
+  S.Export Nothing expr -> "{ " <> Text.intercalate ", " (termNameFromSource <$> expr) <> " }"
   S.Export (Just identifier) [] -> "{ " <> toTermName' identifier <> " }"
-  S.Export (Just identifier) expr -> "{ " <> intercalate ", " (termNameFromSource <$> expr) <> " }" <> " from " <> toTermName' identifier
-  S.ConditionalAssignment id _ -> toTermName' id
+  S.Export (Just identifier) expr -> "{ " <> Text.intercalate ", " (termNameFromSource <$> expr) <> " }" <> " from " <> toTermName' identifier
   S.Negate expr -> toTermName' expr
-  S.Rescue args _ -> intercalate ", " $ toTermName' <$> args
   S.Struct ty _ -> maybe (termNameFromSource term) termNameFromSource ty
+  S.Rescue args _ -> Text.intercalate ", " $ toTermName' <$> args
+  S.Break expr -> toTermName' expr
+  S.Continue expr -> toTermName' expr
+  S.BlockStatement children -> termNameFromChildren term children
   where toTermName' = toTermName source
         termNameFromChildren term children = termNameFromRange (unionRangesFrom (range term) (range <$> children))
         termNameFromSource term = termNameFromRange (range term)
         termNameFromRange range = toText $ Source.slice range source
         range = characterRange . extract
-        paramsToArgNames params = "(" <> intercalate ", " (toArgName <$> params) <> ")"
+        paramsToArgNames params = "(" <> Text.intercalate ", " (toArgName <$> params) <> ")"
         toArgName :: SyntaxTerm leaf fields -> Text
         toArgName arg = case identifiable arg of
                           Identifiable arg -> toTermName' arg
@@ -287,6 +286,8 @@ parentContexts contexts = hsep $ either identifiableDoc annotatableDoc <$> conte
       C.Case -> "in the" <+> squotes (termName t) <+> catName c
       C.Switch -> "in the" <+> squotes (termName t) <+> catName c
       C.When -> "in a" <+> catName c
+      C.BeginBlock -> "in a" <+> catName c
+      C.EndBlock -> "in an" <+> catName c
       _ -> "in the" <+> termName t <+> catName c
     annotatableDoc (c, t) = "of the" <+> squotes (termName t) <+> catName c
     catName = toDoc . toCategoryName
@@ -297,16 +298,16 @@ toDoc = string . toS
 
 termToDiffInfo :: (HasCategory leaf, DefaultFields fields) => Source Char -> SyntaxTerm leaf fields -> DiffInfo
 termToDiffInfo blob term = case unwrap term of
-  S.Indexed children -> BranchInfo (termToDiffInfo' <$> children) (toCategoryName term) BIndexed
-  S.Fixed children -> BranchInfo (termToDiffInfo' <$> children) (toCategoryName term) BFixed
-  S.AnonymousFunction _ _ -> LeafInfo "anonymous function" (toTermName' term) (getField $ extract term)
+  S.Indexed children -> BranchInfo (termToDiffInfo' <$> children) (category $ extract term) BIndexed
+  S.Fixed children -> BranchInfo (termToDiffInfo' <$> children) (category $ extract term) BFixed
+  S.AnonymousFunction _ _ -> LeafInfo C.AnonymousFunction (toTermName' term) (getField $ extract term)
   S.Comment _ -> HideInfo
-  S.Commented cs leaf -> BranchInfo (termToDiffInfo' <$> cs <> maybeToList leaf) (toCategoryName term) BCommented
+  S.Commented cs leaf -> BranchInfo (termToDiffInfo' <$> cs <> maybeToList leaf) (category $ extract term) BCommented
   S.Error _ -> ErrorInfo (getField $ extract term) (toTermName' term)
   _ -> toLeafInfo term
   where toTermName' = toTermName blob
         termToDiffInfo' = termToDiffInfo blob
-        toLeafInfo term = LeafInfo (toCategoryName term) (toTermName' term) (getField $ extract term)
+        toLeafInfo term = LeafInfo (category $ extract term) (toTermName' term) (getField $ extract term)
 
 -- | Append a parentAnnotation to the current DiffSummary instance.
 -- | For a DiffSummary without a parentAnnotation, we append a parentAnnotation with the first identifiable term.
@@ -395,7 +396,7 @@ instance HasCategory Category where
     C.AnonymousFunction -> "anonymous function"
     C.Interpolation -> "interpolation"
     C.Subshell -> "subshell command"
-    C.ConditionalAssignment -> "conditional assignment"
+    C.OperatorAssignment -> "operator assignment"
     C.Yield -> "yield statement"
     C.Until -> "until statement"
     C.Unless -> "unless statement"
@@ -425,6 +426,17 @@ instance HasCategory Category where
     C.DictionaryTy -> "dictionary type"
     C.StructTy -> "struct type"
     C.Struct -> "struct"
+    C.Break -> "break statement"
+    C.Continue -> "continue statement"
+    C.Binary -> "binary statement"
+    C.Unary -> "unary statement"
+    C.Constant -> "constant"
+    C.Superclass -> "superclass"
+    C.SingletonClass -> "singleton class"
+    C.RangeExpression -> "range"
+    C.ScopeOperator -> "scope operator"
+    C.BeginBlock -> "BEGIN block"
+    C.EndBlock -> "END block"
 
 instance HasField fields Category => HasCategory (SyntaxTerm leaf fields) where
   toCategoryName = toCategoryName . category . extract
@@ -438,7 +450,7 @@ instance Arbitrary a => Arbitrary (DiffSummary a) where
   shrink = genericShrink
 
 instance P.Pretty DiffInfo where
-  pretty LeafInfo{..} = squotes (string $ toSL termName) <+> string (toSL categoryName)
+  pretty LeafInfo{..} = squotes (string $ toSL termName) <+> string (toSL (toCategoryName leafCategory))
   pretty BranchInfo{..} = mconcat $ punctuate (string "," P.<> space) (pretty <$> branches)
   pretty ErrorInfo{..} = squotes (string $ toSL termName) <+> "at" <+> (string . toSL $ displayStartEndPos errorSpan)
   pretty HideInfo = ""

src/Diffing.hs

@@ -17,6 +17,7 @@ import Renderer.JSON
 import Renderer.Patch
 import Renderer.Split
 import Renderer.Summary
+import Renderer.SExpression
 import Source
 import Syntax
 import System.Directory
@@ -74,6 +75,7 @@ textDiff :: (ToJSON (Record fields), DefaultFields fields, HasField fields Cost)
 textDiff parser arguments = diffFiles parser $ case format arguments of
   Split -> split
   Patch -> patch
+  SExpression -> sExpression
   JSON -> json
   Summary -> summary
 
@@ -82,6 +84,7 @@ truncatedDiff :: DiffArguments -> Both SourceBlob -> IO Output
 truncatedDiff arguments sources = pure $ case format arguments of
   Split -> SplitOutput mempty
   Patch -> PatchOutput (truncatePatch arguments sources)
+  SExpression -> SExpressionOutput mempty
   JSON -> JSONOutput mempty
   Summary -> SummaryOutput mempty
 
@@ -93,6 +96,7 @@ printDiff parser arguments sources = do
     case rendered of
       SplitOutput text -> text
       PatchOutput text -> text
+      SExpressionOutput text -> text
       JSONOutput series -> encodingToText (toJSON series)
       SummaryOutput summaries -> encodingToText (toJSON summaries)
   where

src/FDoc/NatExample.hs

@@ -17,7 +17,8 @@ type Nat = Fix NatF
 zero' :: Nat
 zero' = Fix ZeroF
 
--- This is a partially applied type (has kind * -> *). The recursive bit is used by recursion schemes and is referred to as the "carrier" functor.
+-- This is a partially applied type (has kind * -> *). The recursive bit is used
+-- by recursion schemes and is referred to as the "carrier" functor.
 succ' :: Nat -> Nat
 succ' = Fix . SuccF
 
@@ -37,7 +38,8 @@ intToNatAna num = ana coalgebra num
       0 -> ZeroF
       _ -> SuccF (num - 1)
 
--- Hylomorphism: first apply an anamorphism and then a catamorphism in the shape of Nat.
+-- Hylomorphism: first apply an anamorphism and then a catamorphism in the shape
+-- of Nat.
 natHylo :: Int -> Int
 natHylo num = hylo algebra coalgebra num
   where
@@ -48,7 +50,8 @@ natHylo num = hylo algebra coalgebra num
       0 -> ZeroF
       _ -> SuccF (num - 1)
 
--- Paramorphism: primitive recursion maintaining the original value along with its computed value.
+-- Paramorphism: primitive recursion maintaining the original value along with
+-- its computed value.
 natPara :: Nat -> Int
 natPara nats = para algebra nats
   where

src/FDoc/RecursionSchemes.hs

@@ -19,7 +19,9 @@ ana :: (a -> Base t a) -- a (Base t)-coalgebra
     -> a               -- seed
     -> t               -- resulting fixed point
 
-Anamorphism as a recursion scheme "builds up" a recursive structure. Anamorphisms work by using a coalgebra, which maps a seed value to a fixed point structure.
+Anamorphism as a recursion scheme "builds up" a recursive structure.
+Anamorphisms work by using a coalgebra, which maps a seed value to a fixed point
+structure.
 
 The example below adds a new field to the `Record` fields.
 -}
@@ -35,19 +37,23 @@ cata :: (Base t a -> a) -- a (Base t)-algebra
        -> t             -- fixed point
        -> a             -- result
 
-Catamorphism as a recursion scheme "tears down" a recursive structure. Catamorphisms work by using an algebra, which maps a shape in our fixed point structure to a new shape.
+Catamorphism as a recursion scheme "tears down" a recursive structure.
+Catamorphisms work by using an algebra, which maps a shape in our fixed point
+structure to a new shape.
 
 The example below adds a new field to the `Record` fields.
 -}
 indexedTermCata :: [leaf] -> Term (Syntax leaf) (Record '[NewField, Range, Category])
 indexedTermCata childrenLeaves = cata algebra (indexedTerm childrenLeaves)
   where
+    algebra :: CofreeF f (Record t) (Cofree f (Record (NewField : t))) -> Cofree f (Record (NewField : t))
     algebra term = cofree $ (NewField .: (headF term)) :< tailF term
 
 {-
 Anamorphism -- construct a Term from a string
 
-The example below shows how to build up a recursive Term structure from a string representation.
+The example below shows how to build up a recursive Term structure from a string
+representation.
 
 Example usage:
 
@@ -64,13 +70,17 @@ stringToTermAna "indexed" =>
 
   CofreeT (Identity ( (Range 1 10 .: Category.MethodCall .: RNil) :< Indexed ["leaf1", "leaf2", "leaf3"] ) )
 
-  While building up the `Indexed` structure, we continue to recurse over the `Indexed` terms ["leaf1", "leaf2", "leaf3"]. These are pattern matched using the catch all `_` and default to `Leaf` Syntax shapes:
+  While building up the `Indexed` structure, we continue to recurse over the
+  `Indexed` terms ["leaf1", "leaf2", "leaf3"]. These are pattern matched using
+  the catch all `_` and default to `Leaf` Syntax shapes:
 
   CofreeT (Identity ( (Range 1 10 .: Category.MethodCall .: RNil) :< Leaf "leaf1" ) )
   CofreeT (Identity ( (Range 1 10 .: Category.MethodCall .: RNil) :< Leaf "leaf2" ) )
   CofreeT (Identity ( (Range 1 10 .: Category.MethodCall .: RNil) :< Leaf "leaf3" ) )
 
-  These structures are substituted in place of ["leaf1", "leaf2", "leaf3"] in the new cofree `Indexed` structure, resulting in a expansion of all possible string terms.
+  These structures are substituted in place of ["leaf1", "leaf2", "leaf3"] in
+  the new cofree `Indexed` structure, resulting in a expansion of all possible
+  string terms.
 -}
 stringToTermAna :: String -> Term (Syntax String) (Record '[Range, Category])
 stringToTermAna = ana coalgebra
@@ -82,7 +92,8 @@ stringToTermAna = ana coalgebra
 {-
 Catamorphism -- construct a list of Strings from a recursive Term structure.
 
-The example below shows how to tear down a recursive Term structure into a list of String representation.
+The example below shows how to tear down a recursive Term structure into a list
+of String representation.
 -}
 termToStringCata :: Term (Syntax String) (Record '[Range, Category]) -> [String]
 termToStringCata = cata algebra
@@ -100,9 +111,13 @@ hylo :: Functor f => (f b -> b) -- an algebra
                   -> a          -- seed value
                   -> b          -- result
 
-Hylomorphisms work by first applying a coalgebra (anamorphism) to build up a structure. An algebra (catamorphism) is then applied to this structure. Because of fusion the anamorphism and catamorphism occur in a single pass rather than two separate traversals.
+Hylomorphisms work by first applying a coalgebra (anamorphism) to build up a
+structure. An algebra (catamorphism) is then applied to this structure. Because
+of fusion the anamorphism and catamorphism occur in a single pass rather than
+two separate traversals.
 
-The example below shows how our algebra and coalgebra defined in the termToStringCata and stringToTermAna can be utilized as a hylomorphism.
+The example below shows how our algebra and coalgebra defined in the
+termToStringCata and stringToTermAna can be utilized as a hylomorphism.
 
 Example Usage:
 stringTermHylo "indexed" => ["indexed", "leaf1", "leaf2", "leaf3"]
@@ -126,9 +141,18 @@ para :: (Base t (t, a) -> a) -- an algebra that takes a tuple of the last input
        -> t                  -- fixed point
        -> a                  -- result
 
-Paramorphisms, like all recursion schemes, work via a bottom up traversal (leaves to root), in which an algebra is applied to every node in the recursive structure. The difference between paramorphisms and catamorphisms is the algebra receives a tuple of the original subobject and its computed value (t, a) where `t` is the original suboject and `a` is the computed value.
+Paramorphisms, like all recursion schemes, work via a bottom up traversal
+(leaves to root), in which an algebra is applied to every node in the recursive
+structure. The difference between paramorphisms and catamorphisms is the algebra
+receives a tuple of the original subobject and its computed value (t, a) where
+`t` is the original suboject and `a` is the computed value.
 
-The example implementation below calculates a string representation for each Syntax type, flattening the recursive structure into a one dimensional list to tuples. The tuple contains the original syntax subobject, and its computed string representation. This example aims to showcase how paramorphisms work by returning a final list of tuples that mimics the intermediate tuple shapes the algebra receives throughout the bottom up traversal.
+The example implementation below calculates a string representation for each
+Syntax type, flattening the recursive structure into a one dimensional list to
+tuples. The tuple contains the original syntax subobject, and its computed
+string representation. This example aims to showcase how paramorphisms work by
+returning a final list of tuples that mimics the intermediate tuple shapes the
+algebra receives throughout the bottom up traversal.
 
 Example Usage:
 let terms = indexedTerm ["leaf1", "leaf2", "leaf3"]

src/FDoc/Term.hs

@@ -17,7 +17,10 @@ This is in the TermF shape: CofreeF f a b where
   a is the annotation (Record '[Range, Category])
   b is the same type of functor defined by f
 
-Two common convenience operations when working with CofreeF (for docs, see Control.Comonad.Trans.Cofree.Types.CofreeF) are `headF` and `tailF`. `headF` return the annotation portion of the CofreeF structure, and `tailF` returns the functor portion (Syntax).
+Two common convenience operations when working with CofreeF (for docs, see
+Control.Comonad.Trans.Cofree.Types.CofreeF) are `headF` and `tailF`. `headF`
+return the annotation portion of the CofreeF structure, and `tailF` returns the
+functor portion (Syntax).
 
 Example (from GHCi):
 
@@ -40,7 +43,10 @@ This is in the Term shape: Cofree f a where
   f is the functor (Syntax.Leaf `leaf`)
   a is the annotation (Record '[Range, Category])
 
-Two common convenience operations when working with Cofree (for docs, see Control.Comonad.Trans.Cofree.Types.Cofree) are `extract` and `unwrap`. `extract` returns the annotation portion of the Cofree structure, and `unwrap` returns the functor portion (Syntax).
+Two common convenience operations when working with Cofree (for docs, see
+Control.Comonad.Trans.Cofree.Types.Cofree) are `extract` and `unwrap`. `extract`
+returns the annotation portion of the Cofree structure, and `unwrap` returns the
+functor portion (Syntax).
 
 Example (from GHCi):
 

src/Language.hs

@@ -46,9 +46,10 @@ termConstructor
   -> IO SourceSpan -- ^ The span that the term occupies. This is passed in 'IO' to guarantee some access constraints & encourage its use only when needed (improving performance).
   -> Text -- ^ The name of the production for this node.
   -> Range -- ^ The character range that the term occupies.
-  -> [Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])] -- ^ The child nodes of the term.
-  -> IO (Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])) -- ^ The resulting term, in IO.
-termConstructor source sourceSpan name range children =
+  -> [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ The child nodes of the term.
+  -> IO [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ All child nodes (included unnamed productions) of the term as 'IO'. Only use this if you need it.
+  -> IO (SyntaxTerm Text '[Range, Category, SourceSpan]) -- ^ The resulting term, in IO.
+termConstructor source sourceSpan name range children _ =
   withDefaultInfo $ case (name, children) of
     ("ERROR", _) -> S.Error children
     (_, []) -> S.Leaf (toText $ slice range source)

src/Language/C.hs

@@ -5,7 +5,6 @@ import Data.Record
 import Info
 import Prologue
 import Source
-import Syntax
 import qualified Syntax as S
 import Term
 
@@ -14,9 +13,10 @@ termConstructor
   -> IO SourceSpan -- ^ The span that the term occupies. This is passed in 'IO' to guarantee some access constraints & encourage its use only when needed (improving performance).
   -> Text -- ^ The name of the production for this node.
   -> Range -- ^ The character range that the term occupies.
-  -> [Term (Syntax Text) (Record '[Range, Category, SourceSpan])] -- ^ The child nodes of the term.
-  -> IO (Term (Syntax Text) (Record '[Range, Category, SourceSpan])) -- ^ The resulting term, in IO.
-termConstructor source sourceSpan name range children
+  -> [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ The child nodes of the term.
+  -> IO [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ All child nodes (included unnamed productions) of the term as 'IO'. Only use this if you need it.
+  -> IO (SyntaxTerm Text '[Range, Category, SourceSpan]) -- ^ The resulting term, in IO.
+termConstructor source sourceSpan name range children _
   | name == "ERROR" = withDefaultInfo (S.Error children)
   | otherwise = withDefaultInfo $ case (name, children) of
   (_, []) -> S.Leaf . toText $ slice range source

src/Language/Go.hs

@@ -16,9 +16,10 @@ termConstructor
   -> Text -- ^ The name of the production for this node.
   -> Range -- ^ The character range that the term occupies.
   -> [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ The child nodes of the term.
+  -> IO [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ All child nodes (included unnamed productions) of the term as 'IO'. Only use this if you need it.
   -> IO (SyntaxTerm Text '[Range, Category, SourceSpan]) -- ^ The resulting term, in IO.
-termConstructor source sourceSpan name range children = case name of
-  "return_statement" -> withDefaultInfo $ S.Return (listToMaybe children)
+termConstructor source sourceSpan name range children _ = case name of
+  "return_statement" -> withDefaultInfo $ S.Return children
   "source_file" -> case children of
     packageName : rest | category (extract packageName) == Other "package_clause" ->
       case unwrap packageName of
@@ -215,4 +216,3 @@ categoryForGoName = \case
   "dictionary_type" -> DictionaryTy
   "array_type" -> ArrayTy
   s -> Other (toS s)
-

src/Language/JavaScript.hs

@@ -16,22 +16,27 @@ functions :: [Text]
 functions = [ "arrow_function", "generator_function", "function" ]
 
 forStatements :: [Text]
-forStatements = [ "for_statement", "for_of_statement", "for_in_statement" ]
+forStatements = [ "for_statement", "for_of_statement", "for_in_statement", "trailing_for_statement", "trailing_for_of_statement", "trailing_for_in_statement" ]
 
 termConstructor
   :: Source Char -- ^ The source that the term occurs within.
   -> IO SourceSpan -- ^ The span that the term occupies. This is passed in 'IO' to guarantee some access constraints & encourage its use only when needed (improving performance).
   -> Text -- ^ The name of the production for this node.
   -> Range -- ^ The character range that the term occupies.
-  -> [Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])] -- ^ The child nodes of the term.
-  -> IO (Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])) -- ^ The resulting term, in IO.
-termConstructor source sourceSpan name range children
+  -> [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ The child nodes of the term.
+  -> IO [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ All child nodes (included unnamed productions) of the term as 'IO'. Only use this if you need it.
+  -> IO (SyntaxTerm Text '[Range, Category, SourceSpan]) -- ^ The resulting term, in IO.
+termConstructor source sourceSpan name range children allChildren
   | name == "ERROR" = withDefaultInfo (S.Error children)
+  | name `elem` operators = do
+    allChildren' <- allChildren
+    withDefaultInfo $ S.Operator allChildren'
   | otherwise = withDefaultInfo $ case (name, children) of
-    ("return_statement", _) -> S.Return (listToMaybe children)
+    ("return_statement", _) -> S.Return children
+    ("trailing_return_statement", _) -> S.Return children
     ("assignment", [ identifier, value ]) -> S.Assignment identifier value
     ("assignment", _ ) -> S.Error children
-    ("math_assignment", [ identifier, value ]) -> S.MathAssignment identifier value
+    ("math_assignment", [ identifier, value ]) -> S.OperatorAssignment identifier value
     ("math_assignment", _ ) -> S.Error children
     ("member_access", [ base, property ]) -> S.MemberAccess base property
     ("member_access", _ ) -> S.Error children
@@ -52,6 +57,7 @@ termConstructor source sourceSpan name range children
     ("var_assignment", [ x, y ]) -> S.VarAssignment x y
     ("var_assignment", _ ) -> S.Error children
     ("var_declaration", _) -> S.Indexed $ toVarDecl <$> children
+    ("trailing_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]
@@ -60,13 +66,21 @@ termConstructor source sourceSpan name range children
     ("pair", _) -> S.Fixed children
     ("comment", _) -> S.Comment . toText $ slice range source
     ("if_statement", expr : rest ) -> S.If expr rest
+    ("trailing_if_statement", expr : rest ) -> S.If expr rest
     ("if_statement", _ ) -> S.Error children
+    ("trailing_if_statement", _ ) -> S.Error children
     ("while_statement", expr : rest ) -> S.While expr rest
+    ("trailing_while_statement", expr : rest ) -> S.While expr rest
     ("while_statement", _ ) -> S.Error children
+    ("trailing_while_statement", _ ) -> S.Error children
     ("do_statement", [ expr, body ]) -> S.DoWhile expr body
+    ("trailing_do_statement", [ expr, body ]) -> S.DoWhile expr body
     ("do_statement", _ ) -> S.Error children
+    ("trailing_do_statement", _ ) -> S.Error children
     ("throw_statement", [ expr ]) -> S.Throw expr
+    ("trailing_throw_statement", [ expr ]) -> S.Throw expr
     ("throw_statment", _ ) -> S.Error children
+    ("trailing_throw_statment", _ ) -> S.Error children
     ("new_expression", [ expr ]) -> S.Constructor expr
     ("new_expression", _ ) -> S.Error children
     ("try_statement", _) -> case children of
@@ -92,10 +106,11 @@ termConstructor source sourceSpan name range children
       S.Indexed _ -> S.Export Nothing (toList (unwrap statements))
       _ -> S.Export (Just statements) []
     ("export_statement", _ ) -> S.Error children
+    ("break_statement", [ expr ] ) -> S.Break expr
+    ("yield_statement", _ ) -> S.Yield children
     _ | name `elem` forStatements -> case unsnoc children of
           Just (exprs, body) -> S.For exprs [body]
           _ -> S.Error children
-    _ | name `elem` operators -> S.Operator children
     _ | name `elem` functions -> case children of
           [ body ] -> S.AnonymousFunction [] [body]
           [ params, body ] -> S.AnonymousFunction (toList (unwrap params)) [body]
@@ -114,6 +129,7 @@ categoryForJavaScriptProductionName :: Text -> Category
 categoryForJavaScriptProductionName name = case name of
   "object" -> Object
   "expression_statement" -> ExpressionStatements
+  "trailing_expression_statement" -> ExpressionStatements
   "this_expression" -> Identifier
   "null" -> Identifier
   "undefined" -> Identifier
@@ -125,13 +141,18 @@ categoryForJavaScriptProductionName name = case name of
   "delete_op" -> Operator -- delete operator, e.g. delete x[2].
   "type_op" -> Operator -- type operator, e.g. typeof Object.
   "void_op" -> Operator -- void operator, e.g. void 2.
+  "for_statement" -> For
+  "trailing_for_statement" -> For
   "for_in_statement" -> For
+  "trailing_for_in_statement" -> For
   "for_of_statement" -> For
+  "trailing_for_of_statement" -> For
   "new_expression" -> Constructor
   "class"  -> Class
   "catch" -> Catch
   "finally" -> Finally
   "if_statement" -> If
+  "trailing_if_statement" -> If
   "empty_statement" -> Empty
   "program" -> Program
   "ERROR" -> Error
@@ -156,17 +177,21 @@ categoryForJavaScriptProductionName name = case name of
   "template_string" -> TemplateString
   "var_assignment" -> VarAssignment
   "var_declaration" -> VarDecl
+  "trailing_var_declaration" -> VarDecl
   "switch_statement" -> Switch
   "math_assignment" -> MathAssignment
   "case" -> Case
   "true" -> Boolean
   "false" -> Boolean
   "ternary" -> Ternary
-  "for_statement" -> For
   "while_statement" -> While
+  "trailing_while_statement" -> While
   "do_statement" -> DoWhile
+  "trailing_do_statement" -> DoWhile
   "return_statement" -> Return
+  "trailing_return_statement" -> Return
   "throw_statement" -> Throw
+  "trailing_throw_statement" -> Throw
   "try_statement" -> Try
   "method_definition" -> Method
   "comment" -> Comment
@@ -174,4 +199,7 @@ categoryForJavaScriptProductionName name = case name of
   "rel_op" -> RelationalOperator
   "import_statement" -> Import
   "export_statement" -> Export
+  "break_statement" -> Break
+  "continue_statement" -> Continue
+  "yield_statement" -> Yield
   _ -> Other name

src/Language/Ruby.hs

@@ -11,26 +11,24 @@ import qualified Syntax as S
 import Term
 
 operators :: [Text]
-operators = [ "and", "boolean_and", "or", "boolean_or", "bitwise_or", "bitwise_and", "shift", "relational", "comparison" ]
-
-functions :: [Text]
-functions = [ "lambda_literal", "lambda_expression" ]
+operators = ["binary", "unary", "range", "scope_resolution"]
 
 termConstructor
   :: Source Char -- ^ The source that the term occurs within.
   -> IO SourceSpan -- ^ The span that the term occupies. This is passed in 'IO' to guarantee some access constraints & encourage its use only when needed (improving performance).
   -> Text -- ^ The name of the production for this node.
   -> Range -- ^ The character range that the term occupies.
-  -> [Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])] -- ^ The child nodes of the term.
-  -> IO (Term (S.Syntax Text) (Record '[Range, Category, SourceSpan])) -- ^ The resulting term, in IO.
-termConstructor source sourceSpan name range children
+  -> [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ The child nodes of the term.
+  -> IO [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -- ^ All child nodes (included unnamed productions) of the term as 'IO'. Only use this if you need it.
+  -> IO (SyntaxTerm Text '[Range, Category, SourceSpan]) -- ^ The resulting term, in IO.
+termConstructor source sourceSpan name range children allChildren
   | 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
+  | name == "unless" = case children of
     ( expr : rest ) -> do
       condition <- withRecord (setCategory (extract expr) Negate) (S.Negate expr)
       withDefaultInfo $ S.If condition rest
@@ -40,11 +38,14 @@ termConstructor source sourceSpan name range children
       condition <- withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)
       withDefaultInfo $ S.While condition [lhs]
     _ -> withDefaultInfo $ S.Error children
-  | name == "until_statement" = case children of
+  | name == "until" = case children of
     ( expr : rest ) -> do
       condition <- withRecord (setCategory (extract expr) Negate) (S.Negate expr)
       withDefaultInfo $ S.While condition rest
     _ -> withDefaultInfo $ S.Error children
+  | name `elem` operators = do
+    allChildren' <- allChildren
+    withDefaultInfo $ S.Operator allChildren'
   | otherwise = withDefaultInfo $ case (name, children) of
     ("argument_pair", [ k, v ] ) -> S.Pair k v
     ("argument_pair", _ ) -> S.Error children
@@ -57,7 +58,7 @@ termConstructor source sourceSpan name range children
     ("array", _ ) -> S.Array Nothing children
     ("assignment", [ identifier, value ]) -> S.Assignment identifier value
     ("assignment", _ ) -> S.Error children
-    ("begin_statement", _ ) -> case partition (\x -> category (extract x) == Rescue) children of
+    ("begin", _ ) -> 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 ]
@@ -69,65 +70,67 @@ termConstructor source sourceSpan name range children
           [ 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
+    ("case", expr : body ) -> S.Switch expr body
+    ("case", _ ) -> S.Error children
+    ("when", condition : body ) -> S.Case condition body
+    ("when", _ ) -> S.Error children
+    ("class", constant : rest ) -> case rest of
+      ( superclass : body ) | Superclass <- category (extract superclass) -> S.Class constant (Just superclass) body
+      _ -> S.Class constant Nothing rest
+    ("class", _ ) -> S.Error children
+    ("singleton_class", identifier : rest ) -> S.Class identifier Nothing rest
+    ("singleton_class", _ ) -> S.Error children
     ("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 children of
+    ("constant", _ ) -> S.Fixed children
+    ("method_call", _ ) -> case children of
       member : args | MemberAccess <- category (extract member) -> 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
+    ("lambda", _) -> case children of
+      [ body ] -> S.AnonymousFunction [] [body]
+      ( params : body ) -> S.AnonymousFunction (toList (unwrap params)) body
+      _ -> S.Error children
     ("hash", _ ) -> S.Object Nothing $ foldMap toTuple children
     ("if_modifier", [ lhs, condition ]) -> S.If condition [lhs]
     ("if_modifier", _ ) -> S.Error children
-    ("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
+    ("if", condition : body ) -> S.If condition body
+    ("if", _ ) -> S.Error children
+    ("elsif", condition : body ) -> S.If condition body
+    ("elsif", _ ) -> 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", _ ) -> case children of
+    ("for", lhs : expr : rest ) -> S.For [lhs, expr] rest
+    ("for", _ ) -> S.Error children
+    ("operator_assignment", [ identifier, value ]) -> S.OperatorAssignment identifier value
+    ("operator_assignment", _ ) -> S.Error children
+    ("call", [ base, property ]) -> S.MemberAccess base property
+    ("call", _ ) -> S.Error children
+    ("method", _ ) -> 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
-        | RescueArgs <- 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 | RescueArgs <- category (extract args) -> S.Rescue (toList (unwrap args)) body
+    ("module", constant : body ) -> S.Module constant body
+    ("module", _ ) -> S.Error children
+    ("rescue", _ ) -> case children of
+      exceptions : exceptionVar : rest
+        | RescueArgs <- category (extract exceptions)
+        , RescuedException <- category (extract exceptionVar) -> S.Rescue (toList (unwrap exceptions) <> [exceptionVar]) rest
+      exceptionVar : rest | RescuedException <- category (extract exceptionVar) -> S.Rescue [exceptionVar] rest
+      exceptions : body | RescueArgs <- category (extract exceptions) -> S.Rescue (toList (unwrap exceptions)) body
       body -> S.Rescue [] body
     ("rescue_modifier", [lhs, rhs] ) -> S.Rescue [lhs] [rhs]
     ("rescue_modifier", _ ) -> S.Error children
-    ("return_statement", _ ) -> S.Return (listToMaybe children)
+    ("return", _ ) -> S.Return 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)
-    _ | name `elem` operators -> S.Operator children
-    _ | name `elem` functions -> case children of
-          [ body ] -> S.AnonymousFunction [] [body]
-          ( params : body ) -> S.AnonymousFunction (toList (unwrap params)) body
-          _ -> S.Error children
+    ("while", expr : rest ) -> S.While expr rest
+    ("while", _ ) -> S.Error children
+    ("yield", _ ) -> S.Yield children
+    _ | name `elem` ["begin_block", "end_block"] -> S.BlockStatement children
     (_, []) -> S.Leaf . toText $ slice range source
     _  -> S.Indexed children
   where
@@ -141,68 +144,71 @@ termConstructor source sourceSpan name range children
 
 categoryForRubyName :: Text -> Category
 categoryForRubyName = \case
-  "and" -> BooleanOperator
   "argument_list" -> Args
   "argument_pair" -> ArgumentPair
   "array" -> ArrayLiteral
   "assignment" -> Assignment
-  "begin_statement" -> Begin
-  "bitwise_and" -> BitwiseOperator -- bitwise and, e.g &.
-  "bitwise_or" -> BitwiseOperator -- bitwise or, e.g. ^, |.
+  "begin_block" -> BeginBlock
+  "begin" -> Begin
+  "binary" -> Binary
   "block_parameter" -> BlockParameter
-  "boolean_and" -> BooleanOperator -- boolean and, e.g. &&.
-  "boolean_or" -> BooleanOperator -- boolean or, e.g. &&.
   "boolean" -> Boolean
-  "case_statement" -> Case
-  "class_declaration"  -> Class
+  "call" -> MemberAccess
+  "case" -> Case
+  "class"  -> Class
   "comment" -> Comment
-  "comparison" -> RelationalOperator -- comparison operator, e.g. <, <=, >=, >.
-  "conditional_assignment" -> ConditionalAssignment
   "conditional" -> Ternary
+  "constant" -> Constant
   "element_reference" -> SubscriptAccess
-  "else_block" -> Else
-  "elsif_block" -> Elsif
-  "ensure_block" -> Ensure
+  "else" -> Else
+  "elsif" -> Elsif
+  "end_block" -> EndBlock
+  "ensure" -> Ensure
   "ERROR" -> Error
-  "float" -> FloatLiteral
-  "for_statement" -> For
+  "exception_variable" -> RescuedException
+  "exceptions" -> RescueArgs
+  "false" -> Boolean
+  "float" -> NumberLiteral
+  "for" -> For
   "formal_parameters" -> Params
-  "function_call" -> FunctionCall
-  "function" -> Function
   "hash_splat_parameter" -> HashSplatParameter
   "hash" -> Object
   "identifier" -> Identifier
   "if_modifier" -> If
-  "if_statement" -> If
+  "if" -> If
+  "instance_variable" -> Identifier
   "integer" -> IntegerLiteral
   "interpolation" -> Interpolation
   "keyword_parameter" -> KeywordParameter
-  "math_assignment" -> MathAssignment
-  "member_access" -> MemberAccess
-  "method_declaration" -> Method
-  "module_declaration"  -> Module
+  "method_call" -> MethodCall
+  "method" -> Method
+  "module"  -> Module
   "nil" -> Identifier
+  "operator_assignment" -> OperatorAssignment
   "optional_parameter" -> OptionalParameter
-  "or" -> BooleanOperator
+  "pair" -> Pair
   "program" -> Program
+  "range" -> RangeExpression
   "regex" -> Regex
-  "relational" -> RelationalOperator -- relational operator, e.g. ==, !=, ===, <=>, =~, !~.
-  "rescue_arguments" -> RescueArgs
-  "rescue_block" -> Rescue
   "rescue_modifier" -> RescueModifier
-  "rescued_exception" -> RescuedException
-  "return_statement" -> Return
-  "shift" -> BitwiseOperator -- bitwise shift, e.g <<, >>.
+  "rescue" -> Rescue
+  "return" -> Return
+  "scope_resolution" -> ScopeOperator
+  "self" -> Identifier
+  "singleton_class"  -> SingletonClass
   "splat_parameter" -> SplatParameter
   "string" -> StringLiteral
   "subshell" -> Subshell
+  "superclass" -> Superclass
   "symbol" -> SymbolLiteral
+  "true" -> Boolean
+  "unary" -> Unary
   "unless_modifier" -> Unless
-  "unless_statement" -> Unless
+  "unless" -> Unless
   "until_modifier" -> Until
-  "until_statement" -> Until
-  "when_block" -> When
+  "until" -> Until
+  "when" -> When
   "while_modifier" -> While
-  "while_statement" -> While
+  "while" -> While
   "yield" -> Yield
   s -> Other s

src/Parse.hs

@@ -6,11 +6,11 @@ import Category
 import Data.Aeson (ToJSON)
 import Data.Aeson.Encode.Pretty
 import qualified Data.ByteString.Char8 as B1
-import qualified Data.ByteString.Lazy as BL
 import qualified Data.Text.ICU.Convert as Convert
 import qualified Data.Text.ICU.Detect as Detect
 import Data.Record
 import qualified Data.Text as T
+import qualified Data.Text.IO as T
 import Info
 import Language
 import Language.Markdown
@@ -22,7 +22,9 @@ import System.FilePath
 import Term
 import TreeSitter
 import Text.Parser.TreeSitter.Language
+import Renderer
 import Renderer.JSON()
+import Renderer.SExpression
 
 data ParseJSON = ParseJSON
   { category :: Text
@@ -36,7 +38,9 @@ run Arguments{..} = do
   sources <- sequence $ readAndTranscodeFile <$> filePaths
   terms <- zipWithM (\parser sourceBlob -> parser sourceBlob) parsers (sourceBlobs sources)
 
-  writeToOutput output (cata algebra <$> terms)
+  writeToOutput output $ case format of
+    SExpression -> [foldr (\t acc -> printTerm t 0 <> acc) "" terms]
+    _ -> toS . encodePretty . cata algebra <$> terms
 
   where
     sourceBlobs sources = Source.SourceBlob <$> sources <*> pure mempty <*> filePaths <*> pure (Just Source.defaultPlainBlob)
@@ -51,11 +55,11 @@ run Arguments{..} = do
         range' = characterRange
         text' = Info.sourceText
 
-    writeToOutput :: Maybe FilePath -> [ParseJSON] -> IO ()
-    writeToOutput output parseJSON =
+    writeToOutput :: Maybe FilePath -> [Text] -> IO ()
+    writeToOutput output text =
       case output of
-        Nothing -> for_ parseJSON (putStrLn . encodePretty)
-        Just path -> for_ parseJSON (BL.writeFile path . encodePretty)
+        Nothing -> for_ text putStrLn
+        Just path -> for_ text (T.writeFile path)
 
 -- | Return a parser that decorates with the cost of a term and its children.
 parserWithCost :: FilePath -> Parser (Syntax Text) (Record '[Cost, Range, Category, SourceSpan])

src/Renderer.hs

@@ -17,10 +17,10 @@ data DiffArguments = DiffArguments { format :: Format, output :: Maybe FilePath
  deriving (Show)
 
 -- | The available types of diff rendering.
-data Format = Split | Patch | JSON | Summary
+data Format = Split | Patch | JSON | Summary | SExpression
   deriving (Show)
 
-data Output = SplitOutput Text | PatchOutput Text | JSONOutput (Map Text Value) | SummaryOutput (Map Text (Map Text [Value]))
+data Output = SplitOutput Text | PatchOutput Text | JSONOutput (Map Text Value) | SummaryOutput (Map Text (Map Text [Value])) | SExpressionOutput Text
   deriving (Show)
 
 -- Returns a key representing the filename. If the filenames are different,
@@ -64,9 +64,11 @@ isSummary _ = False
 isText :: [Output] -> Bool
 isText (SplitOutput _ : _) = True
 isText (PatchOutput _ : _) = True
+isText (SExpressionOutput _ : _) = True
 isText _ = False
 
 toText :: Output -> Text
 toText (SplitOutput text) = text
 toText (PatchOutput text) = text
+toText (SExpressionOutput text) = text
 toText _ = mempty

src/Renderer/JSON.hs

@@ -66,7 +66,11 @@ instance (ToJSON (Record fields), ToJSON leaf, HasField fields Category, HasFiel
   toEncoding term |
     (info :< syntax) <- runCofree term = pairs $ mconcat (termFields info syntax)
 
-lineFields :: (ToJSON leaf, ToJSON (Record fields), HasField fields Category, HasField fields Range) => KeyValue kv => Int -> SplitSyntaxDiff leaf fields -> Range -> [kv]
+lineFields :: (ToJSON leaf, ToJSON (Record fields), HasField fields Category, HasField fields Range, KeyValue kv) =>
+  Int ->
+  SplitSyntaxDiff leaf fields ->
+  Range ->
+  [kv]
 lineFields n term range = [ "number" .= n
                           , "terms" .= [ term ]
                           , "range" .= range
@@ -79,7 +83,9 @@ termFields :: (ToJSON recur, KeyValue kv, HasField fields Category, HasField fie
   [kv]
 termFields info syntax = "range" .= characterRange info : "category" .= category info : syntaxToTermField syntax
 
-patchFields :: (ToJSON (Record fields), ToJSON leaf, KeyValue kv, HasField fields Category, HasField fields Range) => SplitPatch (SyntaxTerm leaf fields) -> [kv]
+patchFields :: (ToJSON (Record fields), ToJSON leaf, KeyValue kv, HasField fields Category, HasField fields Range) =>
+  SplitPatch (SyntaxTerm leaf fields) ->
+  [kv]
 patchFields patch = case patch of
   SplitInsert term -> fields "insert" term
   SplitDelete term -> fields "delete" term
@@ -88,7 +94,9 @@ patchFields patch = case patch of
     fields kind term |
       (info :< syntax) <- runCofree term = "patch" .= T.pack kind : termFields info syntax
 
-syntaxToTermField :: (ToJSON recur, KeyValue kv) => Syntax leaf recur -> [kv]
+syntaxToTermField :: (ToJSON recur, KeyValue kv) =>
+  Syntax leaf recur ->
+  [kv]
 syntaxToTermField syntax = case syntax of
   Leaf _ -> []
   Indexed c -> childrenFields c
@@ -98,7 +106,7 @@ syntaxToTermField syntax = case syntax of
   S.AnonymousFunction parameters c -> [ "parameters" .= parameters ] <> childrenFields c
   S.Function identifier parameters c -> [ "identifier" .= identifier ] <> [ "parameters" .= parameters ] <> childrenFields c
   S.Assignment assignmentId value -> [ "identifier" .= assignmentId ] <> [ "value" .= value ]
-  S.MathAssignment identifier value -> [ "identifier" .= identifier ] <> [ "value" .= value ]
+  S.OperatorAssignment 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.Operator syntaxes -> [ "operatorSyntaxes" .= syntaxes ]
@@ -126,7 +134,6 @@ syntaxToTermField syntax = case syntax of
   S.Module identifier definitions-> [ "identifier" .= identifier ] <> [ "definitions" .= definitions ]
   S.Import identifier statements -> [ "identifier" .= identifier ] <> [ "statements" .= statements ]
   S.Export identifier statements -> [ "identifier" .= identifier ] <> [ "statements" .= statements ]
-  S.ConditionalAssignment id value -> [ "conditionalIdentifier" .= id ] <> [ "value" .= value ]
   S.Yield expr -> [ "yieldExpression" .= expr ]
   S.Negate expr -> [ "negate" .= expr ]
   S.Rescue args expressions -> [ "args" .= args ] <> childrenFields expressions
@@ -136,4 +143,7 @@ syntaxToTermField syntax = case syntax of
   S.TypeAssertion a b -> childrenFields [a, b]
   S.TypeConversion a b -> childrenFields [a, b]
   S.Struct ty fields -> [ "type" .= ty ] <> childrenFields fields
+  S.Break expr -> [ "expression" .= expr ]
+  S.Continue expr -> [ "expression" .= expr ]
+  S.BlockStatement c -> childrenFields c
   where childrenFields c = [ "children" .= c ]

src/Renderer/SExpression.hs

@@ -0,0 +1,50 @@
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
+module Renderer.SExpression (sExpression, printTerm) where
+
+import Data.Bifunctor.Join
+import Data.Foldable
+import Data.Record
+import Data.Text hiding (foldr, replicate)
+import Prologue hiding (toList, intercalate)
+
+import Category as C
+import Diff
+import Renderer
+import Patch
+import Info
+import Syntax
+import Term
+
+sExpression :: (HasField fields Category, HasField fields SourceSpan) => Renderer (Record fields)
+sExpression _ diff = SExpressionOutput $ printDiff diff 0
+
+printDiff :: (HasField fields Category, HasField fields SourceSpan) => Diff (Syntax Text) (Record fields) -> Int -> Text
+printDiff diff level = case runFree diff of
+  (Pure patch) -> case patch of
+    Insert term -> pad (level - 1) <> "{+" <> printTerm term level <> "}"
+    Delete term -> pad (level - 1) <> "{-" <> printTerm term level <> "}"
+    Replace a b -> pad (level - 1) <> "{" <> printTerm a level <> "->" <> printTerm b level <> "}"
+  (Free (Join (_, annotation) :< syntax)) -> pad level <> "(" <> showAnnotation annotation <> foldr (\d acc -> printDiff d (level + 1) <> acc) "" syntax <> ")"
+  where
+    pad n | n < 1 = ""
+          | otherwise = "\n" <> mconcat (replicate n "  ")
+
+printTerm :: (HasField fields Category, HasField fields SourceSpan) => Term (Syntax t) (Record fields) -> Int -> Text
+printTerm term level = go term level 0
+  where
+    pad p n | n < 1 = ""
+            | otherwise = "\n" <> mconcat (replicate (p + n) "  ")
+    go term parentLevel level = case runCofree term of
+      (annotation :< Leaf _) -> pad parentLevel level <> "(" <> showAnnotation annotation <> ")"
+      (annotation :< syntax) -> pad parentLevel level <> "(" <> showAnnotation annotation <> foldr (\t acc -> go t parentLevel (level + 1) <> acc) "" syntax <> ")"
+
+showAnnotation :: (HasField fields Category, HasField fields SourceSpan) => Record fields -> Text
+showAnnotation annotation = categoryName annotation <> " " <> showSourceSpan annotation
+  where
+    showSourceSpan a = start a <> " - " <> end a
+    start = showPoint . spanStart . getField
+    end = showPoint . spanEnd . getField
+    showPoint SourcePos{..} = "[" <> show line <> ", " <> show column <> "]"
+
+categoryName :: HasField fields Category => Record fields -> Text
+categoryName = toS . category

src/Renderer/Split.hs

@@ -87,7 +87,7 @@ styleName category = "category-" <> case category of
   C.AnonymousFunction -> "anonymous_function"
   C.Interpolation -> "interpolation"
   C.Subshell -> "subshell"
-  C.ConditionalAssignment -> "conditional_assignment"
+  C.OperatorAssignment -> "operator_assignment"
   C.Yield -> "yield_statement"
   C.Until -> "until"
   C.Unless -> "unless_statement"
@@ -117,6 +117,17 @@ styleName category = "category-" <> case category of
   C.DictionaryTy -> "dictionary_type"
   C.StructTy -> "struct_type"
   C.Struct -> "struct"
+  C.Break -> "break_statement"
+  C.Continue -> "continue_statement"
+  C.Binary -> "binary"
+  C.Unary -> "unary"
+  C.Constant -> "constant"
+  C.Superclass -> "superclass"
+  C.SingletonClass -> "singleton_class"
+  C.RangeExpression -> "range"
+  C.ScopeOperator -> "scope_operator"
+  C.BeginBlock -> "begin_block"
+  C.EndBlock -> "end_block"
 
 -- | Pick the class name for a split patch.
 splitPatchToClassName :: SplitPatch a -> AttributeValue

src/SemanticDiff.hs

@@ -50,7 +50,8 @@ argumentsParser = info (version <*> helper <*> argumentsP)
       <$> (flag R.Split R.Patch (long "patch" <> help "output a patch(1)-compatible diff")
       <|> flag R.Split R.JSON (long "json" <> help "output a json diff")
       <|> flag' R.Split (long "split" <> help "output a split diff")
-      <|> flag' R.Summary (long "summary" <> help "output a diff summary"))
+      <|> flag' R.Summary (long "summary" <> help "output a diff summary")
+      <|> flag' R.SExpression (long "sexpression" <> help "output an s-expression diff tree"))
       <*> optional (option auto (long "timeout" <> help "timeout for per-file diffs in seconds, defaults to 7 seconds"))
       <*> optional (strOption (long "output" <> short 'o' <> help "output directory for split diffs, defaults to stdout if unspecified"))
       <*> switch (long "no-index" <> help "compare two paths on the filesystem")

src/Syntax.hs

@@ -28,8 +28,8 @@ data Syntax a f
   | Function { id :: f, params :: [f], expressions :: [f] }
   -- | An assignment has an identifier where f can be a member access, and the value is another syntax element (function call, leaf, etc.)
   | Assignment { assignmentId :: f, value :: f }
-  -- | A math assignment represents expressions whose operator classifies as mathy (e.g. += or *=).
-  | MathAssignment { mathAssignmentId :: f, value :: f }
+  -- | An operator assignment represents expressions with operators like math (e.g x += 1) or conditional (e.g. x ||= 1) assignment.
+  | OperatorAssignment f f
   -- | A member access contains a syntax, and another syntax that identifies a property or value in the first syntax.
   -- | e.g. in Javascript x.y represents a member access syntax.
   | MemberAccess { memberId :: f, property :: f }
@@ -60,7 +60,7 @@ data Syntax a f
   | For [f] [f]
   | DoWhile { doWhileBody :: f, doWhileExpr :: f }
   | While { whileExpr :: f, whileBody :: [f] }
-  | Return (Maybe f)
+  | Return [f]
   | Throw f
   | Constructor f
   -- | TODO: Is it a problem that in Ruby, this pattern can work for method def too?
@@ -77,9 +77,7 @@ data Syntax a f
   | Module { moduleId:: f, moduleBody :: [f] }
   | Import f [f]
   | Export (Maybe f) [f]
-  -- | A conditional assignment represents expressions whose operator classifies as conditional (e.g. ||= or &&=).
-  | ConditionalAssignment { conditionalAssignmentId :: f, value :: f }
-  | Yield (Maybe f)
+  | Yield [f]
   -- | A negation of a single expression.
   | Negate f
   -- | A rescue block has a list of arguments to rescue and a list of expressions.
@@ -90,6 +88,10 @@ data Syntax a f
   | TypeConversion f f
   -- | A struct with an optional type
   | Struct (Maybe f) [f]
+  | Break f
+  | Continue f
+  -- | A block statement has an ordered branch of child nodes, e.g. BEGIN {...} or END {...} in Ruby/Perl.
+  | BlockStatement [f]
   deriving (Eq, Foldable, Functor, Generic, Generic1, Mergeable, Ord, Show, Traversable, ToJSON)
 
 

src/TreeSitter.hs

@@ -49,13 +49,18 @@ documentToTerm language document SourceBlob{..} = alloca $ \ root -> do
           let endPos = SourcePos (1 + (fromIntegral $! ts_node_p_end_point_row node)) (1 + (fromIntegral $! ts_node_p_end_point_column node))
           let sourceSpan = SourceSpan { spanStart = startPos , spanEnd = endPos }
 
+          allChildrenCount <- ts_node_p_child_count node
+          let allChildren = filter isNonEmpty <$> traverse (alloca . getUnnamedChild node) (take (fromIntegral allChildrenCount) [0..])
+
           -- Note: The strict application here is semantically important.
           -- Without it, we may not evaluate the range until after we’ve exited
           -- the scope that `node` was allocated within, meaning `alloca` will
           -- free it & other stack data may overwrite it.
-          range `seq` termConstructor source (pure $! sourceSpan) (toS name) range children
+          range `seq` termConstructor source (pure $! sourceSpan) (toS name) range children allChildren
         getChild node n out = ts_node_p_named_child node n out >> toTerm out
         {-# INLINE getChild #-}
+        getUnnamedChild node n out = ts_node_p_child node n out >> toTerm out
+        {-# INLINE getUnnamedChild #-}
         termConstructor = case language of
           JavaScript -> JS.termConstructor
           C -> C.termConstructor

test/DiffSummarySpec.hs

@@ -36,10 +36,10 @@ testDiff :: Diff (Syntax Text) (Record '[Category, Range, SourceSpan])
 testDiff = free $ Free (pure arrayInfo :< Indexed [ free $ Pure (Insert (cofree $ literalInfo :< Leaf "\"a\"")) ])
 
 testSummary :: DiffSummary DiffInfo
-testSummary = DiffSummary { patch = Insert (LeafInfo "string" "a" $ sourceSpanBetween (1,1) (1, 2)), parentAnnotation = [] }
+testSummary = DiffSummary { patch = Insert (LeafInfo StringLiteral "a" $ sourceSpanBetween (1,1) (1, 2)), parentAnnotation = [] }
 
 replacementSummary :: DiffSummary DiffInfo
-replacementSummary = DiffSummary { patch = Replace (LeafInfo "string" "a" $ sourceSpanBetween (1, 2) (1, 4)) (LeafInfo "symbol" "b" $ sourceSpanBetween (1,1) (1, 2)), parentAnnotation = [Left (Info.FunctionCall, "foo")] }
+replacementSummary = DiffSummary { patch = Replace (LeafInfo StringLiteral "a" $ sourceSpanBetween (1, 2) (1, 4)) (LeafInfo SymbolLiteral "b" $ sourceSpanBetween (1,1) (1, 2)), parentAnnotation = [Left (Info.FunctionCall, "foo")] }
 
 blobs :: Both SourceBlob
 blobs = both (SourceBlob (fromText "[]") nullOid "a.js" (Just defaultPlainBlob)) (SourceBlob (fromText "[a]") nullOid "b.js" (Just defaultPlainBlob))

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

@@ -1,30 +0,0 @@
-[{
-    "testCaseDescription": "javascript-boolean-operator-delete-insert-test",
-    "expectedResult": {
-        "changes": {
-            "boolean-operator.js": [ "Added the 'i || j' binary operator", "Deleted the 'i && j' binary operator" ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "boolean-operator.js"
-    ],
-    "patch": [],
-    "gitDir": "test/corpus/repos/javascript",
-    "shas": "c57d91166c3246b8e352252024dc21de6a42f707..244097ce5a74d6275f249d5159a6a14696a1eddf"
-}
-,{
-    "testCaseDescription": "javascript-boolean-operator-replacement-test",
-    "expectedResult": {
-        "changes": {
-            "boolean-operator.js": [ "Added the 'i && j' binary operator", "Deleted the 'i || j' binary operator" ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "boolean-operator.js"
-    ],
-    "patch": [],
-    "gitDir": "test/corpus/repos/javascript",
-    "shas": "244097ce5a74d6275f249d5159a6a14696a1eddf..0abfc815d9c5912259cfc25becb398a8f1444d40"
-}]

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

@@ -1,30 +0,0 @@
-[{
-    "testCaseDescription": "javascript-relational-operator-delete-insert-test",
-    "expectedResult": {
-        "changes": {
-            "relational-operator.js": [ "Added the 'x < y' relational operator","Deleted the 'x <= y' relational operator" ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "relational-operator.js"
-    ],
-    "patch": [],
-    "gitDir": "test/corpus/repos/javascript",
-    "shas": "f79a619c0277b82bb45cb1510847b78ba44ea31b..1fc7441b1fb64b171cf7892e3ce25bc55e25d754"
-}
-,{
-    "testCaseDescription": "javascript-relational-operator-replacement-test",
-    "expectedResult": {
-        "changes": {
-            "relational-operator.js": [ "Added the 'x <= y' relational operator","Deleted the 'x < y' relational operator" ]
-        },
-        "errors": {}
-    },
-    "filePaths": [
-        "relational-operator.js"
-    ],
-    "patch": [],
-    "gitDir": "test/corpus/repos/javascript",
-    "shas": "1fc7441b1fb64b171cf7892e3ce25bc55e25d754..e1d768da1e35b8066276dc5b5f9653442345948d"
-}]

test/corpus/diff-summaries-todo2/ruby/multiple-assignments.json

@@ -0,0 +1,383 @@
+[{
+    "testCaseDescription": "ruby-multiple-assignments-insert-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                23
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier' assignment"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index e69de29..348cf74 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -0,0 +1 @@",
+        "+x, y, z = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "a966f9b2783f127617cc42cbed16e6ec570b75ad..850232b2802cc99838c38bb6884e78c8675d900d"
+}
+,{
+    "testCaseDescription": "ruby-multiple-assignments-replacement-insert-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                21
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier' assignment"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                23
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier' assignment"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index 348cf74..242315a 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -1 +1,3 @@",
+        "+x, *y = [10, 20, 30]",
+        "+x, y, z = [10, 20, 30]",
+        " x, y, z = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "850232b2802cc99838c38bb6884e78c8675d900d..2f0556416a97d736bf681a377c0a17ad20fe03a1"
+}
+,{
+    "testCaseDescription": "ruby-multiple-assignments-delete-insert-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'y' identifier in an assignment to identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                7
+                            ],
+                            "end": [
+                                1,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'z' identifier in an assignment to identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                5
+                            ],
+                            "end": [
+                                1,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'y' identifier in an assignment to identifier"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index 242315a..274faf2 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -1,3 +1,3 @@",
+        "-x, *y = [10, 20, 30]",
+        "+x, y, z = [10, 20, 30]",
+        " x, y, z = [10, 20, 30]",
+        " x, y, z = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "2f0556416a97d736bf681a377c0a17ad20fe03a1..4cf32e342e860dec68b496ba04ed8fca1d04a08f"
+}
+,{
+    "testCaseDescription": "ruby-multiple-assignments-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                5
+                            ],
+                            "end": [
+                                1,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'y' identifier in an assignment to identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'y' identifier in an assignment to identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                7
+                            ],
+                            "end": [
+                                1,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'z' identifier in an assignment to identifier"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index 274faf2..242315a 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -1,3 +1,3 @@",
+        "-x, y, z = [10, 20, 30]",
+        "+x, *y = [10, 20, 30]",
+        " x, y, z = [10, 20, 30]",
+        " x, y, z = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "4cf32e342e860dec68b496ba04ed8fca1d04a08f..3d3c3f2b1d6ed385e8c69eb0de5f5db36abd1f93"
+}
+,{
+    "testCaseDescription": "ruby-multiple-assignments-delete-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                21
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'identifier' assignment"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                23
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'identifier' assignment"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                21
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'identifier' assignment"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index 242315a..7ba9487 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -1,3 +1,2 @@",
+        "-x, *y = [10, 20, 30]",
+        "-x, y, z = [10, 20, 30]",
+        " x, y, z = [10, 20, 30]",
+        "+x, *y = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "3d3c3f2b1d6ed385e8c69eb0de5f5db36abd1f93..b724179373843cb5f953b1eb84fe3cf1f787cae1"
+}
+,{
+    "testCaseDescription": "ruby-multiple-assignments-delete-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                23
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'identifier' assignment"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index 7ba9487..32cf6a2 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -1,2 +1 @@",
+        "-x, y, z = [10, 20, 30]",
+        " x, *y = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "b724179373843cb5f953b1eb84fe3cf1f787cae1..9470930d6fca5e33ec313863fbe1c443d7388dbe"
+}
+,{
+    "testCaseDescription": "ruby-multiple-assignments-delete-rest-test",
+    "expectedResult": {
+        "changes": {
+            "multiple-assignments.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                21
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'identifier' assignment"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "multiple-assignments.rb"
+    ],
+    "patch": [
+        "diff --git a/multiple-assignments.rb b/multiple-assignments.rb",
+        "index 32cf6a2..e69de29 100644",
+        "--- a/multiple-assignments.rb",
+        "+++ b/multiple-assignments.rb",
+        "@@ -1 +0,0 @@",
+        "-x, *y = [10, 20, 30]"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "9470930d6fca5e33ec313863fbe1c443d7388dbe..d4996909ad6798a66c5242d7171125ce6dbe1a50"
+}]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d1c99bc906a6edfdaeae75ba223e81d8a753c86f..151acf63455156efb90480b28f3f1635b88c7544"
+    "shas": "c81623e5265dc1e3e2f0d5bc8724b42e25fdaf65..a3710fa959fc70ff759c73bf0a9fb7ac5095ab25"
 }
 ,{
     "testCaseDescription": "go-array-types-insert-test",
@@ -73,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '2' in the main function of the 'main' module"
+                    "summary": "Added '2' in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -88,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '2' in the main function of the 'main' module"
+                    "summary": "Added '2' in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -126,7 +126,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "151acf63455156efb90480b28f3f1635b88c7544..c5b79482628e45bbaa582f5d91fab4cfe80a75db"
+    "shas": "a3710fa959fc70ff759c73bf0a9fb7ac5095ab25..2ecff87fc18c7a9182fe492affa2c7049e01ee56"
 }
 ,{
     "testCaseDescription": "go-array-types-replacement-test",
@@ -235,7 +235,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c5b79482628e45bbaa582f5d91fab4cfe80a75db..b50819303c5010bb639785a9ea1a88dc4bdfd182"
+    "shas": "2ecff87fc18c7a9182fe492affa2c7049e01ee56..e3d10a89064d4ace7a5214c0071a0258ad9fabf4"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-replacement-test",
@@ -344,7 +344,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b50819303c5010bb639785a9ea1a88dc4bdfd182..e4fa8ca1a75d0d9cadc4af754ad21520a2616147"
+    "shas": "e3d10a89064d4ace7a5214c0071a0258ad9fabf4..08d4bb5b3471a6f758d74b850b6362ac62cdf59b"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-insert-test",
@@ -379,7 +379,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '2' in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -394,7 +394,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '2' in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -432,7 +432,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e4fa8ca1a75d0d9cadc4af754ad21520a2616147..1df159a2980c8526c4d53bde21e2a58484f16317"
+    "shas": "08d4bb5b3471a6f758d74b850b6362ac62cdf59b..3574067241820b2b99057dac82e18acfadb13a7b"
 }
 ,{
     "testCaseDescription": "go-array-types-teardown-test",
@@ -474,5 +474,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1df159a2980c8526c4d53bde21e2a58484f16317..594aa6aebbd9cba8df042b57cc6a06c8e0594212"
+    "shas": "3574067241820b2b99057dac82e18acfadb13a7b..78931e2e4465f390ff26989f161e9f799822c729"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d1c0eedbc290123938e88b7089293253841b80a0..f3f353a3698c9f1c8507f090e3534eb607b27ac8"
+    "shas": "76bcdd875f780855cc6dff6a6e525c997eddbac1..8ad268325c70179fb885600546492a7f16e8f235"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-insert-test",
@@ -96,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f3f353a3698c9f1c8507f090e3534eb607b27ac8..4ad500b20f407972c9101b7aec1e421992f4876d"
+    "shas": "8ad268325c70179fb885600546492a7f16e8f235..e7f4351eb678861323b087ccf117b5d1765da1f1"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-replacement-test",
@@ -205,7 +205,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4ad500b20f407972c9101b7aec1e421992f4876d..c5e0f9483e6162f3426be4450cf88de1ca8a37f6"
+    "shas": "e7f4351eb678861323b087ccf117b5d1765da1f1..f70b14a28d810d0b2f6ce94c9fe88ad1ddbcac71"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-replacement-test",
@@ -314,7 +314,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c5e0f9483e6162f3426be4450cf88de1ca8a37f6..b1857e82d377b9b8e4523491798c851e847be3e8"
+    "shas": "f70b14a28d810d0b2f6ce94c9fe88ad1ddbcac71..a43b52734673ad2bbb5866917161d538270ccedc"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-insert-test",
@@ -372,7 +372,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b1857e82d377b9b8e4523491798c851e847be3e8..1d8d40fc83825d3cbf0b0441c1b8fd47227818c2"
+    "shas": "a43b52734673ad2bbb5866917161d538270ccedc..e62f33662236ab1656e184831fcbabc79ed60698"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-teardown-test",
@@ -414,5 +414,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1d8d40fc83825d3cbf0b0441c1b8fd47227818c2..fb491ebb3ced908a8bed449c46f26e0dfa4a6cb5"
+    "shas": "e62f33662236ab1656e184831fcbabc79ed60698..448e795784d1aee1d1cf28bd856fbb68936b4c5d"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "dd4f747c441cd8c29eae4fe14b3d2eaa24f22282..918072c7b7aa52ead70d75087eb745e1371651c4"
+    "shas": "b82351a928b3ca013071a29952ba2996558399db..ec6c9518776a8858b574568da625c550df55fe3b"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-insert-test",
@@ -144,7 +144,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "918072c7b7aa52ead70d75087eb745e1371651c4..d1083a13f50a7b4ff745ef7b5842a67033f8be1c"
+    "shas": "ec6c9518776a8858b574568da625c550df55fe3b..bbdf27da162c7dee08a661efef087fdd4b476395"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-replacement-test",
@@ -286,7 +286,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d1083a13f50a7b4ff745ef7b5842a67033f8be1c..6c73a3c3f724f717e6f06773067750c45c9ea6ce"
+    "shas": "bbdf27da162c7dee08a661efef087fdd4b476395..b9d30f11f9ffdb8492190d7cb55f2f07b81bcf88"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-delete-replacement-test",
@@ -428,7 +428,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6c73a3c3f724f717e6f06773067750c45c9ea6ce..7ca42fb5d6f73a816bbcc08fb5c85753fd15b1f0"
+    "shas": "b9d30f11f9ffdb8492190d7cb55f2f07b81bcf88..b235ae4efe1d628091a7cc8c775badb6419d85f1"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-delete-insert-test",
@@ -534,7 +534,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7ca42fb5d6f73a816bbcc08fb5c85753fd15b1f0..9278ff79d8e62bb92ba8c2c9d726e81d9d78b5f8"
+    "shas": "b235ae4efe1d628091a7cc8c775badb6419d85f1..cb2e3201b350fb06476cdf34ce4318fd7bfdd349"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-teardown-test",
@@ -576,5 +576,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9278ff79d8e62bb92ba8c2c9d726e81d9d78b5f8..cfbc96d8376b4a52edd32a42e42a5bdf761aafd7"
+    "shas": "cb2e3201b350fb06476cdf34ce4318fd7bfdd349..dc2e5c07146f17cbac1023a5d4a3c318da0e0c2b"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "eedd4cea7ca7eda4bc841d6ac361a3d061a0e875..10d19afec25004700bb5484a425e58ede07b5cb2"
+    "shas": "0ee5a4c57cfe71d667e39f86339ab621f1653e09..32b626aa56174fd540b3f464ba2e4808d1b36bf1"
 }
 ,{
     "testCaseDescription": "go-call-expressions-insert-test",
@@ -113,7 +113,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "10d19afec25004700bb5484a425e58ede07b5cb2..7244bf6743ae38d7fe235617eb342b6273ed66a7"
+    "shas": "32b626aa56174fd540b3f464ba2e4808d1b36bf1..605698165ea7b434312895e9322330a08c4011f6"
 }
 ,{
     "testCaseDescription": "go-call-expressions-replacement-test",
@@ -226,7 +226,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7244bf6743ae38d7fe235617eb342b6273ed66a7..ae8012e2b6d46e47a209882a9a060bc984043e00"
+    "shas": "605698165ea7b434312895e9322330a08c4011f6..f816768c3e492fcfc40507d3d3b893ed4ba79797"
 }
 ,{
     "testCaseDescription": "go-call-expressions-delete-replacement-test",
@@ -339,7 +339,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ae8012e2b6d46e47a209882a9a060bc984043e00..700ceff4661bfebe4d59f4b41ef16c78feaab2ec"
+    "shas": "f816768c3e492fcfc40507d3d3b893ed4ba79797..b8fc946e6d9623894bcae9e84f681afb63d3d1fe"
 }
 ,{
     "testCaseDescription": "go-call-expressions-delete-insert-test",
@@ -414,7 +414,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "700ceff4661bfebe4d59f4b41ef16c78feaab2ec..44e6b64fd725b6e02eed99b75b7cce217f6da75f"
+    "shas": "b8fc946e6d9623894bcae9e84f681afb63d3d1fe..f3a018581afba4fb26e1de8b38929254f41678fb"
 }
 ,{
     "testCaseDescription": "go-call-expressions-teardown-test",
@@ -456,5 +456,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "44e6b64fd725b6e02eed99b75b7cce217f6da75f..6d8f90ba7b8fde72986713a25abd16264a8c4f72"
+    "shas": "f3a018581afba4fb26e1de8b38929254f41678fb..b7377716d2ab82f2ee1b51d100e3cd1bbfb8cce1"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "244fbb4d4eaca93ced3e79bbbddb3d11b85e9c31..d8d3ba18b572f4423d603bfc0f47ae294ead900e"
+    "shas": "84cea06264bc0bf28411e3655b8e64e14f3ce321..8d65ff04d00526d2bf8d853d8e28abdc85c0f51b"
 }
 ,{
     "testCaseDescription": "go-channel-types-insert-test",
@@ -160,7 +160,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d8d3ba18b572f4423d603bfc0f47ae294ead900e..f39f4653748071482f4dc5eacc06e2381630d4bc"
+    "shas": "8d65ff04d00526d2bf8d853d8e28abdc85c0f51b..0db441c537d29a935c1bf40743bd788d0158560a"
 }
 ,{
     "testCaseDescription": "go-channel-types-replacement-test",
@@ -364,7 +364,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f39f4653748071482f4dc5eacc06e2381630d4bc..d2a67e4749edb973361f9fc1ee80a030a1a781ff"
+    "shas": "0db441c537d29a935c1bf40743bd788d0158560a..f1d424a95256d135382dd383af54a83b64899c07"
 }
 ,{
     "testCaseDescription": "go-channel-types-delete-replacement-test",
@@ -517,7 +517,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d2a67e4749edb973361f9fc1ee80a030a1a781ff..c644f581cf5b78bab79db10be02710aba3824298"
+    "shas": "f1d424a95256d135382dd383af54a83b64899c07..f6bc81a3affa1db16b2ea10b75da8ff3a768a8f0"
 }
 ,{
     "testCaseDescription": "go-channel-types-delete-insert-test",
@@ -639,7 +639,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c644f581cf5b78bab79db10be02710aba3824298..1351662935a3df8394522e40559536ceefb3418b"
+    "shas": "f6bc81a3affa1db16b2ea10b75da8ff3a768a8f0..9c5d91c93f2283ce43dd7b929285c8890c7914d4"
 }
 ,{
     "testCaseDescription": "go-channel-types-teardown-test",
@@ -681,5 +681,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1351662935a3df8394522e40559536ceefb3418b..77797aa59be812e3c6a7951b5e5c8d91f27ca7a8"
+    "shas": "9c5d91c93f2283ce43dd7b929285c8890c7914d4..458af42d75cbcda4aae56e6a8ef32cbdaad4c6f2"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "66c10c5022ceda48e623eb42ec6d35b48d6f3c01..971219ac46208e473a1005866da1fc5fae000868"
+    "shas": "c920c11c245444fa22dec8859b8ec17a07ff77d3..a5474b9728c31c76e3235e98f83e6035ba971e43"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-insert-test",
@@ -96,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "971219ac46208e473a1005866da1fc5fae000868..e47d2c37502e413f09915e032ffa3f5d4fcbbf2d"
+    "shas": "a5474b9728c31c76e3235e98f83e6035ba971e43..475dc99b8074b3ea33d5c7d7e3ac63c6bcf67b85"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-replacement-test",
@@ -178,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e47d2c37502e413f09915e032ffa3f5d4fcbbf2d..34e1b5dbda320af10ff6fcb22a1574802a6aab43"
+    "shas": "475dc99b8074b3ea33d5c7d7e3ac63c6bcf67b85..cc7291c4cf52fea40e628daec45dcb63ba55385a"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-replacement-test",
@@ -260,7 +260,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "34e1b5dbda320af10ff6fcb22a1574802a6aab43..c987a515da64aa4131fa930f1a443efaa1d603a3"
+    "shas": "cc7291c4cf52fea40e628daec45dcb63ba55385a..60ff98fce4d5f4c3c57fd1cd61a58154829888e0"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-insert-test",
@@ -318,7 +318,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c987a515da64aa4131fa930f1a443efaa1d603a3..4ea66da8aae94db89807b522890319819a528a6e"
+    "shas": "60ff98fce4d5f4c3c57fd1cd61a58154829888e0..b8cae891d8a7c50ae9e1a2c04c03e43e1bda86a6"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-teardown-test",
@@ -360,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4ea66da8aae94db89807b522890319819a528a6e..6b1c44631d5946dc50d15c29ef8ac5719c370cd3"
+    "shas": "b8cae891d8a7c50ae9e1a2c04c03e43e1bda86a6..d51929d0080ebe1b2f1e283e7a623379723ad458"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c736219a781793f1c022ed19fb6206a37df89135..53c14551131dd2b7649b1b96cf8c842d09f69463"
+    "shas": "bd3ee9d598ee20261cb306809f806b32bd573f5b..60bf93a30828f8107bcdbcf0d82d1c5fbc7a6f05"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-insert-test",
@@ -96,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "53c14551131dd2b7649b1b96cf8c842d09f69463..939267af63341442b7d161b30ea0361824ea8412"
+    "shas": "60bf93a30828f8107bcdbcf0d82d1c5fbc7a6f05..d4c70eb06fcabc1021ad4c017d19303efdbf99ef"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-replacement-test",
@@ -178,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "939267af63341442b7d161b30ea0361824ea8412..ad975a536cc3fecb00c3751f429efd999d2e394a"
+    "shas": "d4c70eb06fcabc1021ad4c017d19303efdbf99ef..9e19d0b02d49cdb812f01fe3825e78bab29f842a"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-replacement-test",
@@ -260,7 +260,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ad975a536cc3fecb00c3751f429efd999d2e394a..977f48ed7f70eff8c672178484a8ed4a43fc91f9"
+    "shas": "9e19d0b02d49cdb812f01fe3825e78bab29f842a..c5cd2c661affc197e4fcd402fdacabd9e7b32e24"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-insert-test",
@@ -318,7 +318,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "977f48ed7f70eff8c672178484a8ed4a43fc91f9..70e17bd06ce0f1443977a958cb7cddd52b61ad6d"
+    "shas": "c5cd2c661affc197e4fcd402fdacabd9e7b32e24..9870b770a2079cb9c3e39975c18bb0a74a6c89b5"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-teardown-test",
@@ -360,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "70e17bd06ce0f1443977a958cb7cddd52b61ad6d..66c10c5022ceda48e623eb42ec6d35b48d6f3c01"
+    "shas": "9870b770a2079cb9c3e39975c18bb0a74a6c89b5..c920c11c245444fa22dec8859b8ec17a07ff77d3"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "df8fe57456bf893b8ba1700ea704689f7a682fc3..6d424e1eb819b0196c4589ca7126549c7d88bd4e"
+    "shas": "9f67155c979b4c160bebf7a1e203fb63f55c29d6..ee8507205541da5cbb1560f3473a943176c771cb"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-insert-test",
@@ -130,7 +130,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6d424e1eb819b0196c4589ca7126549c7d88bd4e..2b2bad01ff53dd133ec134fa6235c8a2c817b669"
+    "shas": "ee8507205541da5cbb1560f3473a943176c771cb..fd0fc1fc17d4c734308f38f569e8667b7837dc62"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-replacement-test",
@@ -244,7 +244,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2b2bad01ff53dd133ec134fa6235c8a2c817b669..5bb96dad98da0ebbfc72e732acc73aa9ddc4d7d7"
+    "shas": "fd0fc1fc17d4c734308f38f569e8667b7837dc62..445e35fea9c0e366d186f52b792e1d8bd3bb8590"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-replacement-test",
@@ -358,7 +358,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5bb96dad98da0ebbfc72e732acc73aa9ddc4d7d7..267ae3bc71b34826d2a28698996f3a3cd465575e"
+    "shas": "445e35fea9c0e366d186f52b792e1d8bd3bb8590..77a6f3992ae86e74ec383c0c3eda4d1e5b1215d5"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-insert-test",
@@ -450,7 +450,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "267ae3bc71b34826d2a28698996f3a3cd465575e..03102d78ae8560d392ebfec86e33a5cea57e9239"
+    "shas": "77a6f3992ae86e74ec383c0c3eda4d1e5b1215d5..eaa60d1afd45273a151d1f2a5aa8c2bb08f71e13"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-teardown-test",
@@ -492,5 +492,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "03102d78ae8560d392ebfec86e33a5cea57e9239..3ac2a99f9d9d196bef4c7434bfb2cef66ddfa075"
+    "shas": "eaa60d1afd45273a151d1f2a5aa8c2bb08f71e13..952fc9ef4a2dfebe4902592178b9eb48a4190e0c"
 }]

test/corpus/diff-summaries/go/constructors.json

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3ac2a99f9d9d196bef4c7434bfb2cef66ddfa075..971ce69e6ec6a0b06b82fdcaa754411704bc1240"
+    "shas": "952fc9ef4a2dfebe4902592178b9eb48a4190e0c..d5584c3d99b9809a31750910d36fd7d52476bc66"
 }
 ,{
     "testCaseDescription": "go-constructors-insert-test",
@@ -129,7 +129,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "971ce69e6ec6a0b06b82fdcaa754411704bc1240..3759eec0d056e0361885ed605ffb6acde2ac939a"
+    "shas": "d5584c3d99b9809a31750910d36fd7d52476bc66..3e1797012a1c5619a47908555d80d6abaf6c7c98"
 }
 ,{
     "testCaseDescription": "go-constructors-replacement-test",
@@ -352,7 +352,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3759eec0d056e0361885ed605ffb6acde2ac939a..d5a4b7df7d22840aa80b8b3fc75589b7f1efd635"
+    "shas": "3e1797012a1c5619a47908555d80d6abaf6c7c98..d715bda10b449893ee557c424b0fca7653eae4f8"
 }
 ,{
     "testCaseDescription": "go-constructors-delete-replacement-test",
@@ -575,7 +575,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d5a4b7df7d22840aa80b8b3fc75589b7f1efd635..6b8fa61663b384cd1afd3042341753328dd6ff2c"
+    "shas": "d715bda10b449893ee557c424b0fca7653eae4f8..6f12fae7a99bb07c988dfeb28c593c54cbdc6897"
 }
 ,{
     "testCaseDescription": "go-constructors-delete-insert-test",
@@ -666,7 +666,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6b8fa61663b384cd1afd3042341753328dd6ff2c..27544b43f5003fcd71daf9e8f49c35d7ea379148"
+    "shas": "6f12fae7a99bb07c988dfeb28c593c54cbdc6897..85cf2ddb823072015b56be1c9f05bab3156ed20b"
 }
 ,{
     "testCaseDescription": "go-constructors-teardown-test",
@@ -708,5 +708,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "27544b43f5003fcd71daf9e8f49c35d7ea379148..b7cef53a7c59fc2b88ba0a41658125f986c008e2"
+    "shas": "85cf2ddb823072015b56be1c9f05bab3156ed20b..9bb52005e388bd5cc9357e8492af2322ce0b4299"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a604ef4090da0a6381e77dbbe72ebb13604d5aee..9a0d9f6bc928f42c8a780d4408d633fe9e234039"
+    "shas": "4ea37bb18e38d126d304a9e398aeb3dd0c011565..0690af94774138da10deb642cf57e72dcad7cbaf"
 }
 ,{
     "testCaseDescription": "go-float-literals-insert-test",
@@ -145,7 +145,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9a0d9f6bc928f42c8a780d4408d633fe9e234039..52aa29f026c5ac178389bb70fd925461f6618057"
+    "shas": "0690af94774138da10deb642cf57e72dcad7cbaf..6c253e07c841401629f00a67ea57899ed1e07f8d"
 }
 ,{
     "testCaseDescription": "go-float-literals-replacement-test",
@@ -177,7 +177,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1.5' with '2.6' in an assignment to f1 of the 'main' function"
+                    "summary": "Replaced the '1.5' float with the '2.6' float in an assignment to f1 of the 'main' function"
                 },
                 {
                     "span": {
@@ -204,7 +204,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1.5e100' with '2.6e211' in an assignment to f2 of the 'main' function"
+                    "summary": "Replaced the '1.5e100' float with the '2.6e211' float in an assignment to f2 of the 'main' function"
                 },
                 {
                     "span": {
@@ -231,7 +231,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1.5e+50' with '2.6e+60' in an assignment to f3 of the 'main' function"
+                    "summary": "Replaced the '1.5e+50' float with the '2.6e+60' float in an assignment to f3 of the 'main' function"
                 },
                 {
                     "span": {
@@ -258,7 +258,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1.5e-5' with '2.6e-7' in an assignment to f4 of the 'main' function"
+                    "summary": "Replaced the '1.5e-5' float with the '2.6e-7' float in an assignment to f4 of the 'main' function"
                 },
                 {
                     "span": {
@@ -285,7 +285,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '.5e-50' with '.6e-60' in an assignment to f5 of the 'main' function"
+                    "summary": "Replaced the '.5e-50' float with the '.6e-60' float in an assignment to f5 of the 'main' function"
                 }
             ]
         },
@@ -316,7 +316,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "52aa29f026c5ac178389bb70fd925461f6618057..f02b6ce09f99de0dcb82678e5e40486c0aeb47a9"
+    "shas": "6c253e07c841401629f00a67ea57899ed1e07f8d..2d439a5ab740da19a05d2d676d0d8f88220c6672"
 }
 ,{
     "testCaseDescription": "go-float-literals-delete-replacement-test",
@@ -348,7 +348,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2.6' with '1.5' in an assignment to f1 of the 'main' function"
+                    "summary": "Replaced the '2.6' float with the '1.5' float in an assignment to f1 of the 'main' function"
                 },
                 {
                     "span": {
@@ -375,7 +375,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2.6e211' with '1.5e100' in an assignment to f2 of the 'main' function"
+                    "summary": "Replaced the '2.6e211' float with the '1.5e100' float in an assignment to f2 of the 'main' function"
                 },
                 {
                     "span": {
@@ -402,7 +402,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2.6e+60' with '1.5e+50' in an assignment to f3 of the 'main' function"
+                    "summary": "Replaced the '2.6e+60' float with the '1.5e+50' float in an assignment to f3 of the 'main' function"
                 },
                 {
                     "span": {
@@ -429,7 +429,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2.6e-7' with '1.5e-5' in an assignment to f4 of the 'main' function"
+                    "summary": "Replaced the '2.6e-7' float with the '1.5e-5' float in an assignment to f4 of the 'main' function"
                 },
                 {
                     "span": {
@@ -456,7 +456,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '.6e-60' with '.5e-50' in an assignment to f5 of the 'main' function"
+                    "summary": "Replaced the '.6e-60' float with the '.5e-50' float in an assignment to f5 of the 'main' function"
                 }
             ]
         },
@@ -487,7 +487,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f02b6ce09f99de0dcb82678e5e40486c0aeb47a9..55a9e3a9377a1f4baf0ac0eaf557f5ec7e8a811a"
+    "shas": "2d439a5ab740da19a05d2d676d0d8f88220c6672..549388628b477f802c460afed5b504f2b9399ae8"
 }
 ,{
     "testCaseDescription": "go-float-literals-delete-insert-test",
@@ -594,7 +594,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "55a9e3a9377a1f4baf0ac0eaf557f5ec7e8a811a..fa6bda43932f5258ffb8259047189ba9455f5dcc"
+    "shas": "549388628b477f802c460afed5b504f2b9399ae8..45ce0fbd6d06836c59e9ea4ed74cb958e03ee38b"
 }
 ,{
     "testCaseDescription": "go-float-literals-teardown-test",
@@ -636,5 +636,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fa6bda43932f5258ffb8259047189ba9455f5dcc..4e968b13372f698a7052494376f12760ebb66e27"
+    "shas": "45ce0fbd6d06836c59e9ea4ed74cb958e03ee38b..9bea4d9b913b2aa36024a30b0fd25cad043f3dab"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "695dc8f6eadde4811f068db1566ef6445fb5a7d8..fc16ebed6ab291582d95a7eebfcfe2e0dcc81f20"
+    "shas": "3c18118ea8496b4ffea7d20ce7e0302dded5c3d1..61766b7065ddf9051bdc21333a88a09745e12df1"
 }
 ,{
     "testCaseDescription": "go-for-statements-insert-test",
@@ -160,7 +160,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fc16ebed6ab291582d95a7eebfcfe2e0dcc81f20..7af5a6e42ae38ef9604cc321305b9f6a5aa64822"
+    "shas": "61766b7065ddf9051bdc21333a88a09745e12df1..3645c8ec6ac0b747b8b5db12101534db3454ab0f"
 }
 ,{
     "testCaseDescription": "go-for-statements-replacement-test",
@@ -207,7 +207,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted 'i' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'i' identifier in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -252,7 +252,7 @@
                             ]
                         }
                     },
-                    "summary": "Added 'i' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'i' identifier in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -357,7 +357,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7af5a6e42ae38ef9604cc321305b9f6a5aa64822..b10779d173dc6f39594ba82f98d52f06c2c98217"
+    "shas": "3645c8ec6ac0b747b8b5db12101534db3454ab0f..5bd76a34c50b51b01165c9f156ab1437a719573b"
 }
 ,{
     "testCaseDescription": "go-for-statements-delete-replacement-test",
@@ -404,7 +404,7 @@
                             ]
                         }
                     },
-                    "summary": "Added 'i' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'i' identifier in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -449,7 +449,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted 'i' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'i' identifier in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -554,7 +554,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b10779d173dc6f39594ba82f98d52f06c2c98217..598b6a46856e51515bf7088669dd409859947d89"
+    "shas": "5bd76a34c50b51b01165c9f156ab1437a719573b..4e100b8c5c64d1ed4bd571ebcd9bbfc5b1a45597"
 }
 ,{
     "testCaseDescription": "go-for-statements-delete-insert-test",
@@ -676,7 +676,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "598b6a46856e51515bf7088669dd409859947d89..c221fd8e40726978d51275afb67f92a2f83a601f"
+    "shas": "4e100b8c5c64d1ed4bd571ebcd9bbfc5b1a45597..9538de00b5c9e9b2385c5463fdae5c308324b311"
 }
 ,{
     "testCaseDescription": "go-for-statements-teardown-test",
@@ -718,5 +718,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c221fd8e40726978d51275afb67f92a2f83a601f..1d58c4c1e194b7b160874111eee267a32f08fe98"
+    "shas": "9538de00b5c9e9b2385c5463fdae5c308324b311..797c6862fbfbf10b056b4938b2f5d3902ede8ccb"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1d58c4c1e194b7b160874111eee267a32f08fe98..e1dafa000bce58d04020a2828884a3eadd22b316"
+    "shas": "797c6862fbfbf10b056b4938b2f5d3902ede8ccb..6c9da0546b037bcf762ccf742306b7c5a22d8eef"
 }
 ,{
     "testCaseDescription": "go-function-declarations-insert-test",
@@ -96,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e1dafa000bce58d04020a2828884a3eadd22b316..9feefb7af868c589ef7cadcb8cbe5883809e60e9"
+    "shas": "6c9da0546b037bcf762ccf742306b7c5a22d8eef..829199e20df03dc4d1e5b2c5bc2f5d4786a40f4a"
 }
 ,{
     "testCaseDescription": "go-function-declarations-replacement-test",
@@ -238,7 +238,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9feefb7af868c589ef7cadcb8cbe5883809e60e9..2f882100ccd53f6d17b79be46a23d53e433d14fc"
+    "shas": "829199e20df03dc4d1e5b2c5bc2f5d4786a40f4a..99f16b94b2e53f34ded36a1f2a37838fc444b7d4"
 }
 ,{
     "testCaseDescription": "go-function-declarations-delete-replacement-test",
@@ -380,7 +380,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2f882100ccd53f6d17b79be46a23d53e433d14fc..1249f77e1ee2af007e8a692855ddb1c2cf4206e1"
+    "shas": "99f16b94b2e53f34ded36a1f2a37838fc444b7d4..c8733fdebf191d5d2970c75d9959b1b4019b9aca"
 }
 ,{
     "testCaseDescription": "go-function-declarations-delete-insert-test",
@@ -438,7 +438,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1249f77e1ee2af007e8a692855ddb1c2cf4206e1..f6fb5a7514156f69f43a9b5b82cb20f8d5deb2b9"
+    "shas": "c8733fdebf191d5d2970c75d9959b1b4019b9aca..d2e84e27e4ff90b7f9bde562d0395135ddec7468"
 }
 ,{
     "testCaseDescription": "go-function-declarations-teardown-test",
@@ -480,5 +480,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f6fb5a7514156f69f43a9b5b82cb20f8d5deb2b9..465c0e2e2bcce4e0aa944f72704ec5e00f3fc6c8"
+    "shas": "d2e84e27e4ff90b7f9bde562d0395135ddec7468..91a7c1830966b35d27d71f75444fe93cd256cee8"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6d8f90ba7b8fde72986713a25abd16264a8c4f72..0116d028e48e52cfe512eccca55aeebe1d1f8b47"
+    "shas": "b7377716d2ab82f2ee1b51d100e3cd1bbfb8cce1..9767584699fa5a9e3864ee1c88b4909b05323a46"
 }
 ,{
     "testCaseDescription": "go-function-literals-insert-test",
@@ -98,7 +98,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0116d028e48e52cfe512eccca55aeebe1d1f8b47..c66ed53cb7244376b3ca56eac02860f66e9f265e"
+    "shas": "9767584699fa5a9e3864ee1c88b4909b05323a46..1b7ce27f543294eb21908a8f3be59b0137a6be2f"
 }
 ,{
     "testCaseDescription": "go-function-literals-replacement-test",
@@ -182,7 +182,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c66ed53cb7244376b3ca56eac02860f66e9f265e..8036164c3853bd50f9e9acf610073a2d0eb6d48e"
+    "shas": "1b7ce27f543294eb21908a8f3be59b0137a6be2f..b7b962eaf2d229777232b974f9a235b7f476ed25"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-replacement-test",
@@ -266,7 +266,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8036164c3853bd50f9e9acf610073a2d0eb6d48e..e131a3e042ff514e6d2001fdf1c9dd19cd11c694"
+    "shas": "b7b962eaf2d229777232b974f9a235b7f476ed25..af4baff9cdf09c54c83c0736711110800a64f623"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-insert-test",
@@ -326,7 +326,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e131a3e042ff514e6d2001fdf1c9dd19cd11c694..59912f8673e3126c5692471694deb27b7beed7e5"
+    "shas": "af4baff9cdf09c54c83c0736711110800a64f623..c412c2f2558c6f5a6e5775125a12ad58a8ecaf71"
 }
 ,{
     "testCaseDescription": "go-function-literals-teardown-test",
@@ -368,5 +368,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "59912f8673e3126c5692471694deb27b7beed7e5..c736219a781793f1c022ed19fb6206a37df89135"
+    "shas": "c412c2f2558c6f5a6e5775125a12ad58a8ecaf71..bd3ee9d598ee20261cb306809f806b32bd573f5b"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "77797aa59be812e3c6a7951b5e5c8d91f27ca7a8..709396cac401e9d8f5a5e8b227fc883b6382ad7a"
+    "shas": "458af42d75cbcda4aae56e6a8ef32cbdaad4c6f2..ba1f7f07547cf1d1c41a9c30f2396da685bf96f4"
 }
 ,{
     "testCaseDescription": "go-function-types-insert-test",
@@ -189,7 +189,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "709396cac401e9d8f5a5e8b227fc883b6382ad7a..570f26af74c020c7bfdd62b5c2762c8831c60e55"
+    "shas": "ba1f7f07547cf1d1c41a9c30f2396da685bf96f4..cc3109dfec07e5de792080378e0d6d01433db2a9"
 }
 ,{
     "testCaseDescription": "go-function-types-replacement-test",
@@ -418,7 +418,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "570f26af74c020c7bfdd62b5c2762c8831c60e55..ded919a8daf89a09c7ef8c7d6fba101b23569e45"
+    "shas": "cc3109dfec07e5de792080378e0d6d01433db2a9..101b850c4625a2e515d3c04e82210b0b87d8ec57"
 }
 ,{
     "testCaseDescription": "go-function-types-delete-replacement-test",
@@ -578,6 +578,21 @@
                     },
                     "summary": "Added the 'bool' identifier in the main function of the 'main' module"
                 },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                6,
+                                28
+                            ],
+                            "end": [
+                                6,
+                                33
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'error' identifier in the main function of the 'main' module"
+                },
                 {
                     "span": {
                         "delete": {
@@ -607,21 +622,6 @@
                         }
                     },
                     "summary": "Deleted the 'error' identifier in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                6,
-                                28
-                            ],
-                            "end": [
-                                6,
-                                33
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'error' identifier in the main function of the 'main' module"
                 }
             ]
         },
@@ -647,7 +647,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ded919a8daf89a09c7ef8c7d6fba101b23569e45..0f9fd6a140880e423969fb96f5253b459a22dcb1"
+    "shas": "101b850c4625a2e515d3c04e82210b0b87d8ec57..01d4ccd2cf52c25eeac4b6daea97b71190651004"
 }
 ,{
     "testCaseDescription": "go-function-types-delete-insert-test",
@@ -798,7 +798,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0f9fd6a140880e423969fb96f5253b459a22dcb1..1a0c554759792f339b650760b4a1446cefd21470"
+    "shas": "01d4ccd2cf52c25eeac4b6daea97b71190651004..fb6d712ca0a168f1acd7a441d373f7077711ebd0"
 }
 ,{
     "testCaseDescription": "go-function-types-teardown-test",
@@ -840,5 +840,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1a0c554759792f339b650760b4a1446cefd21470..41133764e3945b380f42a5ed85a241bddc76bd16"
+    "shas": "fb6d712ca0a168f1acd7a441d373f7077711ebd0..1e84313b26476c61ce82318196f50460eb4366e4"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9d302626b06231ccfe43953c3a0890225a7b6947..3b08761164dcb20fc3562cd153ca0857484943a3"
+    "shas": "046b76b7401f5781415d12e2bfb4d60c03c48472..776ed502056c68f82cf9bd41784cd4194c72836d"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-insert-test",
@@ -97,7 +97,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3b08761164dcb20fc3562cd153ca0857484943a3..f95729da7419dbe39ab6a92dc64d20a1d5dba70a"
+    "shas": "776ed502056c68f82cf9bd41784cd4194c72836d..af5b8e705ae0f31b9ac938b345641c8352e96ce9"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-replacement-test",
@@ -235,7 +235,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f95729da7419dbe39ab6a92dc64d20a1d5dba70a..030413d6a0c4fb18addea43b1801bf581c0b5bc1"
+    "shas": "af5b8e705ae0f31b9ac938b345641c8352e96ce9..a1d3b96cf4d4d488f444949d49d013d58dd2f4f9"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-replacement-test",
@@ -373,7 +373,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "030413d6a0c4fb18addea43b1801bf581c0b5bc1..8750536a7c17385cf9fd2198a36800b2fdc470a7"
+    "shas": "a1d3b96cf4d4d488f444949d49d013d58dd2f4f9..91e0410f2e6b6ddc06ce968b92d6de0a4cdca0c4"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-insert-test",
@@ -432,7 +432,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8750536a7c17385cf9fd2198a36800b2fdc470a7..34dcdca35dea945328093f015380760758d3e7b0"
+    "shas": "91e0410f2e6b6ddc06ce968b92d6de0a4cdca0c4..65b4c96644c4b7aff15ad6e3b55c3e48f5e385d4"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-teardown-test",
@@ -474,5 +474,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "34dcdca35dea945328093f015380760758d3e7b0..d4f6d3095efbbce722051ecd584ad6a654426d8c"
+    "shas": "65b4c96644c4b7aff15ad6e3b55c3e48f5e385d4..08ffb30570dd5dfa94d28706aba89d46d94d95de"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "274eb607291a69864694395d2c348af63b4be848..fe64b9af657e16e97c5d149a6b157e32d399d01b"
+    "shas": "d8d968fae9ce4d9c6bb8e5e1f76d3a966ab90c79..59a5297086502d67985abe81ed17405d2ee5bf20"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-insert-test",
@@ -59,7 +59,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 4, column 1 - line 8, column 2 in the main function of the 'main' module"
+                    "summary": "Added 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 4, column 1 - line 8, column 2 in the main function of the 'main' module"
                 }
             ]
         }
@@ -85,7 +85,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fe64b9af657e16e97c5d149a6b157e32d399d01b..e494f58e01f1e565ac2e15ec380f853957ccde4d"
+    "shas": "59a5297086502d67985abe81ed17405d2ee5bf20..50c42e2b9221587f414f2a1144d8bfe0d4de5f69"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-replacement-test",
@@ -199,7 +199,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e494f58e01f1e565ac2e15ec380f853957ccde4d..66d1e69a477d5c08880b1641d76cc8d82bee3b2c"
+    "shas": "50c42e2b9221587f414f2a1144d8bfe0d4de5f69..3cb16a124c4b7a019f7724e84f6136fe3fe86ebe"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-replacement-test",
@@ -313,7 +313,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "66d1e69a477d5c08880b1641d76cc8d82bee3b2c..3f00537ec651b6939932898a55e1fef2334c8aec"
+    "shas": "3cb16a124c4b7a019f7724e84f6136fe3fe86ebe..ca37938fd50adb141424dad4561314a5bfd9a609"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-insert-test",
@@ -334,7 +334,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 4, column 1 - line 8, column 2 in the main function of the 'main' module"
+                    "summary": "Deleted 'import (\n\"net/http\"\n  . \"some/dsl\"\n  alias \"some/package\"\n)' at line 4, column 1 - line 8, column 2 in the main function of the 'main' module"
                 }
             ]
         }
@@ -360,7 +360,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3f00537ec651b6939932898a55e1fef2334c8aec..f6c4bd23518aebe0311916a546efb89f4348dc61"
+    "shas": "ca37938fd50adb141424dad4561314a5bfd9a609..6c053ce5e279bb20682478a2a5158e0151689ff6"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-teardown-test",
@@ -402,5 +402,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f6c4bd23518aebe0311916a546efb89f4348dc61..ab5c888fca27a55a92a4bf865b94e45854987ae4"
+    "shas": "6c053ce5e279bb20682478a2a5158e0151689ff6..702c5d5cef27b3cc164c8c28cae24301abf0cdf9"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5f7d4d88eae70a1a14e1fad28ebb852095ef2075..1d6c02943d38514028ff19ffe87a1a69870290da"
+    "shas": "e01b079477b06cf87b8a4196330e5d3dbe64ac09..d8310db279ee1a9147802aaef106e0eb175e762e"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-insert-test",
@@ -99,7 +99,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1d6c02943d38514028ff19ffe87a1a69870290da..bb1ac09c2093225603c8583d84bcd30badf24bfe"
+    "shas": "d8310db279ee1a9147802aaef106e0eb175e762e..f88b6265bf14b587b29771812228fe2b0f35b345"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-replacement-test",
@@ -184,7 +184,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bb1ac09c2093225603c8583d84bcd30badf24bfe..8508845eb0f5835ef5337142c1a5011e6937d150"
+    "shas": "f88b6265bf14b587b29771812228fe2b0f35b345..7c90cfefe695a24bfd35ed41a9e8a4bc437d26e7"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-replacement-test",
@@ -269,7 +269,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8508845eb0f5835ef5337142c1a5011e6937d150..707c5ae4c832fedfc7e14f285c370eb3fc615b54"
+    "shas": "7c90cfefe695a24bfd35ed41a9e8a4bc437d26e7..c0df01948a110079691e30886e618d4dedca21ee"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-insert-test",
@@ -330,7 +330,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "707c5ae4c832fedfc7e14f285c370eb3fc615b54..291ee53fce19e787c65cec64e1bcd944ebdf797e"
+    "shas": "c0df01948a110079691e30886e618d4dedca21ee..02bbc15363cb11ecb5ef1e09efa6f390ebc692f9"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-teardown-test",
@@ -372,5 +372,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "291ee53fce19e787c65cec64e1bcd944ebdf797e..3470491d4f15b4c823b3bd6fc6f8148e9c47b9fb"
+    "shas": "02bbc15363cb11ecb5ef1e09efa6f390ebc692f9..529ea7bffabc5e923508fb53a94813b3d6ff338a"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cfbc96d8376b4a52edd32a42e42a5bdf761aafd7..c14083f279ca7c5bcda3c3137eaa05de3f1fba6e"
+    "shas": "dc2e5c07146f17cbac1023a5d4a3c318da0e0c2b..d76aa7d40ccafb4d0276c7e51cf79127a12e8b3c"
 }
 ,{
     "testCaseDescription": "go-if-statements-insert-test",
@@ -121,7 +121,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c14083f279ca7c5bcda3c3137eaa05de3f1fba6e..69919f9792ddba67ab7fa2517f27126251fdbf1d"
+    "shas": "d76aa7d40ccafb4d0276c7e51cf79127a12e8b3c..64a3cbd684f33b97f283426f472a538c26fc880b"
 }
 ,{
     "testCaseDescription": "go-if-statements-replacement-test",
@@ -240,7 +240,7 @@
         " c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "69919f9792ddba67ab7fa2517f27126251fdbf1d..b6f87c5eb8671eb38c2ff6c60223a3f20325d7f6"
+    "shas": "64a3cbd684f33b97f283426f472a538c26fc880b..e200a89f7e589f06e8e41b1cd8b6905877fcfbd3"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-replacement-test",
@@ -359,7 +359,7 @@
         " c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b6f87c5eb8671eb38c2ff6c60223a3f20325d7f6..49b5d4786953ff1a7fee21e3baa0c28ff98a5ad0"
+    "shas": "e200a89f7e589f06e8e41b1cd8b6905877fcfbd3..609369acf1385a280cba4279c273f088177ff47d"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-insert-test",
@@ -442,7 +442,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "49b5d4786953ff1a7fee21e3baa0c28ff98a5ad0..98f644ae3b9e874699be1a2e484e1c533bc16e11"
+    "shas": "609369acf1385a280cba4279c273f088177ff47d..ce60aa130fac1a05a93661a0978732960878f9f0"
 }
 ,{
     "testCaseDescription": "go-if-statements-teardown-test",
@@ -484,5 +484,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "98f644ae3b9e874699be1a2e484e1c533bc16e11..6e7cf72f7ca77faa65f54df06a3ed9b0dfb54980"
+    "shas": "ce60aa130fac1a05a93661a0978732960878f9f0..d66b71957411bd7a2c7774ef68c167f1a4f80efa"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2c9e06c6518a974b3a83028a0eabeb715241d2b6..fd2a316177fa2aba0f1781e546472facc3d04691"
+    "shas": "5fff449fda240ef2415ceb7e8ee284054f218586..45ac35fec86760f4f02d5e65c56aa51945732837"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-insert-test",
@@ -129,7 +129,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fd2a316177fa2aba0f1781e546472facc3d04691..f689a448bf7d3576b81fde1f2d5f3ff643895b22"
+    "shas": "45ac35fec86760f4f02d5e65c56aa51945732837..9ba3d5195b00299c64c71af1e746883f3b411892"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-replacement-test",
@@ -214,7 +214,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f689a448bf7d3576b81fde1f2d5f3ff643895b22..2343fa4e234cc971be5ddafd6435ba3cf3f577ff"
+    "shas": "9ba3d5195b00299c64c71af1e746883f3b411892..a0af5ed466390ace0b833b904047912ac529fd22"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-replacement-test",
@@ -299,7 +299,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2343fa4e234cc971be5ddafd6435ba3cf3f577ff..51d2cec667f471fcc8a311767be4164ca3cd1995"
+    "shas": "a0af5ed466390ace0b833b904047912ac529fd22..14371fdaa0d1aad4006240f6e855dfc6ea643e41"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-insert-test",
@@ -390,7 +390,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "51d2cec667f471fcc8a311767be4164ca3cd1995..55c01387474526283312218bfe2c763dc4d6fccd"
+    "shas": "14371fdaa0d1aad4006240f6e855dfc6ea643e41..250316d97cf5aad86c1ea942f55c07aa8172d597"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-teardown-test",
@@ -432,5 +432,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "55c01387474526283312218bfe2c763dc4d6fccd..23cf9be6be14db0686032ad5e10c7dcd0e0cf2d2"
+    "shas": "250316d97cf5aad86c1ea942f55c07aa8172d597..cb195bc65760cc90fc3c5e75478c686e1626d38d"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ac4b7fa9d117b427fb2c76d3802976beb8d4db19..48876c249e2154af82d605d77197153ae148a3ed"
+    "shas": "0caa6845091f9b7743b06f2feaa7507925d065f5..1d5de2b34aeaa22902016daefb0f961cbc3e5efa"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-insert-test",
@@ -97,7 +97,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "48876c249e2154af82d605d77197153ae148a3ed..842090cdc63f3e5e40c2f36af9eb201463cb418a"
+    "shas": "1d5de2b34aeaa22902016daefb0f961cbc3e5efa..d8ef9dd0208e584b0076c1fb0d21c6adae730ab4"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-replacement-test",
@@ -154,7 +154,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "842090cdc63f3e5e40c2f36af9eb201463cb418a..af6ace33ad8730f3f5da484d4c5249b523a0ec39"
+    "shas": "d8ef9dd0208e584b0076c1fb0d21c6adae730ab4..24c9831a81e8b2ad9bfdaf435fe5256273871d4a"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-replacement-test",
@@ -211,7 +211,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "af6ace33ad8730f3f5da484d4c5249b523a0ec39..1bf76fd6748e03534a90c8b72df5328012deee7b"
+    "shas": "24c9831a81e8b2ad9bfdaf435fe5256273871d4a..1155436829c86b18d0431d1047a6470263978f90"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-insert-test",
@@ -270,7 +270,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1bf76fd6748e03534a90c8b72df5328012deee7b..ae2acd188b32429c257a7bc4842c019dc0655387"
+    "shas": "1155436829c86b18d0431d1047a6470263978f90..bd427542bbc2106447f0f08fb774cc6d6cd57171"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-teardown-test",
@@ -312,5 +312,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ae2acd188b32429c257a7bc4842c019dc0655387..e0451e34bfb2596bc4c154592efc288ad448a2e0"
+    "shas": "bd427542bbc2106447f0f08fb774cc6d6cd57171..95bdc31e0a986eb0b5982aa158a2e7fb56a078bb"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "886b33d41824a470340628cf21c936e1b396a5b9..b2a6657fec309a57f439f903b18ad3ccbbb1b8b6"
+    "shas": "2754db7a232d4bd458e6d63420c7107cc4bf7e72..4ee38099964017d0f7882c6a9465a1d8d32506ed"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-insert-test",
@@ -161,7 +161,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b2a6657fec309a57f439f903b18ad3ccbbb1b8b6..8d572e0d98df1c65e9d88622e6ec7516118bcc30"
+    "shas": "4ee38099964017d0f7882c6a9465a1d8d32506ed..a81ef66818b26f1db014bba34dffa9cb54a74981"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-replacement-test",
@@ -291,7 +291,7 @@
         "  f[1:2:3]"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8d572e0d98df1c65e9d88622e6ec7516118bcc30..9031a1fcefba57dab561bcd07d75d8af6b1d53c3"
+    "shas": "a81ef66818b26f1db014bba34dffa9cb54a74981..e694ea5e621088a5306cd9a2f09244fa2cb1c62f"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-delete-replacement-test",
@@ -421,7 +421,7 @@
         "  f[1:2:3]"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9031a1fcefba57dab561bcd07d75d8af6b1d53c3..249ab92c61e81bdba2460bbb89b8a7650a11ed0a"
+    "shas": "e694ea5e621088a5306cd9a2f09244fa2cb1c62f..8a865c9964371251ae427a90ec602594169bc65a"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-delete-insert-test",
@@ -544,7 +544,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "249ab92c61e81bdba2460bbb89b8a7650a11ed0a..c7bc775b32f4b36b6746eaee13ac18a839cd3dfc"
+    "shas": "8a865c9964371251ae427a90ec602594169bc65a..32e8cf058f37f451a5a450230d2104c36bcdd9b8"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-teardown-test",
@@ -586,5 +586,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c7bc775b32f4b36b6746eaee13ac18a839cd3dfc..4e6da70fe034893465e0df27568f4bf7524c3afb"
+    "shas": "32e8cf058f37f451a5a450230d2104c36bcdd9b8..5019ab10a0d01229e7306b70f1401b8fcc6498b2"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ab5c888fca27a55a92a4bf865b94e45854987ae4..033cff0add0dd95e22f7059e9efaaa330d60a61c"
+    "shas": "702c5d5cef27b3cc164c8c28cae24301abf0cdf9..8114b30f3dab10d0d9cf055c7e3a73aedbe7a45f"
 }
 ,{
     "testCaseDescription": "go-int-literals-insert-test",
@@ -83,7 +83,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "033cff0add0dd95e22f7059e9efaaa330d60a61c..a7ac60110e0ed7a88f57830a1d68cc6352512c57"
+    "shas": "8114b30f3dab10d0d9cf055c7e3a73aedbe7a45f..bbb95c1391a2b5dd36390c66108b8540b1cf2f8a"
 }
 ,{
     "testCaseDescription": "go-int-literals-replacement-test",
@@ -193,7 +193,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a7ac60110e0ed7a88f57830a1d68cc6352512c57..99fd66122384e123ab3806597369aa576f70d604"
+    "shas": "bbb95c1391a2b5dd36390c66108b8540b1cf2f8a..c45894dacfd91c32b2721b0397284cd791d7bed5"
 }
 ,{
     "testCaseDescription": "go-int-literals-delete-replacement-test",
@@ -303,7 +303,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "99fd66122384e123ab3806597369aa576f70d604..aa49a4b65b5ce0bb3db5f0c97bc962ed28310721"
+    "shas": "c45894dacfd91c32b2721b0397284cd791d7bed5..ef1b279b8e5c6093ac45d53ff1f3a47dd7841b39"
 }
 ,{
     "testCaseDescription": "go-int-literals-delete-insert-test",
@@ -348,7 +348,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "aa49a4b65b5ce0bb3db5f0c97bc962ed28310721..31bd5142a3c49b2f0271ec954186cf0de0ab7f2d"
+    "shas": "ef1b279b8e5c6093ac45d53ff1f3a47dd7841b39..bf40a89efd4824789c7473375010068d8a5dd77c"
 }
 ,{
     "testCaseDescription": "go-int-literals-teardown-test",
@@ -390,5 +390,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "31bd5142a3c49b2f0271ec954186cf0de0ab7f2d..dd4f747c441cd8c29eae4fe14b3d2eaa24f22282"
+    "shas": "bf40a89efd4824789c7473375010068d8a5dd77c..b82351a928b3ca013071a29952ba2996558399db"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fbe26e2c64c3de9eb14fdaf1467c4035ff37de23..368ac0416072e90f39698fc5e934d7ef3935eb35"
+    "shas": "dd5e97a8cc2bbda76dbda960bba5db45fb6604b8..315b60591d6de46c8cc0cca7e03b30499ae0194e"
 }
 ,{
     "testCaseDescription": "go-interface-types-insert-test",
@@ -267,7 +267,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "368ac0416072e90f39698fc5e934d7ef3935eb35..070c90fc1681e7d8c1580752d1918dea3e173165"
+    "shas": "315b60591d6de46c8cc0cca7e03b30499ae0194e..e3d66cfd6ed2884bdfc1abc834698e29d4ccfaf7"
 }
 ,{
     "testCaseDescription": "go-interface-types-replacement-test",
@@ -382,7 +382,7 @@
         "  SomeMethod(s string) error"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "070c90fc1681e7d8c1580752d1918dea3e173165..3c48dccef06530f9284ea40a5262292034aa6bee"
+    "shas": "e3d66cfd6ed2884bdfc1abc834698e29d4ccfaf7..22a4288f343e00443d2500b2f7739ce13e3f863f"
 }
 ,{
     "testCaseDescription": "go-interface-types-delete-replacement-test",
@@ -497,7 +497,7 @@
         "  SomeMethod(s string) error"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3c48dccef06530f9284ea40a5262292034aa6bee..65be5fe927cc5bc75f4799d076f70959dc8bb780"
+    "shas": "22a4288f343e00443d2500b2f7739ce13e3f863f..b0bd8223549d61b33815e3235244ef099d963b6f"
 }
 ,{
     "testCaseDescription": "go-interface-types-delete-insert-test",
@@ -726,7 +726,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "65be5fe927cc5bc75f4799d076f70959dc8bb780..77b8a317d686867c286a7f80440eb9462a56d0a3"
+    "shas": "b0bd8223549d61b33815e3235244ef099d963b6f..6303b5139eedd23bc77aa6d3b86fa7d73e28d07b"
 }
 ,{
     "testCaseDescription": "go-interface-types-teardown-test",
@@ -768,5 +768,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "77b8a317d686867c286a7f80440eb9462a56d0a3..d702df98cd991374b103078c3d3868a9b3bc5534"
+    "shas": "6303b5139eedd23bc77aa6d3b86fa7d73e28d07b..32bc1a4c3030014f034299eaf358ed9540142bd4"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d4f6d3095efbbce722051ecd584ad6a654426d8c..0a2dc09d2ac872115cca2dde67e570826f0ee384"
+    "shas": "08ffb30570dd5dfa94d28706aba89d46d94d95de..62346908f2a062899ea117e430c03ad994a08cdf"
 }
 ,{
     "testCaseDescription": "go-label-statements-insert-test",
@@ -83,7 +83,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0a2dc09d2ac872115cca2dde67e570826f0ee384..1882ac188f1aabfb0cd2ebe0afb7835bb7b08829"
+    "shas": "62346908f2a062899ea117e430c03ad994a08cdf..75d8a1b7f66e8f17eaebf59f989d436b0b4b2621"
 }
 ,{
     "testCaseDescription": "go-label-statements-replacement-test",
@@ -139,7 +139,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1882ac188f1aabfb0cd2ebe0afb7835bb7b08829..eeeb061c524890b2093642f0d167dc73287909f0"
+    "shas": "75d8a1b7f66e8f17eaebf59f989d436b0b4b2621..07acb718a813eb362bb991db1ef6a850a15d6864"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-replacement-test",
@@ -195,7 +195,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "eeeb061c524890b2093642f0d167dc73287909f0..704300d6dfe3b14be420058da2880debc6cf230a"
+    "shas": "07acb718a813eb362bb991db1ef6a850a15d6864..04bd2e9f3cf9820fe05fe37177e073d013f271e9"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-insert-test",
@@ -240,7 +240,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "704300d6dfe3b14be420058da2880debc6cf230a..9f325ac561934e124c5e5531682ee5f6f796bc40"
+    "shas": "04bd2e9f3cf9820fe05fe37177e073d013f271e9..7e5d659d967ba59085d045a2cdb6a31754887610"
 }
 ,{
     "testCaseDescription": "go-label-statements-teardown-test",
@@ -282,5 +282,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9f325ac561934e124c5e5531682ee5f6f796bc40..695dc8f6eadde4811f068db1566ef6445fb5a7d8"
+    "shas": "7e5d659d967ba59085d045a2cdb6a31754887610..3c18118ea8496b4ffea7d20ce7e0302dded5c3d1"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fb491ebb3ced908a8bed449c46f26e0dfa4a6cb5..6ad0b8598d3ba65ed188c5c5d68a5a44e25af864"
+    "shas": "448e795784d1aee1d1cf28bd856fbb68936b4c5d..03738e9348f16b52ed09fd26d89c67d09d82a485"
 }
 ,{
     "testCaseDescription": "go-map-literals-insert-test",
@@ -99,7 +99,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6ad0b8598d3ba65ed188c5c5d68a5a44e25af864..23c1a3cca43372362455812a0769ccecab863528"
+    "shas": "03738e9348f16b52ed09fd26d89c67d09d82a485..67504f50f96ad86871c2a85c18f8f680bc8b1d84"
 }
 ,{
     "testCaseDescription": "go-map-literals-replacement-test",
@@ -270,7 +270,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "23c1a3cca43372362455812a0769ccecab863528..8982c4335816e522d82f950afd7c7ad50ad1b083"
+    "shas": "67504f50f96ad86871c2a85c18f8f680bc8b1d84..e07a88dc503f1a5d7000f89cf3e29497324ba9c6"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-replacement-test",
@@ -438,7 +438,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8982c4335816e522d82f950afd7c7ad50ad1b083..20ba1b9a43936ec02daccd5b4c1d485ea1ed1b13"
+    "shas": "e07a88dc503f1a5d7000f89cf3e29497324ba9c6..d73644667ec3181c61c3b07b47a87aeff1b64d53"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-insert-test",
@@ -499,7 +499,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "20ba1b9a43936ec02daccd5b4c1d485ea1ed1b13..334589c4d61c2237d220e2a1fd71456b4afabfa7"
+    "shas": "d73644667ec3181c61c3b07b47a87aeff1b64d53..c83e73703276de61cbcf194aa1f2debb58825ec9"
 }
 ,{
     "testCaseDescription": "go-map-literals-teardown-test",
@@ -541,5 +541,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "334589c4d61c2237d220e2a1fd71456b4afabfa7..3d0dd6ed18ef416d7b9b18bd53203e073c20a14e"
+    "shas": "c83e73703276de61cbcf194aa1f2debb58825ec9..621358b715438b3607a999075a384be3bfdc5d8e"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d702df98cd991374b103078c3d3868a9b3bc5534..fa7b8cbe582faaca0947d939870e1d0a58088095"
+    "shas": "32bc1a4c3030014f034299eaf358ed9540142bd4..921d449d22d3faabffe469035154d4322f631042"
 }
 ,{
     "testCaseDescription": "go-map-types-insert-test",
@@ -111,7 +111,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fa7b8cbe582faaca0947d939870e1d0a58088095..7b305f2ad75ebe0910a9b5dc64c5b41fcbf8d94a"
+    "shas": "921d449d22d3faabffe469035154d4322f631042..1f07b8baed7e9e9cc3ffb004eb04be5d03c540f3"
 }
 ,{
     "testCaseDescription": "go-map-types-replacement-test",
@@ -166,7 +166,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7b305f2ad75ebe0910a9b5dc64c5b41fcbf8d94a..efcdb78aa2c37ee1611989b238db31a299762fee"
+    "shas": "1f07b8baed7e9e9cc3ffb004eb04be5d03c540f3..69e0a291d116574e6acc1f460a5e52e562ff9560"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-replacement-test",
@@ -221,7 +221,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "efcdb78aa2c37ee1611989b238db31a299762fee..c89dcc8f9006c717e613cae1791904eee6a9dfa3"
+    "shas": "69e0a291d116574e6acc1f460a5e52e562ff9560..c01d68d812b595d93711f85d6e2c0f61cf2407eb"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-insert-test",
@@ -294,7 +294,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c89dcc8f9006c717e613cae1791904eee6a9dfa3..eb2ba7e2f4574beeafb9598ca02832316500db30"
+    "shas": "c01d68d812b595d93711f85d6e2c0f61cf2407eb..00d906b4ab4a215331fc7008ee9c076a0c0e8616"
 }
 ,{
     "testCaseDescription": "go-map-types-teardown-test",
@@ -336,5 +336,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "eb2ba7e2f4574beeafb9598ca02832316500db30..9f123147d33a2075256d6e9c6b5ceac701b4fa63"
+    "shas": "00d906b4ab4a215331fc7008ee9c076a0c0e8616..adc3968a00fa6de4202e0a760ca8504aa67450a2"
 }]

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

@@ -38,7 +38,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fccb257c8f92940c2a2207096f1f4c83b1720e43..2534849e6f99023ae94bb19b648fa79eadf5d6c1"
+    "shas": "b076630878d46ba8c71d3e6485d4d3fb02d45f5c..ac43fc41633a61a3b9320aaa4263284b71935f97"
 }
 ,{
     "testCaseDescription": "go-method-declarations-insert-test",
@@ -170,7 +170,7 @@
         "+func (self Person) Equals(other Person) bool {}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2534849e6f99023ae94bb19b648fa79eadf5d6c1..9b4b4e2750bc1d6bef25d0f694cf0c98bbf1acee"
+    "shas": "ac43fc41633a61a3b9320aaa4263284b71935f97..3688de23ed007e62d4f72894a8dad124f0e0fa53"
 }
 ,{
     "testCaseDescription": "go-method-declarations-replacement-test",
@@ -251,7 +251,7 @@
         "+func (self Num) Equals(other Num) bool {}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9b4b4e2750bc1d6bef25d0f694cf0c98bbf1acee..ad0c18a69f6154b150774f467e92a57a5d2c7d0d"
+    "shas": "3688de23ed007e62d4f72894a8dad124f0e0fa53..a97f4aaef426cafc0af180258cd6bbc1eafbb68d"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-replacement-test",
@@ -332,7 +332,7 @@
         "+func (self Person) Equals(other Person) bool {}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ad0c18a69f6154b150774f467e92a57a5d2c7d0d..0c266d2aea3cf20a3268c2d11ba797d33bf60988"
+    "shas": "a97f4aaef426cafc0af180258cd6bbc1eafbb68d..6b4249af7a110dfb20f1d6c2592c5d4284f851b9"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-insert-test",
@@ -464,7 +464,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0c266d2aea3cf20a3268c2d11ba797d33bf60988..d41d272273faf22aa70df56098d3ca2550e5013a"
+    "shas": "6b4249af7a110dfb20f1d6c2592c5d4284f851b9..b206509e2196441ff899abf769fefdf388afab9b"
 }
 ,{
     "testCaseDescription": "go-method-declarations-teardown-test",
@@ -506,5 +506,5 @@
         "-"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d41d272273faf22aa70df56098d3ca2550e5013a..6ac3c2bed5b158c40ccf1f1e9a347a5288538cd0"
+    "shas": "b206509e2196441ff899abf769fefdf388afab9b..106f4f56822fc7df76a04f0cdd9817338b6bc8af"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9f123147d33a2075256d6e9c6b5ceac701b4fa63..d8366c2ea461fb6d3947df0a5412a3fb3d34f50e"
+    "shas": "adc3968a00fa6de4202e0a760ca8504aa67450a2..4bcb0ce62b03c1bb414ec939d88df92ab2c75f75"
 }
 ,{
     "testCaseDescription": "go-pointer-types-insert-test",
@@ -129,7 +129,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d8366c2ea461fb6d3947df0a5412a3fb3d34f50e..0583851d05314bb2a6455f1bd0cc9ec33414f66c"
+    "shas": "4bcb0ce62b03c1bb414ec939d88df92ab2c75f75..db787e28e0b635ea61307cf503b0496fe8cfe66f"
 }
 ,{
     "testCaseDescription": "go-pointer-types-replacement-test",
@@ -214,7 +214,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0583851d05314bb2a6455f1bd0cc9ec33414f66c..14428be07f5567e6a0da1e4de6cf5a42798d7f17"
+    "shas": "db787e28e0b635ea61307cf503b0496fe8cfe66f..8a78ec412d018be3da905cd3008bbc5b5a3b38aa"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-replacement-test",
@@ -299,7 +299,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "14428be07f5567e6a0da1e4de6cf5a42798d7f17..189f09ffea4084265be9c565ecd88a1bf9e27157"
+    "shas": "8a78ec412d018be3da905cd3008bbc5b5a3b38aa..d1ebe3bebe701259c001430bbd9d9e501c04a47a"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-insert-test",
@@ -390,7 +390,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "189f09ffea4084265be9c565ecd88a1bf9e27157..a0c5c806bcb59bdc0d9c48efa4ab1f8bdcd024c3"
+    "shas": "d1ebe3bebe701259c001430bbd9d9e501c04a47a..b094df653479b895c5ee0dd246a7689ba1e54581"
 }
 ,{
     "testCaseDescription": "go-pointer-types-teardown-test",
@@ -432,5 +432,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a0c5c806bcb59bdc0d9c48efa4ab1f8bdcd024c3..244fbb4d4eaca93ced3e79bbbddb3d11b85e9c31"
+    "shas": "b094df653479b895c5ee0dd246a7689ba1e54581..84cea06264bc0bf28411e3655b8e64e14f3ce321"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e0451e34bfb2596bc4c154592efc288ad448a2e0..e07430d8ae69eaac6a0e928da55a005422cf8652"
+    "shas": "95bdc31e0a986eb0b5982aa158a2e7fb56a078bb..61cebe64f36e4ec13ea297cfc5398851c7aca698"
 }
 ,{
     "testCaseDescription": "go-qualified-types-insert-test",
@@ -111,7 +111,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e07430d8ae69eaac6a0e928da55a005422cf8652..49c348b1dae12c595209f46672dfc827ef93ab8f"
+    "shas": "61cebe64f36e4ec13ea297cfc5398851c7aca698..4608063185ada15d2add440d580972c4eee0c2cb"
 }
 ,{
     "testCaseDescription": "go-qualified-types-replacement-test",
@@ -220,7 +220,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "49c348b1dae12c595209f46672dfc827ef93ab8f..9ca65f23456ccff0c71471026670d5d11066f7ec"
+    "shas": "4608063185ada15d2add440d580972c4eee0c2cb..d2c1a0156d0c9d58588c413faf9a0b3da230d28a"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-replacement-test",
@@ -329,7 +329,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9ca65f23456ccff0c71471026670d5d11066f7ec..c5c1250bafe271f5300b35ea98a11e623b105e30"
+    "shas": "d2c1a0156d0c9d58588c413faf9a0b3da230d28a..ab96d04fa567934e17379272fbbcdf3b227fd25b"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-insert-test",
@@ -402,7 +402,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c5c1250bafe271f5300b35ea98a11e623b105e30..7bb994d2fb5ca2645cf156aa41d39cc08b73c57b"
+    "shas": "ab96d04fa567934e17379272fbbcdf3b227fd25b..dbe96384aff7998c2923085c014df1a01fd561fb"
 }
 ,{
     "testCaseDescription": "go-qualified-types-teardown-test",
@@ -444,5 +444,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7bb994d2fb5ca2645cf156aa41d39cc08b73c57b..d1c99bc906a6edfdaeae75ba223e81d8a753c86f"
+    "shas": "dbe96384aff7998c2923085c014df1a01fd561fb..c81623e5265dc1e3e2f0d5bc8724b42e25fdaf65"
 }]

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

@@ -35,7 +35,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4e968b13372f698a7052494376f12760ebb66e27..68b8bf2d0046cc026c6fce5f5af00e3b297b1fd4"
+    "shas": "9bea4d9b913b2aa36024a30b0fd25cad043f3dab..f91b3b527856f643fcc99abe4fa295b69a754e9d"
 }
 ,{
     "testCaseDescription": "go-rune-literals-insert-test",
@@ -179,7 +179,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
+                    "summary": "Added 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
                 }
             ]
         }
@@ -206,7 +206,7 @@
         "+)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "68b8bf2d0046cc026c6fce5f5af00e3b297b1fd4..dc6a3333fcb884c14391747e4b317acf99746492"
+    "shas": "f91b3b527856f643fcc99abe4fa295b69a754e9d..c9396b961ebf971be5d5b2fedca1917252666397"
 }
 ,{
     "testCaseDescription": "go-rune-literals-replacement-test",
@@ -407,7 +407,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'const (\na = '1'\nb = '\n''\nc = '\\u0011'\nc = '\\'\nc = '\\u0022'\nc = '\\U01234568'\n)' at line 2, column 1 - line 10, column 2 in the main module"
+                    "summary": "Added 'const (\na = '1'\nb = '\n''\nc = '\\u0011'\nc = '\\'\nc = '\\u0022'\nc = '\\U01234568'\n)' at line 2, column 1 - line 10, column 2 in the main module"
                 },
                 {
                     "span": {
@@ -422,7 +422,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
+                    "summary": "Deleted 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
                 }
             ]
         }
@@ -454,7 +454,7 @@
         " )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "dc6a3333fcb884c14391747e4b317acf99746492..4954bff1ae56a12e298759ba22707943c9a3bbc7"
+    "shas": "c9396b961ebf971be5d5b2fedca1917252666397..abf206a0ea0071e0f69c2f016c141896e0bc602a"
 }
 ,{
     "testCaseDescription": "go-rune-literals-delete-replacement-test",
@@ -655,7 +655,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
+                    "summary": "Added 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
                 },
                 {
                     "span": {
@@ -670,7 +670,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'const (\na = '1'\nb = '\n''\nc = '\\u0011'\nc = '\\'\nc = '\\u0022'\nc = '\\U01234568'\n)' at line 2, column 1 - line 10, column 2 in the main module"
+                    "summary": "Deleted 'const (\na = '1'\nb = '\n''\nc = '\\u0011'\nc = '\\'\nc = '\\u0022'\nc = '\\U01234568'\n)' at line 2, column 1 - line 10, column 2 in the main module"
                 }
             ]
         }
@@ -702,7 +702,7 @@
         " )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4954bff1ae56a12e298759ba22707943c9a3bbc7..5f9866d5c6de524649a9859ac3019f93e1fe93c7"
+    "shas": "abf206a0ea0071e0f69c2f016c141896e0bc602a..f94c291cd8a31ff85a78a946733cac907a32054c"
 }
 ,{
     "testCaseDescription": "go-rune-literals-delete-insert-test",
@@ -846,7 +846,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
+                    "summary": "Deleted 'const (\na = '0'\nb = '\\''\nc = '\\'\nc = '\n'\nc = '\\u0000'\nc = '\\U01234567'\n)' at line 2, column 1 - line 10, column 2 in the main module"
                 }
             ]
         }
@@ -873,7 +873,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5f9866d5c6de524649a9859ac3019f93e1fe93c7..7c60f23b946969dea2f85dd924d3fa9b86f97fe5"
+    "shas": "f94c291cd8a31ff85a78a946733cac907a32054c..e430db8888c6c0a207bdb7f1396254b4cf6b320d"
 }
 ,{
     "testCaseDescription": "go-rune-literals-teardown-test",
@@ -912,5 +912,5 @@
         "-"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7c60f23b946969dea2f85dd924d3fa9b86f97fe5..2c9e06c6518a974b3a83028a0eabeb715241d2b6"
+    "shas": "e430db8888c6c0a207bdb7f1396254b4cf6b320d..5fff449fda240ef2415ceb7e8ee284054f218586"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "32835c31a64dadd483252a88dd85928f57ce5e44..371509eeeaf98517a2c1d053e31985f66d4089f6"
+    "shas": "21d9d45a2e97da412a64b92913dbfd3ac82cc701..5a8c2abbdf3a2bc903219f117737e9c5c73fba6b"
 }
 ,{
     "testCaseDescription": "go-select-statements-insert-test",
@@ -90,7 +90,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "371509eeeaf98517a2c1d053e31985f66d4089f6..d67ee5df6cdc71f4e1ae4ccdb61c9e5b83151a87"
+    "shas": "5a8c2abbdf3a2bc903219f117737e9c5c73fba6b..e665eaaa2d7a4bb57a86870813873a132f43d258"
 }
 ,{
     "testCaseDescription": "go-select-statements-replacement-test",
@@ -207,7 +207,7 @@
         "     return"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d67ee5df6cdc71f4e1ae4ccdb61c9e5b83151a87..4cac8b5133e4bad9cc0ffa9e7aa30141c8f3d1e0"
+    "shas": "e665eaaa2d7a4bb57a86870813873a132f43d258..4de4da200e17fe030a3d77f8e66d29acbb1572ff"
 }
 ,{
     "testCaseDescription": "go-select-statements-delete-replacement-test",
@@ -324,7 +324,7 @@
         "     return"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4cac8b5133e4bad9cc0ffa9e7aa30141c8f3d1e0..6c3ef8e691ef04703d8716d17ba51278dda106da"
+    "shas": "4de4da200e17fe030a3d77f8e66d29acbb1572ff..ede2f95d67ac6f18694a2ee682e76a22cbaa7309"
 }
 ,{
     "testCaseDescription": "go-select-statements-delete-insert-test",
@@ -376,7 +376,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6c3ef8e691ef04703d8716d17ba51278dda106da..a082267b061ee28bbb4f9536e607a138b1b483b6"
+    "shas": "ede2f95d67ac6f18694a2ee682e76a22cbaa7309..b7a8230749afbdaaf2cb9c9dd0808f1544b434e8"
 }
 ,{
     "testCaseDescription": "go-select-statements-teardown-test",
@@ -418,5 +418,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a082267b061ee28bbb4f9536e607a138b1b483b6..9d302626b06231ccfe43953c3a0890225a7b6947"
+    "shas": "b7a8230749afbdaaf2cb9c9dd0808f1544b434e8..046b76b7401f5781415d12e2bfb4d60c03c48472"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b7cef53a7c59fc2b88ba0a41658125f986c008e2..1d1e76b5a23f52a9d4d9a4e613df63a5a6486883"
+    "shas": "9bb52005e388bd5cc9357e8492af2322ce0b4299..eb62c63abe41aeed322618196cae641f4a80af6e"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-insert-test",
@@ -81,7 +81,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1d1e76b5a23f52a9d4d9a4e613df63a5a6486883..2e6df18435a75e078a79a0a5e44339380b354aa1"
+    "shas": "eb62c63abe41aeed322618196cae641f4a80af6e..8cb102d0a1f3b6c2cdad36f0631270277ce7b0fa"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-replacement-test",
@@ -190,7 +190,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2e6df18435a75e078a79a0a5e44339380b354aa1..3fa6d37e446b9ace2aecf8ce7710600a208aa5a5"
+    "shas": "8cb102d0a1f3b6c2cdad36f0631270277ce7b0fa..e19d29f6bdcb3e4bb6086598de139a01065e1769"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-replacement-test",
@@ -299,7 +299,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3fa6d37e446b9ace2aecf8ce7710600a208aa5a5..e2978c38d504eb925e11bad805a12a6303cf218c"
+    "shas": "e19d29f6bdcb3e4bb6086598de139a01065e1769..0cb3912ce76907ba4ac6c077a15e03b23cca6bed"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-insert-test",
@@ -342,7 +342,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e2978c38d504eb925e11bad805a12a6303cf218c..73fe621f3b693eca42f7814887f871fbdf691302"
+    "shas": "0cb3912ce76907ba4ac6c077a15e03b23cca6bed..79d5b4aa4b1277fd8bbebd2042875de69605a68c"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-teardown-test",
@@ -384,5 +384,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "73fe621f3b693eca42f7814887f871fbdf691302..886b33d41824a470340628cf21c936e1b396a5b9"
+    "shas": "79d5b4aa4b1277fd8bbebd2042875de69605a68c..2754db7a232d4bd458e6d63420c7107cc4bf7e72"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6e5a6185e98c97f96ff4589135ac2170a4c0a147..9101321591e04db5807c91e71e9c19734617759c"
+    "shas": "3f34a10b2e6608640c4757f2d2fdb8f26b3c0936..2c383c43d7f3bef03737e26087656616df730b4a"
 }
 ,{
     "testCaseDescription": "go-send-statements-insert-test",
@@ -58,7 +58,7 @@
                             ]
                         }
                     },
-                    "summary": "Added 'foo' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'foo' identifier in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -96,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9101321591e04db5807c91e71e9c19734617759c..a2a7930cf4f95639c6827a46627ef54af57c0afb"
+    "shas": "2c383c43d7f3bef03737e26087656616df730b4a..c0ec7b8141cb1343e7a4fe8fdd2fdd9269b64cf2"
 }
 ,{
     "testCaseDescription": "go-send-statements-replacement-test",
@@ -178,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a2a7930cf4f95639c6827a46627ef54af57c0afb..79963b78b47027bed34d8fc80d4f25869547e3c6"
+    "shas": "c0ec7b8141cb1343e7a4fe8fdd2fdd9269b64cf2..9726824120027c0cc264583d4cbb29e13d0481e3"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-replacement-test",
@@ -260,7 +260,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "79963b78b47027bed34d8fc80d4f25869547e3c6..b88c47afebabaa12e0387282b9ec94b3e236734b"
+    "shas": "9726824120027c0cc264583d4cbb29e13d0481e3..da4f549be8c5407c3372940b48decaa8e7e7984e"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-insert-test",
@@ -280,7 +280,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted 'foo' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'foo' identifier in the main function of the 'main' module"
                 },
                 {
                     "span": {
@@ -318,7 +318,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b88c47afebabaa12e0387282b9ec94b3e236734b..286fcc6657c6d4f7d426c6ceafce0665509bddcf"
+    "shas": "da4f549be8c5407c3372940b48decaa8e7e7984e..c9f309571c4f25c9112b6b25ce47b3284c8feaa9"
 }
 ,{
     "testCaseDescription": "go-send-statements-teardown-test",
@@ -360,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "286fcc6657c6d4f7d426c6ceafce0665509bddcf..ac4b7fa9d117b427fb2c76d3802976beb8d4db19"
+    "shas": "c9f309571c4f25c9112b6b25ce47b3284c8feaa9..0caa6845091f9b7743b06f2feaa7507925d065f5"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6e7cf72f7ca77faa65f54df06a3ed9b0dfb54980..26777dae71ad7b467d17de5dbaef5ebe326a0312"
+    "shas": "d66b71957411bd7a2c7774ef68c167f1a4f80efa..90fcfe93739becca6157985b5833b3222c03b9ed"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-insert-test",
@@ -96,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "26777dae71ad7b467d17de5dbaef5ebe326a0312..5805868e9f74a60616d258fa383d51c6cc8b9673"
+    "shas": "90fcfe93739becca6157985b5833b3222c03b9ed..41f8022371d9cee89548a30a57a0e7fccedc969f"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-replacement-test",
@@ -232,7 +232,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5805868e9f74a60616d258fa383d51c6cc8b9673..e569c9ac78ada85bb58b8550b4fe64269599a686"
+    "shas": "41f8022371d9cee89548a30a57a0e7fccedc969f..2e9634ead1868ad49765264ae5ed2fef149c35cc"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-replacement-test",
@@ -368,7 +368,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e569c9ac78ada85bb58b8550b4fe64269599a686..ec6e60fbf622a591b104023fac651b731d7721eb"
+    "shas": "2e9634ead1868ad49765264ae5ed2fef149c35cc..22234691339a0f6257692c87b95d859b3a307fc7"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-insert-test",
@@ -426,7 +426,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ec6e60fbf622a591b104023fac651b731d7721eb..e846d0abed7495ca231a79d1ca0259363bca3511"
+    "shas": "22234691339a0f6257692c87b95d859b3a307fc7..1f102a0446f14f0236c36cf3bb0ed056a692afae"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-teardown-test",
@@ -468,5 +468,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e846d0abed7495ca231a79d1ca0259363bca3511..eedd4cea7ca7eda4bc841d6ac361a3d061a0e875"
+    "shas": "1f102a0446f14f0236c36cf3bb0ed056a692afae..0ee5a4c57cfe71d667e39f86339ab621f1653e09"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a16272a34652485dcd692bd380dfcd4d3b7b8f77..fbde31f90775b6edee740880cb404320b61c8d26"
+    "shas": "41133764e3945b380f42a5ed85a241bddc76bd16..6c4aaba1cb16b5eab42f9e9abf5b34d3dc4ef965"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-insert-test",
@@ -173,7 +173,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fbde31f90775b6edee740880cb404320b61c8d26..c52a8d318da19e2d47fce2964451514cb9577aee"
+    "shas": "6c4aaba1cb16b5eab42f9e9abf5b34d3dc4ef965..606a67d62e1e305be9ca4564843ca412a3e9c267"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-replacement-test",
@@ -286,7 +286,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c52a8d318da19e2d47fce2964451514cb9577aee..7384b5abfe2d64e803134fa56645a8bb6c686e62"
+    "shas": "606a67d62e1e305be9ca4564843ca412a3e9c267..30cb0bc1c994b78519d10e4784d58fdc9ca0bab7"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-replacement-test",
@@ -399,7 +399,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7384b5abfe2d64e803134fa56645a8bb6c686e62..3a1593993a3070e1a2289d47f1d0fad6f88f52e7"
+    "shas": "30cb0bc1c994b78519d10e4784d58fdc9ca0bab7..68a84de5aa343d8de6781e5195ac0bd83d9a421a"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-insert-test",
@@ -534,7 +534,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3a1593993a3070e1a2289d47f1d0fad6f88f52e7..407cca42caf5fcfeb20e40efe810f176cd701287"
+    "shas": "68a84de5aa343d8de6781e5195ac0bd83d9a421a..5c160762eb81cef7896ec79538b76bc595383900"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-teardown-test",
@@ -576,5 +576,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "407cca42caf5fcfeb20e40efe810f176cd701287..274eb607291a69864694395d2c348af63b4be848"
+    "shas": "5c160762eb81cef7896ec79538b76bc595383900..d8d968fae9ce4d9c6bb8e5e1f76d3a966ab90c79"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "465c0e2e2bcce4e0aa944f72704ec5e00f3fc6c8..195a3a9cc89c49a9e4ab5cb69e856b94dbdb19de"
+    "shas": "91a7c1830966b35d27d71f75444fe93cd256cee8..f2b52dad48d85f3132947360f406039e4c1d59ac"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-insert-test",
@@ -188,7 +188,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "195a3a9cc89c49a9e4ab5cb69e856b94dbdb19de..59d83c8ccd13e5bd94a54bed45d9e3725cf572dc"
+    "shas": "f2b52dad48d85f3132947360f406039e4c1d59ac..1c5aa20ea1a7bc35efb5a2848959257ac3f96b2f"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-replacement-test",
@@ -301,7 +301,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "59d83c8ccd13e5bd94a54bed45d9e3725cf572dc..d0375238a993a0070cdc2af2d8bade7d60c2df5b"
+    "shas": "1c5aa20ea1a7bc35efb5a2848959257ac3f96b2f..3417c3a459167f545d06367a0b56eb4c83dca84c"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-replacement-test",
@@ -414,7 +414,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d0375238a993a0070cdc2af2d8bade7d60c2df5b..08ed16cddc10660c031bebb6e5ebe574af3b53ed"
+    "shas": "3417c3a459167f545d06367a0b56eb4c83dca84c..28cd2198884763c98d9732c800e04684a2459458"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-insert-test",
@@ -564,7 +564,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "08ed16cddc10660c031bebb6e5ebe574af3b53ed..2567ef62faa9d1167c32c5d81e628ad7dcca12bf"
+    "shas": "28cd2198884763c98d9732c800e04684a2459458..9a5b11ef040038e7f663da0ac526cf4c9bcfb301"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-teardown-test",
@@ -606,5 +606,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2567ef62faa9d1167c32c5d81e628ad7dcca12bf..044460a74ea4718fcdbd79197f8fc1a26518989e"
+    "shas": "9a5b11ef040038e7f663da0ac526cf4c9bcfb301..c440e7136559f8e8bb04e8a9e0900bc29626237c"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f6cfa951b93926318c99c9697af165972e8b3e2e..4919c08a3c847b6c38a44cb28bbd33b76e2ba66c"
+    "shas": "2afbc7da20d4699edaf2e01e01c71a48961e91de..1b7916dee5ba49bd3423d96dc1cc879dc92ff3c9"
 }
 ,{
     "testCaseDescription": "go-slice-literals-insert-test",
@@ -161,7 +161,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4919c08a3c847b6c38a44cb28bbd33b76e2ba66c..398b52a014eaaa2de45a543feadc4eb70061486f"
+    "shas": "1b7916dee5ba49bd3423d96dc1cc879dc92ff3c9..3df6e956f4c2763d248d456af5cef2f95bfae191"
 }
 ,{
     "testCaseDescription": "go-slice-literals-replacement-test",
@@ -293,7 +293,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "398b52a014eaaa2de45a543feadc4eb70061486f..5f4020e552373475ea67ee5467657d69ff8ad6c1"
+    "shas": "3df6e956f4c2763d248d456af5cef2f95bfae191..025f7812dce2a577693aa8ce0a0f4be59312db8f"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-replacement-test",
@@ -425,7 +425,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5f4020e552373475ea67ee5467657d69ff8ad6c1..967c2cf6a884c2f18573c35fa5814819f7ca47a0"
+    "shas": "025f7812dce2a577693aa8ce0a0f4be59312db8f..f5975eb47e6810a395df1a47ead54aab7a48554a"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-insert-test",
@@ -548,7 +548,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "967c2cf6a884c2f18573c35fa5814819f7ca47a0..1be874e88d025c5e964dd4f2e62e6706968577dc"
+    "shas": "f5975eb47e6810a395df1a47ead54aab7a48554a..268d31f43d77675fe4c229f38165ec7779cceccc"
 }
 ,{
     "testCaseDescription": "go-slice-literals-teardown-test",
@@ -590,5 +590,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1be874e88d025c5e964dd4f2e62e6706968577dc..d1c0eedbc290123938e88b7089293253841b80a0"
+    "shas": "268d31f43d77675fe4c229f38165ec7779cceccc..76bcdd875f780855cc6dff6a6e525c997eddbac1"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "594aa6aebbd9cba8df042b57cc6a06c8e0594212..84c32926b5240ac85d3a9dea6828b2dc975a5907"
+    "shas": "78931e2e4465f390ff26989f161e9f799822c729..2cf7949127ec84ca0ede9975d7773e80c3668b1e"
 }
 ,{
     "testCaseDescription": "go-slice-types-insert-test",
@@ -127,7 +127,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "84c32926b5240ac85d3a9dea6828b2dc975a5907..445f4051ffa85ee87a6c54a1fa9ff6ca65e1bf5e"
+    "shas": "2cf7949127ec84ca0ede9975d7773e80c3668b1e..b8d97c1c6df7c1001a0f1c0ec69a224eb04dd5e9"
 }
 ,{
     "testCaseDescription": "go-slice-types-replacement-test",
@@ -217,7 +217,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "445f4051ffa85ee87a6c54a1fa9ff6ca65e1bf5e..1428d5842e369838174db98dbe06e5c026cdc478"
+    "shas": "b8d97c1c6df7c1001a0f1c0ec69a224eb04dd5e9..b1f3c529803640c78f951863769db8f58923ee98"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-replacement-test",
@@ -307,7 +307,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1428d5842e369838174db98dbe06e5c026cdc478..3396aaa829cab6a201edc22f2c99298a68510b0a"
+    "shas": "b1f3c529803640c78f951863769db8f58923ee98..6b7f69f27730715fa51471ee5202a54b49be911d"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-insert-test",
@@ -396,7 +396,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3396aaa829cab6a201edc22f2c99298a68510b0a..29bfe6ca00899e14e48b6532468b6aa09cfded1c"
+    "shas": "6b7f69f27730715fa51471ee5202a54b49be911d..5f0f61ea5050fa8720d53f11a872fa08d71265cb"
 }
 ,{
     "testCaseDescription": "go-slice-types-teardown-test",
@@ -438,5 +438,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "29bfe6ca00899e14e48b6532468b6aa09cfded1c..da8bddc263da6c0b32289331a122790ea562912d"
+    "shas": "5f0f61ea5050fa8720d53f11a872fa08d71265cb..164eee68fbf786c9edccea96ed9e3cf0339f531c"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "23cf9be6be14db0686032ad5e10c7dcd0e0cf2d2..8a358ab10579fadd85816c205cd11dd6c4b61857"
+    "shas": "cb195bc65760cc90fc3c5e75478c686e1626d38d..c762f67534b9cd15c7f1a301c1a4db9d5c4610f9"
 }
 ,{
     "testCaseDescription": "go-string-literals-insert-test",
@@ -129,7 +129,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8a358ab10579fadd85816c205cd11dd6c4b61857..e3734f409da428361dd4fee6ffd63d300775a484"
+    "shas": "c762f67534b9cd15c7f1a301c1a4db9d5c4610f9..ee859505a405ed8ff17571a7f290be5957d1020e"
 }
 ,{
     "testCaseDescription": "go-string-literals-replacement-test",
@@ -214,7 +214,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e3734f409da428361dd4fee6ffd63d300775a484..1048c4cd23214d7673e17e7ee22202a55d71f1da"
+    "shas": "ee859505a405ed8ff17571a7f290be5957d1020e..341cd499fc3e65aac3c2b5e6c0f2eeb710bc034d"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-replacement-test",
@@ -299,7 +299,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1048c4cd23214d7673e17e7ee22202a55d71f1da..aa1aff70e64739dab88537d6234153090460d347"
+    "shas": "341cd499fc3e65aac3c2b5e6c0f2eeb710bc034d..c87aef8049c3bb8a13066a4a20644e48c1a39110"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-insert-test",
@@ -390,7 +390,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "aa1aff70e64739dab88537d6234153090460d347..e90933d0577ce1a8c7248da325ec5d28de6ea15e"
+    "shas": "c87aef8049c3bb8a13066a4a20644e48c1a39110..867c6610f4a820eda8330cae94d081d61f8e954a"
 }
 ,{
     "testCaseDescription": "go-string-literals-teardown-test",
@@ -432,5 +432,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e90933d0577ce1a8c7248da325ec5d28de6ea15e..f6cfa951b93926318c99c9697af165972e8b3e2e"
+    "shas": "867c6610f4a820eda8330cae94d081d61f8e954a..2afbc7da20d4699edaf2e01e01c71a48961e91de"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3d0dd6ed18ef416d7b9b18bd53203e073c20a14e..08f2c9f8d59efb60ecd0f7488fd7da3d45435961"
+    "shas": "621358b715438b3607a999075a384be3bfdc5d8e..c7c9cff4a487c563fd594baeab70ea68f3e5824f"
 }
 ,{
     "testCaseDescription": "go-struct-literals-insert-test",
@@ -161,7 +161,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "08f2c9f8d59efb60ecd0f7488fd7da3d45435961..53b1c226c59a8edaab7f5cffed468b602ab83a93"
+    "shas": "c7c9cff4a487c563fd594baeab70ea68f3e5824f..68f7a70b71c367f324b01e4390fc65ff6a6c85d1"
 }
 ,{
     "testCaseDescription": "go-struct-literals-replacement-test",
@@ -331,7 +331,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "53b1c226c59a8edaab7f5cffed468b602ab83a93..a2d27f9f319a8e62109ca3a10d624b301e988611"
+    "shas": "68f7a70b71c367f324b01e4390fc65ff6a6c85d1..d7c78227a597356e5e0b6611e59a1e6e316c7c32"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-replacement-test",
@@ -501,7 +501,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a2d27f9f319a8e62109ca3a10d624b301e988611..46056980bd007b68e636d7ed83aedf940cf8e060"
+    "shas": "d7c78227a597356e5e0b6611e59a1e6e316c7c32..db11b9059d23b05ada714fc2c5df3735794e5718"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-insert-test",
@@ -624,7 +624,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "46056980bd007b68e636d7ed83aedf940cf8e060..14b0f63dbebceac16ba03154705db3deab38c4b0"
+    "shas": "db11b9059d23b05ada714fc2c5df3735794e5718..d6c7b370e73c65486b9bddc81e758e61985484d6"
 }
 ,{
     "testCaseDescription": "go-struct-literals-teardown-test",
@@ -666,5 +666,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "14b0f63dbebceac16ba03154705db3deab38c4b0..6e5a6185e98c97f96ff4589135ac2170a4c0a147"
+    "shas": "d6c7b370e73c65486b9bddc81e758e61985484d6..3f34a10b2e6608640c4757f2d2fdb8f26b3c0936"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "da8bddc263da6c0b32289331a122790ea562912d..ced67241c50bd00d4dd7eb1988d435557e85603d"
+    "shas": "164eee68fbf786c9edccea96ed9e3cf0339f531c..ed0d138f9f4f77ab9f0ede51c4fef6bcfcd75d7d"
 }
 ,{
     "testCaseDescription": "go-struct-types-insert-test",
@@ -284,7 +284,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ced67241c50bd00d4dd7eb1988d435557e85603d..98850420864551c580140cdd1f3e37c9791f9841"
+    "shas": "ed0d138f9f4f77ab9f0ede51c4fef6bcfcd75d7d..188ae7ed6ab0a11db84391e9cd51bb591e0d56de"
 }
 ,{
     "testCaseDescription": "go-struct-types-replacement-test",
@@ -430,7 +430,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "98850420864551c580140cdd1f3e37c9791f9841..1668dd10bb67855dbddac692a5a30f624170ddd9"
+    "shas": "188ae7ed6ab0a11db84391e9cd51bb591e0d56de..8d42c07db2b5509a133e3d45f474994369c1d26f"
 }
 ,{
     "testCaseDescription": "go-struct-types-delete-replacement-test",
@@ -576,7 +576,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1668dd10bb67855dbddac692a5a30f624170ddd9..30e2f7c61bfc661380b328cd575f34a63f128b10"
+    "shas": "8d42c07db2b5509a133e3d45f474994369c1d26f..64b7d7925f84817c7f8ec078a19bd2bf0ce00cff"
 }
 ,{
     "testCaseDescription": "go-struct-types-delete-insert-test",
@@ -822,7 +822,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "30e2f7c61bfc661380b328cd575f34a63f128b10..1f3ec61d5e979cdfb8f5f8c571f967d377b3279d"
+    "shas": "64b7d7925f84817c7f8ec078a19bd2bf0ce00cff..bf13d1b75a8bff0133862445080203c1150ece61"
 }
 ,{
     "testCaseDescription": "go-struct-types-teardown-test",
@@ -864,5 +864,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1f3ec61d5e979cdfb8f5f8c571f967d377b3279d..fbe26e2c64c3de9eb14fdaf1467c4035ff37de23"
+    "shas": "bf13d1b75a8bff0133862445080203c1150ece61..dd5e97a8cc2bbda76dbda960bba5db45fb6604b8"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3470491d4f15b4c823b3bd6fc6f8148e9c47b9fb..c21c7c3ebcd760ecb2842c529833c6de44e4b52c"
+    "shas": "529ea7bffabc5e923508fb53a94813b3d6ff338a..3df3ac088211e0ca5d7fd5834e151eb768c43d28"
 }
 ,{
     "testCaseDescription": "go-switch-statements-insert-test",
@@ -84,7 +84,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c21c7c3ebcd760ecb2842c529833c6de44e4b52c..0edb4991334872f2256e19485ec95ebad6a37639"
+    "shas": "3df3ac088211e0ca5d7fd5834e151eb768c43d28..417f224d586d70c546131cff76acd63e300c6658"
 }
 ,{
     "testCaseDescription": "go-switch-statements-replacement-test",
@@ -279,7 +279,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0edb4991334872f2256e19485ec95ebad6a37639..e9448c9124a1417f9e379fb3c98852f54f7a4016"
+    "shas": "417f224d586d70c546131cff76acd63e300c6658..94a6cb5c98a00304e9b946ad61af27034c848be8"
 }
 ,{
     "testCaseDescription": "go-switch-statements-delete-replacement-test",
@@ -474,7 +474,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e9448c9124a1417f9e379fb3c98852f54f7a4016..8b0d94ccf36624076c1ff0636f604b5803181a44"
+    "shas": "94a6cb5c98a00304e9b946ad61af27034c848be8..e109b3a3bd5a81ab342cb14b65f83f0d970b8ac5"
 }
 ,{
     "testCaseDescription": "go-switch-statements-delete-insert-test",
@@ -520,7 +520,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8b0d94ccf36624076c1ff0636f604b5803181a44..1bd2c902cc9befc21a89201eb1a72d8402c3d605"
+    "shas": "e109b3a3bd5a81ab342cb14b65f83f0d970b8ac5..68c984b0d0289eabeecbbe68b3ace81ca9ecfe56"
 }
 ,{
     "testCaseDescription": "go-switch-statements-teardown-test",
@@ -562,5 +562,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1bd2c902cc9befc21a89201eb1a72d8402c3d605..77d0876cfafcb1655d519c21de8205e99193680e"
+    "shas": "68c984b0d0289eabeecbbe68b3ace81ca9ecfe56..f003b4ee94b95c486909a18ee711abe8fc0139ec"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4e6da70fe034893465e0df27568f4bf7524c3afb..061d8dc1d1ac2d846734c5231a94b231b0b2a3b1"
+    "shas": "5019ab10a0d01229e7306b70f1401b8fcc6498b2..9d9f0801312cee03eb02bceeaa3facaeb5feaf36"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-insert-test",
@@ -81,7 +81,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "061d8dc1d1ac2d846734c5231a94b231b0b2a3b1..ac2eb95416c951ea4496db3c661a20888fe5a867"
+    "shas": "9d9f0801312cee03eb02bceeaa3facaeb5feaf36..c442d94b88951e3eca13829f74f11cb63ab1db0f"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-replacement-test",
@@ -190,7 +190,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ac2eb95416c951ea4496db3c661a20888fe5a867..fe4c07e013f0946bd868b5eff87a4d9fe7cef60f"
+    "shas": "c442d94b88951e3eca13829f74f11cb63ab1db0f..728bace92f91c6179c1702e15678c5754cab8b27"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-replacement-test",
@@ -299,7 +299,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fe4c07e013f0946bd868b5eff87a4d9fe7cef60f..1ca8d3a2018ffff083b6bbc1df0456b75edafa24"
+    "shas": "728bace92f91c6179c1702e15678c5754cab8b27..61818d6d5a5c3c318de9129a5330543cb715f8d1"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-insert-test",
@@ -342,7 +342,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1ca8d3a2018ffff083b6bbc1df0456b75edafa24..6cb13f5e024f3e9d2a80142520291a2a65f12415"
+    "shas": "61818d6d5a5c3c318de9129a5330543cb715f8d1..256c230d684e6b615cfdb7140916024ef4110090"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-teardown-test",
@@ -384,5 +384,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6cb13f5e024f3e9d2a80142520291a2a65f12415..257a9df96d8cb099b1c7939559d79613d2354d7c"
+    "shas": "256c230d684e6b615cfdb7140916024ef4110090..9f20044c255be9c8d37a97c9a811de9bc3055dda"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "257a9df96d8cb099b1c7939559d79613d2354d7c..e7c3c51061a8042f21c8767e30724e4a1a67d571"
+    "shas": "9f20044c255be9c8d37a97c9a811de9bc3055dda..7ce6b036eb41ce5e8ce69cb334e73786fd16b143"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-insert-test",
@@ -129,7 +129,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e7c3c51061a8042f21c8767e30724e4a1a67d571..1064fbd35aa06b6976ab1ae136fe2cdf443aeb19"
+    "shas": "7ce6b036eb41ce5e8ce69cb334e73786fd16b143..c76f2e258659a11f8515f732ddfd97109bf6eef7"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-replacement-test",
@@ -541,7 +541,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1064fbd35aa06b6976ab1ae136fe2cdf443aeb19..f97fe63b4c2d296d18dac2b3a6fe1e884ac2ecec"
+    "shas": "c76f2e258659a11f8515f732ddfd97109bf6eef7..64ea6ded5ef5f729f616f4f3585c581cc9420576"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-delete-replacement-test",
@@ -953,7 +953,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f97fe63b4c2d296d18dac2b3a6fe1e884ac2ecec..bdb7dfa8bbd5bbfe9179223e39619da1459898d0"
+    "shas": "64ea6ded5ef5f729f616f4f3585c581cc9420576..4742e9c5cce26ec6742383269ef6d9133c781730"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-delete-insert-test",
@@ -1044,7 +1044,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bdb7dfa8bbd5bbfe9179223e39619da1459898d0..f52d01330deac8582161a1fe6b32bf58695940a3"
+    "shas": "4742e9c5cce26ec6742383269ef6d9133c781730..1842af7af06b2ae9a793b0545d7f3c63b3afdc3d"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-teardown-test",
@@ -1086,5 +1086,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f52d01330deac8582161a1fe6b32bf58695940a3..363b2bb248653470b9cc0c307192adc431398085"
+    "shas": "1842af7af06b2ae9a793b0545d7f3c63b3afdc3d..8170e2652fce2c4b1c2315efa7d70d5e36401898"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6ac3c2bed5b158c40ccf1f1e9a347a5288538cd0..0b04994ae6b5e6ea149eefed4a2a343ad00f3f37"
+    "shas": "106f4f56822fc7df76a04f0cdd9817338b6bc8af..9f93d049147c6b2782fa57a08337f3239d441e16"
 }
 ,{
     "testCaseDescription": "go-type-declarations-insert-test",
@@ -160,7 +160,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0b04994ae6b5e6ea149eefed4a2a343ad00f3f37..8ffea3eee683867e1b210572a95a2f98442952e3"
+    "shas": "9f93d049147c6b2782fa57a08337f3239d441e16..114bb641518fa790439699d84e92970b0dc96801"
 }
 ,{
     "testCaseDescription": "go-type-declarations-replacement-test",
@@ -221,7 +221,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8ffea3eee683867e1b210572a95a2f98442952e3..08a4c936ce964952ec07857c4483ec15c25684db"
+    "shas": "114bb641518fa790439699d84e92970b0dc96801..43574de2c3852753c3a436b820a7b85d17a28a8e"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-replacement-test",
@@ -282,7 +282,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "08a4c936ce964952ec07857c4483ec15c25684db..18a8a04ba0d3cdbf706e95d81c5c3f2a2e59afe8"
+    "shas": "43574de2c3852753c3a436b820a7b85d17a28a8e..51209c776fca75f1574c9485e98bac8b9cc001a1"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-insert-test",
@@ -404,7 +404,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "18a8a04ba0d3cdbf706e95d81c5c3f2a2e59afe8..9bf517a21aa188ad9dd023c6859933d4d959ff50"
+    "shas": "51209c776fca75f1574c9485e98bac8b9cc001a1..ff94a95e95ca22a378db4573287544725fd46a5c"
 }
 ,{
     "testCaseDescription": "go-type-declarations-teardown-test",
@@ -446,5 +446,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9bf517a21aa188ad9dd023c6859933d4d959ff50..df8fe57456bf893b8ba1700ea704689f7a682fc3"
+    "shas": "ff94a95e95ca22a378db4573287544725fd46a5c..9f67155c979b4c160bebf7a1e203fb63f55c29d6"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "77d0876cfafcb1655d519c21de8205e99193680e..c4aec73f966b63228d8f2c49414e16ab488e27fb"
+    "shas": "f003b4ee94b95c486909a18ee711abe8fc0139ec..371a8117cea98db1577781a4a8ad0898ca7751b0"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-insert-test",
@@ -86,7 +86,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c4aec73f966b63228d8f2c49414e16ab488e27fb..812a794fbd71878f878ec6a54b62a68fd7e7ca29"
+    "shas": "371a8117cea98db1577781a4a8ad0898ca7751b0..b7e7795ffdf1f30a8a25219664a3c774dd1675d7"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-replacement-test",
@@ -143,7 +143,7 @@
         "   case *Dog:"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "812a794fbd71878f878ec6a54b62a68fd7e7ca29..eb3d5903bea34fd2fc8b41215f4b0c5059cb59e8"
+    "shas": "b7e7795ffdf1f30a8a25219664a3c774dd1675d7..ed1fac65789d8d08140faa4093a23def7de3ade1"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-replacement-test",
@@ -200,7 +200,7 @@
         "   case *Dog:"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "eb3d5903bea34fd2fc8b41215f4b0c5059cb59e8..7caab3b1d437c9b7ef711f8a83c2bd6039752483"
+    "shas": "ed1fac65789d8d08140faa4093a23def7de3ade1..bbc32f69ecfc418de76ee80cf9536c0ae4ab5ffa"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-insert-test",
@@ -248,7 +248,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7caab3b1d437c9b7ef711f8a83c2bd6039752483..821c58cbc15bc4f628d27c46274a6b102cd7c38b"
+    "shas": "bbc32f69ecfc418de76ee80cf9536c0ae4ab5ffa..1030136a2da7f6651533cca8490b78837dcf5cc0"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-teardown-test",
@@ -290,5 +290,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "821c58cbc15bc4f628d27c46274a6b102cd7c38b..32835c31a64dadd483252a88dd85928f57ce5e44"
+    "shas": "1030136a2da7f6651533cca8490b78837dcf5cc0..21d9d45a2e97da412a64b92913dbfd3ac82cc701"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "363b2bb248653470b9cc0c307192adc431398085..95aee1d9b409333cf1680a741c64c169fbd351f9"
+    "shas": "8170e2652fce2c4b1c2315efa7d70d5e36401898..56f396b9696a3d3170ade2779bb698bbe15c498e"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-insert-test",
@@ -97,7 +97,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "95aee1d9b409333cf1680a741c64c169fbd351f9..d8ae4c4cce9bb5a478881dc983aa2548d67f27bb"
+    "shas": "56f396b9696a3d3170ade2779bb698bbe15c498e..647f62289c77c044be964bcd038ffc87ac236214"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-replacement-test",
@@ -181,7 +181,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d8ae4c4cce9bb5a478881dc983aa2548d67f27bb..6d40f3560750974211ecead4a61a2e6728cf9c1e"
+    "shas": "647f62289c77c044be964bcd038ffc87ac236214..ec0802784ea344a0aa55567ca4b257e0a0f88d92"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-replacement-test",
@@ -265,7 +265,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6d40f3560750974211ecead4a61a2e6728cf9c1e..0d224ecc0c7584485495aab27202016046198aec"
+    "shas": "ec0802784ea344a0aa55567ca4b257e0a0f88d92..9c0f59e187e2f123821e52a977c180414b11ef2c"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-insert-test",
@@ -324,7 +324,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0d224ecc0c7584485495aab27202016046198aec..2865dc6e88990e04b3d45385a10da88c9e474da1"
+    "shas": "9c0f59e187e2f123821e52a977c180414b11ef2c..df083c473aa2e5bf30818588cf3ccdd86ffbb942"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-teardown-test",
@@ -366,5 +366,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2865dc6e88990e04b3d45385a10da88c9e474da1..a604ef4090da0a6381e77dbbe72ebb13604d5aee"
+    "shas": "df083c473aa2e5bf30818588cf3ccdd86ffbb942..4ea37bb18e38d126d304a9e398aeb3dd0c011565"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "00e135a1a8e4cd0adb7fc184c32c5ed74b72d0cb..9f56348fca24b6f15987f5b872b7d46405bf8b40"
+    "shas": "195796b276a5d1ce1447a0612d2faef27bbe5f3b..58c10b8753c4101213ff9bde50ca36539ced154d"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-insert-test",
@@ -112,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9f56348fca24b6f15987f5b872b7d46405bf8b40..c298363bb8f4eddbe482638ec1e2bdedfe173d63"
+    "shas": "58c10b8753c4101213ff9bde50ca36539ced154d..6e6756d5478776baba8740ce12cb76f624b6f5a7"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-replacement-test",
@@ -223,7 +223,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c298363bb8f4eddbe482638ec1e2bdedfe173d63..bcf6ce676fcbd46c397bc0aec66d7a681e621a94"
+    "shas": "6e6756d5478776baba8740ce12cb76f624b6f5a7..9d70c972e98d88e1964d135ba85d590461a48521"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-replacement-test",
@@ -334,7 +334,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bcf6ce676fcbd46c397bc0aec66d7a681e621a94..f8458d86d30626ae6c51191441458398e92c1e93"
+    "shas": "9d70c972e98d88e1964d135ba85d590461a48521..0056f0b7dce694b6f78bbf2f122faad7a088fbc4"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-insert-test",
@@ -408,7 +408,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f8458d86d30626ae6c51191441458398e92c1e93..875b003933e61d808540edcaa178de2d81414576"
+    "shas": "0056f0b7dce694b6f78bbf2f122faad7a088fbc4..e3393581b4fcd565d4decb08f0c73f6590578c88"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-teardown-test",
@@ -450,5 +450,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "875b003933e61d808540edcaa178de2d81414576..5f7d4d88eae70a1a14e1fad28ebb852095ef2075"
+    "shas": "e3393581b4fcd565d4decb08f0c73f6590578c88..e01b079477b06cf87b8a4196330e5d3dbe64ac09"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bed30a9683438e0aa2083ac7a92925222ab22801..60670066b1d7fc6fac892e6b4e7270b52c0166fe"
+    "shas": "d12ba8dcf866080a9d7603d9a3f98a2b7c827e84..ad7764015a1c05e5c542c8f3d25de3b3b6cd947e"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-insert-test",
@@ -112,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "60670066b1d7fc6fac892e6b4e7270b52c0166fe..254a5a3778a1406e448de15ae9523e0559c0d012"
+    "shas": "ad7764015a1c05e5c542c8f3d25de3b3b6cd947e..97811777e5a4d1570b6bd61592b6c677877a56e5"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-replacement-test",
@@ -223,7 +223,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "254a5a3778a1406e448de15ae9523e0559c0d012..14d56bf384071d086a5071f7098ce67e0b7f9694"
+    "shas": "97811777e5a4d1570b6bd61592b6c677877a56e5..2db4f4427d7ea2451a678f4eb1989faf0aa29b52"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-replacement-test",
@@ -334,7 +334,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "14d56bf384071d086a5071f7098ce67e0b7f9694..610ca0ac9eb1eb33d4208b7781d179dac19b279f"
+    "shas": "2db4f4427d7ea2451a678f4eb1989faf0aa29b52..f974d11faf74d523890917bf6edf655ee9697592"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-insert-test",
@@ -408,7 +408,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "610ca0ac9eb1eb33d4208b7781d179dac19b279f..21c8c3376f9353252578f7981c619af96cf2865d"
+    "shas": "f974d11faf74d523890917bf6edf655ee9697592..ac157171ac9a3cfeca28947a593aec3c1a2a96f1"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-teardown-test",
@@ -450,5 +450,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "21c8c3376f9353252578f7981c619af96cf2865d..00e135a1a8e4cd0adb7fc184c32c5ed74b72d0cb"
+    "shas": "ac157171ac9a3cfeca28947a593aec3c1a2a96f1..195796b276a5d1ce1447a0612d2faef27bbe5f3b"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6b1c44631d5946dc50d15c29ef8ac5719c370cd3..34d9e347e122ccbed6a362abd918d5b5e07d7a2d"
+    "shas": "d51929d0080ebe1b2f1e283e7a623379723ad458..3143199e21bc304aa6153fcd3e94f20ab8cbcd90"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-insert-test",
@@ -81,7 +81,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "34d9e347e122ccbed6a362abd918d5b5e07d7a2d..b7930438fcd43acc887c357817b7104254a0ff4f"
+    "shas": "3143199e21bc304aa6153fcd3e94f20ab8cbcd90..0d97acf121d9568874441c34cdd0b1d3e795e817"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-replacement-test",
@@ -178,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b7930438fcd43acc887c357817b7104254a0ff4f..dad6e69c050c5e8c56b3e6dbaa21b9ff7b4489a8"
+    "shas": "0d97acf121d9568874441c34cdd0b1d3e795e817..5114d9ff397ad117fe5f3b226376ee03064f40b9"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-replacement-test",
@@ -275,7 +275,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "dad6e69c050c5e8c56b3e6dbaa21b9ff7b4489a8..3937891ae4ac38ce32ac02e24541b45a8c5a506e"
+    "shas": "5114d9ff397ad117fe5f3b226376ee03064f40b9..d27d9b0870dd6d6ccb25cb603fa34838d7e388e1"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-insert-test",
@@ -318,7 +318,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3937891ae4ac38ce32ac02e24541b45a8c5a506e..5ea0fce617a687e0455cf405fbe32b6ed3979cb5"
+    "shas": "d27d9b0870dd6d6ccb25cb603fa34838d7e388e1..d14cbaea5fccc3035bd2a6dc05a107a83a9090b7"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-teardown-test",
@@ -360,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5ea0fce617a687e0455cf405fbe32b6ed3979cb5..bed30a9683438e0aa2083ac7a92925222ab22801"
+    "shas": "d14cbaea5fccc3035bd2a6dc05a107a83a9090b7..d12ba8dcf866080a9d7603d9a3f98a2b7c827e84"
 }]

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

@@ -38,7 +38,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "044460a74ea4718fcdbd79197f8fc1a26518989e..8c3eeab240bc574150cf7b86e40657109006160f"
+    "shas": "c440e7136559f8e8bb04e8a9e0900bc29626237c..c5b75783b9383fad0e41d3441fbbbd95f67512de"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-insert-test",
@@ -137,7 +137,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'func f1(a ...*int)' at line 4, column 1 - line 4, column 19 in the main function of the 'main' module"
+                    "summary": "Added 'func f1(a ...*int)' at line 4, column 1 - line 4, column 19 in the main function of the 'main' module"
                 }
             ]
         }
@@ -161,7 +161,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8c3eeab240bc574150cf7b86e40657109006160f..7bcf35ba6e787a76402323ae593cac38ac04319f"
+    "shas": "c5b75783b9383fad0e41d3441fbbbd95f67512de..4320efbb7417c36842a81c89c4f43ce8a84d73d1"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-replacement-test",
@@ -274,7 +274,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7bcf35ba6e787a76402323ae593cac38ac04319f..abe602b0c7157abd2e1cb5ece59b30212e4b11be"
+    "shas": "4320efbb7417c36842a81c89c4f43ce8a84d73d1..a25fd927d8267a65718ad03918dfe1cd8866fb29"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-replacement-test",
@@ -387,7 +387,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "abe602b0c7157abd2e1cb5ece59b30212e4b11be..a2d80a9819d2aa32de8214b58a4f18cb91502e35"
+    "shas": "a25fd927d8267a65718ad03918dfe1cd8866fb29..a7eb9006b444791092b5b8a09d5130f305587fbd"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-insert-test",
@@ -486,7 +486,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'func f1(a ...*int)' at line 4, column 1 - line 4, column 19 in the main function of the 'main' module"
+                    "summary": "Deleted 'func f1(a ...*int)' at line 4, column 1 - line 4, column 19 in the main function of the 'main' module"
                 }
             ]
         }
@@ -510,7 +510,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a2d80a9819d2aa32de8214b58a4f18cb91502e35..7776b619852e27d05eb6003f9537cc710ae8b971"
+    "shas": "a7eb9006b444791092b5b8a09d5130f305587fbd..f3d9093e481d1fa0e27096147e3dc6be43696b26"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-teardown-test",
@@ -552,5 +552,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7776b619852e27d05eb6003f9537cc710ae8b971..fccb257c8f92940c2a2207096f1f4c83b1720e43"
+    "shas": "f3d9093e481d1fa0e27096147e3dc6be43696b26..b076630878d46ba8c71d3e6485d4d3fb02d45f5c"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index e69de29..b592868 100644",
+        "index e69de29b..b5928681 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -0,0 +1 @@",
         "+function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5f4dfa791577127cebc7f5fa8c7d94b7427980f3..2e9eda4d95ac6cbdd16de3ad1464523de63ffb44"
+    "shas": "07a785cb4f0cfa49a60fdfbbce7d8ecbfd2a820b..1ecbe6a443a701cf2b90740825d337914c3b01b8"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index b592868..e1de356 100644",
+        "index b5928681..e1de356c 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2e9eda4d95ac6cbdd16de3ad1464523de63ffb44..d6d789dd70b74b099621405aaab5cbb25e1a47eb"
+    "shas": "1ecbe6a443a701cf2b90740825d337914c3b01b8..1e649afd16b0e9145c760bd152b90dbf2eeb1c79"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-insert-test",
@@ -160,7 +160,7 @@
                                 ],
                                 "end": [
                                     1,
-                                    25
+                                    29
                                 ]
                             },
                             {
@@ -168,33 +168,6 @@
                                     1,
                                     24
                                 ],
-                                "end": [
-                                    1,
-                                    25
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'b' identifier with the 'a' identifier"
-                },
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    28
-                                ],
-                                "end": [
-                                    1,
-                                    29
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    28
-                                ],
                                 "end": [
                                     1,
                                     29
@@ -202,7 +175,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c' identifier with the 'b' identifier"
+                    "summary": "Replaced the 'b * c' math operator with the 'a + b' math operator"
                 }
             ]
         },
@@ -213,7 +186,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index e1de356..4ca0d4c 100644",
+        "index e1de356c..4ca0d4c7 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -1,3 +1,3 @@",
@@ -223,7 +196,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d6d789dd70b74b099621405aaab5cbb25e1a47eb..d40be86ea2ce078c6a426ce0a8c252a71892113a"
+    "shas": "1e649afd16b0e9145c760bd152b90dbf2eeb1c79..7fb344d8f58ce3935df46d0dc70e9f8f1896908f"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-test",
@@ -294,7 +267,7 @@
                                 ],
                                 "end": [
                                     1,
-                                    25
+                                    29
                                 ]
                             },
                             {
@@ -302,33 +275,6 @@
                                     1,
                                     24
                                 ],
-                                "end": [
-                                    1,
-                                    25
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'a' identifier with the 'b' identifier"
-                },
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    28
-                                ],
-                                "end": [
-                                    1,
-                                    29
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    28
-                                ],
                                 "end": [
                                     1,
                                     29
@@ -336,7 +282,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'c' identifier"
+                    "summary": "Replaced the 'a + b' math operator with the 'b * c' math operator"
                 }
             ]
         },
@@ -347,7 +293,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index 4ca0d4c..e1de356 100644",
+        "index 4ca0d4c7..e1de356c 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -1,3 +1,3 @@",
@@ -357,7 +303,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d40be86ea2ce078c6a426ce0a8c252a71892113a..fbe8b2947cb17ec793516f3368dd2f787bccfe66"
+    "shas": "7fb344d8f58ce3935df46d0dc70e9f8f1896908f..6d835d52398bfc6715ef4c40d2706dd8c11cb83a"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-replacement-test",
@@ -418,7 +364,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index e1de356..afdaccf 100644",
+        "index e1de356c..afdaccf7 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -1,3 +1,2 @@",
@@ -428,7 +374,7 @@
         "+function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fbe8b2947cb17ec793516f3368dd2f787bccfe66..260e74caf2632a2de525e1341d76ed31cc8cf2bf"
+    "shas": "6d835d52398bfc6715ef4c40d2706dd8c11cb83a..fa0cd2354feb5199209c9aa13525567951185c88"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-test",
@@ -459,7 +405,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index afdaccf..9f1856f 100644",
+        "index afdaccf7..9f1856f5 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -1,2 +1 @@",
@@ -467,7 +413,7 @@
         " function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "260e74caf2632a2de525e1341d76ed31cc8cf2bf..f425fbe0cbbd72279ea1a69e34baa8e341700a09"
+    "shas": "fa0cd2354feb5199209c9aa13525567951185c88..a93d062ea69a6600b3f795d769e2557042925d66"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-rest-test",
@@ -498,12 +444,12 @@
     ],
     "patch": [
         "diff --git a/anonymous-function.js b/anonymous-function.js",
-        "index 9f1856f..e69de29 100644",
+        "index 9f1856f5..e69de29b 100644",
         "--- a/anonymous-function.js",
         "+++ b/anonymous-function.js",
         "@@ -1 +0,0 @@",
         "-function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f425fbe0cbbd72279ea1a69e34baa8e341700a09..2a5f85a471c9c83f2e835139afa5eb7bfecd546a"
+    "shas": "a93d062ea69a6600b3f795d769e2557042925d66..80946fe6667b3843c0bd704136ac929ca5f2e3e0"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index e69de29..7280a98 100644",
+        "index e69de29b..7280a98c 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -0,0 +1 @@",
         "+i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "69248e3fdb3e6ab7da864ef7bd3a915aeefd3cc4..697a361cfb8bcfd14631209deb6159679d166115"
+    "shas": "dcb8509973be89c9c4f7239f90bc27b29abe6886..7278cbb3e1324846d217ed8b5d96d30b1d23c9e1"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index 7280a98..fe3f306 100644",
+        "index 7280a98c..fe3f3064 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -1 +1,3 @@",
@@ -89,12 +89,42 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "697a361cfb8bcfd14631209deb6159679d166115..2829490ad0cdc2f954145a2698444d5daf1da199"
+    "shas": "7278cbb3e1324846d217ed8b5d96d30b1d23c9e1..dcbb69024b9472b7573c1284b9f2a9ba3c0bf241"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-insert-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "boolean-operator.js": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'i && j' boolean operator with the 'i || j' boolean operator"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -102,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index fe3f306..273c0ee 100644",
+        "index fe3f3064..273c0ee8 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -112,12 +142,42 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2829490ad0cdc2f954145a2698444d5daf1da199..8a66944201f7ad0fc2ee8fcdcaff607125c8cc0f"
+    "shas": "dcbb69024b9472b7573c1284b9f2a9ba3c0bf241..1d4a46d71e3418079b81f3b494ead0ddec0770ef"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "boolean-operator.js": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'i || j' boolean operator with the 'i && j' boolean operator"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -125,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index 273c0ee..fe3f306 100644",
+        "index 273c0ee8..fe3f3064 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -135,7 +195,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8a66944201f7ad0fc2ee8fcdcaff607125c8cc0f..0658cb117a6a6719f8464948c86e3e278d8c2a95"
+    "shas": "1d4a46d71e3418079b81f3b494ead0ddec0770ef..59bf7426522f2e5a40fd2fbd5e9adc595c4a6f26"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-replacement-test",
@@ -156,6 +216,36 @@
                         }
                     },
                     "summary": "Deleted the 'i && j' boolean operator"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'i || j' boolean operator"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'i && j' boolean operator"
                 }
             ]
         },
@@ -166,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index fe3f306..7f4873c 100644",
+        "index fe3f3064..7f4873c1 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -1,3 +1,2 @@",
@@ -176,7 +266,7 @@
         "+i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0658cb117a6a6719f8464948c86e3e278d8c2a95..35f6d8f480c9f8645a3c0d8f9fa5339059a6380a"
+    "shas": "59bf7426522f2e5a40fd2fbd5e9adc595c4a6f26..2aff614351987457ce3a0ce900610cf622e1765e"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-test",
@@ -207,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index 7f4873c..c6921d1 100644",
+        "index 7f4873c1..c6921d12 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -1,2 +1 @@",
@@ -215,7 +305,7 @@
         " i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "35f6d8f480c9f8645a3c0d8f9fa5339059a6380a..2b07585de8be3e4334361368f2dc465278842434"
+    "shas": "2aff614351987457ce3a0ce900610cf622e1765e..df4a601cd0eea4d8db63a7f7097753ae9fbd9f4b"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-rest-test",
@@ -246,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/boolean-operator.js b/boolean-operator.js",
-        "index c6921d1..e69de29 100644",
+        "index c6921d12..e69de29b 100644",
         "--- a/boolean-operator.js",
         "+++ b/boolean-operator.js",
         "@@ -1 +0,0 @@",
         "-i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2b07585de8be3e4334361368f2dc465278842434..5edf134e2ccb0fa1cd27b2e07b4279575f1a5f0d"
+    "shas": "df4a601cd0eea4d8db63a7f7097753ae9fbd9f4b..1d234a84ee270c0d6a329fcdcbc065e50bed813b"
 }]

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

@@ -0,0 +1,292 @@
+[{
+    "testCaseDescription": "javascript-break-setup-test",
+    "expectedResult": {
+        "changes": {
+            "break.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                50
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'i = 0; i < 10; i++' for statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "break.js"
+    ],
+    "patch": [
+        "diff --git a/break.js b/break.js",
+        "index e69de29b..3f583e3d 100644",
+        "--- a/break.js",
+        "+++ b/break.js",
+        "@@ -0,0 +1 @@",
+        "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "0e81c586bea55e0eeb46e3422b25ccba96c7d9ea..d86036d38621253021f5fde6256a16a5d58ffd49"
+}
+,{
+    "testCaseDescription": "javascript-break-insert-test",
+    "expectedResult": {
+        "changes": {
+            "break.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                49
+                            ]
+                        }
+                    },
+                    "summary": "Added a break statement in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                41
+                            ],
+                            "end": [
+                                1,
+                                45
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the '{  }' object in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "break.js"
+    ],
+    "patch": [
+        "diff --git a/break.js b/break.js",
+        "index 3f583e3d..629dfa91 100644",
+        "--- a/break.js",
+        "+++ b/break.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "d86036d38621253021f5fde6256a16a5d58ffd49..c2a0cadf8477ba2c7525fba7c37923afd994ad15"
+}
+,{
+    "testCaseDescription": "javascript-break-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "break.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                52
+                            ]
+                        }
+                    },
+                    "summary": "Added a continue statement in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                49
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a break statement in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "break.js"
+    ],
+    "patch": [
+        "diff --git a/break.js b/break.js",
+        "index 629dfa91..16ebcc57 100644",
+        "--- a/break.js",
+        "+++ b/break.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "c2a0cadf8477ba2c7525fba7c37923afd994ad15..3bcd48f5d5894250de6349c4ca5272b3ae92fa6d"
+}
+,{
+    "testCaseDescription": "javascript-break-delete-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "break.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                49
+                            ]
+                        }
+                    },
+                    "summary": "Added a break statement in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                52
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a continue statement in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "break.js"
+    ],
+    "patch": [
+        "diff --git a/break.js b/break.js",
+        "index 16ebcc57..629dfa91 100644",
+        "--- a/break.js",
+        "+++ b/break.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "3bcd48f5d5894250de6349c4ca5272b3ae92fa6d..bbabc7d7ad65f9ab05f74f83c6e5777a3eeb4be2"
+}
+,{
+    "testCaseDescription": "javascript-break-delete-insert-test",
+    "expectedResult": {
+        "changes": {
+            "break.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                41
+                            ],
+                            "end": [
+                                1,
+                                45
+                            ]
+                        }
+                    },
+                    "summary": "Added the '{  }' object in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                49
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a break statement in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "break.js"
+    ],
+    "patch": [
+        "diff --git a/break.js b/break.js",
+        "index 629dfa91..3f583e3d 100644",
+        "--- a/break.js",
+        "+++ b/break.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "bbabc7d7ad65f9ab05f74f83c6e5777a3eeb4be2..016996f57081dda9f5b4ebdd801853944017b617"
+}
+,{
+    "testCaseDescription": "javascript-break-teardown-test",
+    "expectedResult": {
+        "changes": {
+            "break.js": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                50
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'i = 0; i < 10; i++' for statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "break.js"
+    ],
+    "patch": [
+        "diff --git a/break.js b/break.js",
+        "index 3f583e3d..e69de29b 100644",
+        "--- a/break.js",
+        "+++ b/break.js",
+        "@@ -1 +0,0 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "016996f57081dda9f5b4ebdd801853944017b617..7b31459c5a9378f4fe26f4e3e6d5c1fd3b6aee23"
+}]

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

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Added the 'returned.promise().done( newDefer.resolve ).fail( newDefer.reject )' return statement"
                 }
             ]
         },
@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index e69de29..5914a55 100644",
+        "index e69de29b..5914a55c 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",
-    "shas": "71feda9fd80ab60adab5cf81748710b2a610173f..02c42e637780aeb5874c5f740ba764a0b606d950"
+    "shas": "b4a1b602905b005b1bfe48d8f78faebd8c9cf016..e4dd7ea96606956464809e9a3bcfdb81f318c39b"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-insert-test",
@@ -54,7 +54,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Added the 'returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )' return statement"
                 },
                 {
                     "span": {
@@ -69,7 +69,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Added the 'returned.promise().done( newDefer.resolve ).fail( newDefer.reject )' return statement"
                 }
             ]
         },
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index 5914a55..7095976 100644",
+        "index 5914a55c..70959766 100644",
         "--- a/chained-property-access.js",
         "+++ b/chained-property-access.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "02c42e637780aeb5874c5f740ba764a0b606d950..eb64ebf3bc9351da0d4cbb59cdfc44d7152b090e"
+    "shas": "e4dd7ea96606956464809e9a3bcfdb81f318c39b..6365577e012aa898ba1d2cc77d10eec1fb9a016d"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-insert-test",
@@ -159,7 +159,7 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index 7095976..98df938 100644",
+        "index 70959766..98df938b 100644",
         "--- a/chained-property-access.js",
         "+++ b/chained-property-access.js",
         "@@ -1,3 +1,3 @@",
@@ -169,7 +169,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "eb64ebf3bc9351da0d4cbb59cdfc44d7152b090e..d87ef7df3e23f3b4837c9dd09aeca869774aa731"
+    "shas": "6365577e012aa898ba1d2cc77d10eec1fb9a016d..8ab9cd6c506847581b2fc7f04124803cd344b3ff"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-test",
@@ -239,7 +239,7 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index 98df938..7095976 100644",
+        "index 98df938b..70959766 100644",
         "--- a/chained-property-access.js",
         "+++ b/chained-property-access.js",
         "@@ -1,3 +1,3 @@",
@@ -249,7 +249,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d87ef7df3e23f3b4837c9dd09aeca869774aa731..2e00036e857c5aa6af0eb4ab23bd4cbb28bd90a2"
+    "shas": "8ab9cd6c506847581b2fc7f04124803cd344b3ff..d535074522aa956a8ea7e8d943227d9d78775725"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-replacement-test",
@@ -269,7 +269,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Deleted the 'returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )' return statement"
                 },
                 {
                     "span": {
@@ -284,7 +284,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Deleted the 'returned.promise().done( newDefer.resolve ).fail( newDefer.reject )' return statement"
                 },
                 {
                     "span": {
@@ -299,7 +299,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Added the 'returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )' return statement"
                 }
             ]
         },
@@ -310,7 +310,7 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index 7095976..7b764ca 100644",
+        "index 70959766..7b764ca9 100644",
         "--- a/chained-property-access.js",
         "+++ b/chained-property-access.js",
         "@@ -1,3 +1,2 @@",
@@ -320,7 +320,7 @@
         "+return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2e00036e857c5aa6af0eb4ab23bd4cbb28bd90a2..5eb335f13f0dea85c75b4d5f174832b08af8a0e6"
+    "shas": "d535074522aa956a8ea7e8d943227d9d78775725..b3f90f50ba0ea4d42e78ba37c176a4d69282fcd7"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-test",
@@ -340,7 +340,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Deleted the 'returned.promise().done( newDefer.resolve ).fail( newDefer.reject )' return statement"
                 }
             ]
         },
@@ -351,7 +351,7 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index 7b764ca..5d6d3a0 100644",
+        "index 7b764ca9..5d6d3a02 100644",
         "--- a/chained-property-access.js",
         "+++ b/chained-property-access.js",
         "@@ -1,2 +1 @@",
@@ -359,7 +359,7 @@
         " return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5eb335f13f0dea85c75b4d5f174832b08af8a0e6..054acb661f91e8a5b9096d552c5b3410bacc4811"
+    "shas": "b3f90f50ba0ea4d42e78ba37c176a4d69282fcd7..6dd90e85a905d3c205cd42bcbedaa3d50110d426"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-rest-test",
@@ -379,7 +379,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'returned.promise().done(…).fail(…)' return statement"
+                    "summary": "Deleted the 'returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )' return statement"
                 }
             ]
         },
@@ -390,12 +390,12 @@
     ],
     "patch": [
         "diff --git a/chained-property-access.js b/chained-property-access.js",
-        "index 5d6d3a0..e69de29 100644",
+        "index 5d6d3a02..e69de29b 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",
-    "shas": "054acb661f91e8a5b9096d552c5b3410bacc4811..1512ae1cef2a096ce2723ce98334e4ce0e4bc82b"
+    "shas": "6dd90e85a905d3c205cd42bcbedaa3d50110d426..7b26c97829302e6f2c2fc76d9a1e5dc25caf58d9"
 }]

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

@@ -0,0 +1,292 @@
+[{
+    "testCaseDescription": "javascript-continue-setup-test",
+    "expectedResult": {
+        "changes": {
+            "continue.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                50
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'i = 0; i < 10; i++' for statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "continue.js"
+    ],
+    "patch": [
+        "diff --git a/continue.js b/continue.js",
+        "index e69de29b..3f583e3d 100644",
+        "--- a/continue.js",
+        "+++ b/continue.js",
+        "@@ -0,0 +1 @@",
+        "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "7b31459c5a9378f4fe26f4e3e6d5c1fd3b6aee23..6f1f37c267e2d029c289f0fbcf27091ba3d1dec0"
+}
+,{
+    "testCaseDescription": "javascript-continue-insert-test",
+    "expectedResult": {
+        "changes": {
+            "continue.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                52
+                            ]
+                        }
+                    },
+                    "summary": "Added a continue statement in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                41
+                            ],
+                            "end": [
+                                1,
+                                45
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the '{  }' object in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "continue.js"
+    ],
+    "patch": [
+        "diff --git a/continue.js b/continue.js",
+        "index 3f583e3d..16ebcc57 100644",
+        "--- a/continue.js",
+        "+++ b/continue.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "6f1f37c267e2d029c289f0fbcf27091ba3d1dec0..b23c299b2611ac212c2f335a44e9ffcfbe821ed4"
+}
+,{
+    "testCaseDescription": "javascript-continue-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "continue.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                49
+                            ]
+                        }
+                    },
+                    "summary": "Added a break statement in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                52
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a continue statement in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "continue.js"
+    ],
+    "patch": [
+        "diff --git a/continue.js b/continue.js",
+        "index 16ebcc57..629dfa91 100644",
+        "--- a/continue.js",
+        "+++ b/continue.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "b23c299b2611ac212c2f335a44e9ffcfbe821ed4..59f5084383702801c670c2d9738a4d78c93a0b0a"
+}
+,{
+    "testCaseDescription": "javascript-continue-delete-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "continue.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                52
+                            ]
+                        }
+                    },
+                    "summary": "Added a continue statement in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                49
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a break statement in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "continue.js"
+    ],
+    "patch": [
+        "diff --git a/continue.js b/continue.js",
+        "index 629dfa91..16ebcc57 100644",
+        "--- a/continue.js",
+        "+++ b/continue.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "59f5084383702801c670c2d9738a4d78c93a0b0a..ac045f406aaa05c9c85d6a20e527e2e62e99ce2c"
+}
+,{
+    "testCaseDescription": "javascript-continue-delete-insert-test",
+    "expectedResult": {
+        "changes": {
+            "continue.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                41
+                            ],
+                            "end": [
+                                1,
+                                45
+                            ]
+                        }
+                    },
+                    "summary": "Added the '{  }' object in the 'i === 4' if statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                43
+                            ],
+                            "end": [
+                                1,
+                                52
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a continue statement in the 'i === 4' if statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "continue.js"
+    ],
+    "patch": [
+        "diff --git a/continue.js b/continue.js",
+        "index 16ebcc57..3f583e3d 100644",
+        "--- a/continue.js",
+        "+++ b/continue.js",
+        "@@ -1 +1 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }",
+        "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "ac045f406aaa05c9c85d6a20e527e2e62e99ce2c..0c96f2e07ccf5ac404d4301a1a1e5ca9aa19b0b3"
+}
+,{
+    "testCaseDescription": "javascript-continue-teardown-test",
+    "expectedResult": {
+        "changes": {
+            "continue.js": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                50
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'i = 0; i < 10; i++' for statement"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "continue.js"
+    ],
+    "patch": [
+        "diff --git a/continue.js b/continue.js",
+        "index 3f583e3d..e69de29b 100644",
+        "--- a/continue.js",
+        "+++ b/continue.js",
+        "@@ -1 +0,0 @@",
+        "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "0c96f2e07ccf5ac404d4301a1a1e5ca9aa19b0b3..b4a1b602905b005b1bfe48d8f78faebd8c9cf016"
+}]

test/corpus/diff-summaries/javascript/objects-with-methods.json

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index e69de29..7421e18 100644",
+        "index e69de29b..7421e188 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -0,0 +1 @@",
         "+{ add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e66b1b20abc596d2b560eaa80f1749c79816f9ff..d3b8c609f29da1978a60c14da5d0ca5dfc565eff"
+    "shas": "5fe71a17cc99387501792a564bc50da57decd600..4851c63010b9106484a5f927916b5649e8e51dbd"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index 7421e18..59eb3a3 100644",
+        "index 7421e188..59eb3a3d 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " { add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d3b8c609f29da1978a60c14da5d0ca5dfc565eff..71f9fe548526a54588efe8ccf43fb16946dde439"
+    "shas": "4851c63010b9106484a5f927916b5649e8e51dbd..ff8a20b8f6098bb77aecc7af4cd21794488b4cda"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-insert-test",
@@ -122,6 +122,33 @@
                         ]
                     },
                     "summary": "Replaced the 'subtract' identifier with the 'add' identifier in the 'add(a, b)' method"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    27
+                                ],
+                                "end": [
+                                    1,
+                                    32
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    22
+                                ],
+                                "end": [
+                                    1,
+                                    27
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a - b' math operator with the 'a + b' math operator in the 'add(a, b)' method"
                 }
             ]
         },
@@ -132,7 +159,7 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index 59eb3a3..05689b1 100644",
+        "index 59eb3a3d..05689b17 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +169,7 @@
         " { add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "71f9fe548526a54588efe8ccf43fb16946dde439..3651aee8e277793117960f9223391b0cfdb1f814"
+    "shas": "ff8a20b8f6098bb77aecc7af4cd21794488b4cda..0eb6d26bdbee9a47efa74182c2dfb9fa3c677c0c"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-replacement-test",
@@ -175,6 +202,33 @@
                         ]
                     },
                     "summary": "Replaced the 'add' identifier with the 'subtract' identifier in the 'subtract(a, b)' method"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    22
+                                ],
+                                "end": [
+                                    1,
+                                    27
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    27
+                                ],
+                                "end": [
+                                    1,
+                                    32
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a + b' math operator with the 'a - b' math operator in the 'subtract(a, b)' method"
                 }
             ]
         },
@@ -185,7 +239,7 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index 05689b1..59eb3a3 100644",
+        "index 05689b17..59eb3a3d 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +249,7 @@
         " { add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3651aee8e277793117960f9223391b0cfdb1f814..af0586db52b5b97c1c819ee5e107835fa2299249"
+    "shas": "0eb6d26bdbee9a47efa74182c2dfb9fa3c677c0c..d799c888cbd8b3a2c5fd918488bfdced8c37e3b4"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-replacement-test",
@@ -256,7 +310,7 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index 59eb3a3..29d3998 100644",
+        "index 59eb3a3d..29d39987 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +320,7 @@
         "+{ subtract(a, b) { return a - b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "af0586db52b5b97c1c819ee5e107835fa2299249..a1ef0cba5455912ff148f7bf8afbc74061d8de10"
+    "shas": "d799c888cbd8b3a2c5fd918488bfdced8c37e3b4..95338f9afb1060c14d4181bf7fd428d43a7b9f04"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-test",
@@ -297,7 +351,7 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index 29d3998..80ad7f0 100644",
+        "index 29d39987..80ad7f08 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +359,7 @@
         " { subtract(a, b) { return a - b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a1ef0cba5455912ff148f7bf8afbc74061d8de10..896cd9fdc71791d876ea5108de8b34631f284c5a"
+    "shas": "95338f9afb1060c14d4181bf7fd428d43a7b9f04..cc541912a1dea8dbd3e1f25ec14c9de7bc3ecb06"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-rest-test",
@@ -336,12 +390,12 @@
     ],
     "patch": [
         "diff --git a/objects-with-methods.js b/objects-with-methods.js",
-        "index 80ad7f0..e69de29 100644",
+        "index 80ad7f08..e69de29b 100644",
         "--- a/objects-with-methods.js",
         "+++ b/objects-with-methods.js",
         "@@ -1 +0,0 @@",
         "-{ subtract(a, b) { return a - b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "896cd9fdc71791d876ea5108de8b34631f284c5a..c1ec2fd690eae01418882f3dbba8b6a5c0c3c2eb"
+    "shas": "cc541912a1dea8dbd3e1f25ec14c9de7bc3ecb06..07a785cb4f0cfa49a60fdfbbce7d8ecbfd2a820b"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index e69de29..4021910 100644",
+        "index e69de29b..4021910f 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -0,0 +1 @@",
         "+x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4e47562dd59646a6c6c55ab138660495394bc5c9..58bdba5f1c185ad7ae6f4275533f799aa25e9020"
+    "shas": "1d234a84ee270c0d6a329fcdcbc065e50bed813b..f7081b58f603918674558efe269d8dbd1ffc0835"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index 4021910..dbef050 100644",
+        "index 4021910f..dbef0501 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -1 +1,3 @@",
@@ -89,12 +89,42 @@
         " x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "58bdba5f1c185ad7ae6f4275533f799aa25e9020..440204afe68655c97580bc91b578d9f4a0475c6c"
+    "shas": "f7081b58f603918674558efe269d8dbd1ffc0835..57f5399d4cf2022a779be84e5e9ffe8f15beca07"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-insert-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "relational-operator.js": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    6
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'x <= y' relational operator with the 'x < y' relational operator"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -102,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index dbef050..a9ff7f6 100644",
+        "index dbef0501..a9ff7f65 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -112,12 +142,42 @@
         " x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "440204afe68655c97580bc91b578d9f4a0475c6c..903fdf57bcf14cae9e043c4fbafb911715076dda"
+    "shas": "57f5399d4cf2022a779be84e5e9ffe8f15beca07..3161974cca9b971b21e69bbe11c32ece0e43e408"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "relational-operator.js": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    6
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'x < y' relational operator with the 'x <= y' relational operator"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -125,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index a9ff7f6..dbef050 100644",
+        "index a9ff7f65..dbef0501 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -135,7 +195,7 @@
         " x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "903fdf57bcf14cae9e043c4fbafb911715076dda..f6f1aab236022d2804b6bff6a9d5980814a5bdf1"
+    "shas": "3161974cca9b971b21e69bbe11c32ece0e43e408..b7a5454b7132955133e3749565ef37567cfa2d5e"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-replacement-test",
@@ -156,6 +216,36 @@
                         }
                     },
                     "summary": "Deleted the 'x <= y' relational operator"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x < y' relational operator"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x <= y' relational operator"
                 }
             ]
         },
@@ -166,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index dbef050..1ee42eb 100644",
+        "index dbef0501..1ee42eb9 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -1,3 +1,2 @@",
@@ -176,7 +266,7 @@
         "+x <= y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f6f1aab236022d2804b6bff6a9d5980814a5bdf1..55e87f9b00be4efdd35b68a61ac0c00bd6adc835"
+    "shas": "b7a5454b7132955133e3749565ef37567cfa2d5e..c40fd681cdd3b75acaf0826df149b0e9c13ceb4f"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-test",
@@ -207,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index 1ee42eb..3be8450 100644",
+        "index 1ee42eb9..3be8450f 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -1,2 +1 @@",
@@ -215,7 +305,7 @@
         " x <= y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "55e87f9b00be4efdd35b68a61ac0c00bd6adc835..436b0dd39bce7222b6173e02af06a76e64862bd3"
+    "shas": "c40fd681cdd3b75acaf0826df149b0e9c13ceb4f..7e0cd5e7ebf2702d445a75bb632353547258d65b"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-rest-test",
@@ -246,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/relational-operator.js b/relational-operator.js",
-        "index 3be8450..e69de29 100644",
+        "index 3be8450f..e69de29b 100644",
         "--- a/relational-operator.js",
         "+++ b/relational-operator.js",
         "@@ -1 +0,0 @@",
         "-x <= y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "436b0dd39bce7222b6173e02af06a76e64862bd3..eaeb10729b105d290f4091fea5f04c34030bb5a5"
+    "shas": "7e0cd5e7ebf2702d445a75bb632353547258d65b..8a27197df5dd32970d666dec2ed87840381ee268"
 }]

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

@@ -54,7 +54,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'empty' return statement"
+                    "summary": "Added a return statement"
                 },
                 {
                     "span": {
@@ -191,7 +191,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'empty' return statement"
+                    "summary": "Deleted a return statement"
                 },
                 {
                     "span": {
@@ -221,7 +221,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'empty' return statement"
+                    "summary": "Added a return statement"
                 }
             ]
         },
@@ -301,7 +301,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'empty' return statement"
+                    "summary": "Deleted a return statement"
                 }
             ]
         },

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

@@ -148,7 +148,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2' with '1' in the '2' case statement"
+                    "summary": "Replaced '2' with '1' in the '1' switch statement"
                 }
             ]
         },
@@ -228,7 +228,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '2' in the '2' case statement"
+                    "summary": "Replaced '1' with '2' in the '2' switch statement"
                 }
             ]
         },

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index e69de29..08d2bf5 100644",
+        "index e69de29b..08d2bf54 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -0,0 +1 @@",
         "+typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "38dbecd6735244d4c2c50c6608e64fd7df72b900..408a6dcf89d854252ec12de52f008a2a88793ade"
+    "shas": "8a27197df5dd32970d666dec2ed87840381ee268..022b10ca6587ce508c5c19c8b4ce3eda620bb06d"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index 08d2bf5..8b9c2f4 100644",
+        "index 08d2bf54..8b9c2f4a 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "408a6dcf89d854252ec12de52f008a2a88793ade..50475853b794903dd58705a2648d465fa42db1c1"
+    "shas": "022b10ca6587ce508c5c19c8b4ce3eda620bb06d..5d3e102e26668c0582da052a846ae6b4965f80dc"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-insert-test",
@@ -98,18 +98,30 @@
             "type-operator.js": [
                 {
                     "span": {
-                        "delete": {
-                            "start": [
-                                1,
-                                14
-                            ],
-                            "end": [
-                                1,
-                                20
-                            ]
-                        }
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    20
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    9
+                                ]
+                            }
+                        ]
                     },
-                    "summary": "Deleted the 'String' identifier"
+                    "summary": "Replaced the 'x instanceof String' operator with the 'typeof x' operator"
                 }
             ]
         },
@@ -120,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index 8b9c2f4..6a5be18 100644",
+        "index 8b9c2f4a..6a5be18c 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -130,7 +142,7 @@
         " typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "50475853b794903dd58705a2648d465fa42db1c1..033d2812882757f8235cbbc27a1059188d125636"
+    "shas": "5d3e102e26668c0582da052a846ae6b4965f80dc..80ee88adb73c66f5d7f8e7ad2d462ba95656a35f"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-replacement-test",
@@ -139,18 +151,30 @@
             "type-operator.js": [
                 {
                     "span": {
-                        "insert": {
-                            "start": [
-                                1,
-                                14
-                            ],
-                            "end": [
-                                1,
-                                20
-                            ]
-                        }
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    9
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    20
+                                ]
+                            }
+                        ]
                     },
-                    "summary": "Added the 'String' identifier"
+                    "summary": "Replaced the 'typeof x' operator with the 'x instanceof String' operator"
                 }
             ]
         },
@@ -161,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index 6a5be18..8b9c2f4 100644",
+        "index 6a5be18c..8b9c2f4a 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -171,7 +195,7 @@
         " typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "033d2812882757f8235cbbc27a1059188d125636..a6dcc28c9ae5225546c6829efd0ff16e42357fa3"
+    "shas": "80ee88adb73c66f5d7f8e7ad2d462ba95656a35f..7dba6ba536a93671b81505e98ffc137d51714936"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-replacement-test",
@@ -232,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index 8b9c2f4..d438f9f 100644",
+        "index 8b9c2f4a..d438f9f3 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -1,3 +1,2 @@",
@@ -242,7 +266,7 @@
         "+x instanceof String;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a6dcc28c9ae5225546c6829efd0ff16e42357fa3..bb1b06901faca6abda996edbee1901289e63abde"
+    "shas": "7dba6ba536a93671b81505e98ffc137d51714936..9426a9f8c4206d41610d24729659aabd8bb92f4d"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-test",
@@ -273,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index d438f9f..0bf5275 100644",
+        "index d438f9f3..0bf52754 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -1,2 +1 @@",
@@ -281,7 +305,7 @@
         " x instanceof String;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "bb1b06901faca6abda996edbee1901289e63abde..bc73ac8dfd8a42fc942bd8dac8012ef2e3a217da"
+    "shas": "9426a9f8c4206d41610d24729659aabd8bb92f4d..4dea2afbe25572aee977123753ff00348123b34d"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-rest-test",
@@ -312,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/type-operator.js b/type-operator.js",
-        "index 0bf5275..e69de29 100644",
+        "index 0bf52754..e69de29b 100644",
         "--- a/type-operator.js",
         "+++ b/type-operator.js",
         "@@ -1 +0,0 @@",
         "-x instanceof String;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "bc73ac8dfd8a42fc942bd8dac8012ef2e3a217da..b5645de0a9c0002d8f44d302c200dd88ff113f52"
+    "shas": "4dea2afbe25572aee977123753ff00348123b34d..5fe71a17cc99387501792a564bc50da57decd600"
 }]

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

@@ -0,0 +1,256 @@
+[{
+    "testCaseDescription": "javascript-yield-setup-test",
+    "expectedResult": {
+        "changes": {
+            "yield.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                35
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'foo' function"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "yield.js"
+    ],
+    "patch": [
+        "diff --git a/yield.js b/yield.js",
+        "index e69de29b..e01b17c7 100644",
+        "--- a/yield.js",
+        "+++ b/yield.js",
+        "@@ -0,0 +1 @@",
+        "+function* foo(){ var index = 0;  }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "5c6bdce8f72c2d775feff2e1e2bafd6639ec3092..af359d80f0450c0c2196373f3a6135ad69d15448"
+}
+,{
+    "testCaseDescription": "javascript-yield-insert-test",
+    "expectedResult": {
+        "changes": {
+            "yield.js": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                33
+                            ],
+                            "end": [
+                                1,
+                                41
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'i' yield statement in the foo function"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "yield.js"
+    ],
+    "patch": [
+        "diff --git a/yield.js b/yield.js",
+        "index e01b17c7..e2088166 100644",
+        "--- a/yield.js",
+        "+++ b/yield.js",
+        "@@ -1 +1 @@",
+        "-function* foo(){ var index = 0;  }",
+        "+function* foo(){ var index = 0; yield i; }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "af359d80f0450c0c2196373f3a6135ad69d15448..994d3630d7493bcd3de8987ef154ab8791944584"
+}
+,{
+    "testCaseDescription": "javascript-yield-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "yield.js": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    33
+                                ],
+                                "end": [
+                                    1,
+                                    41
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    33
+                                ],
+                                "end": [
+                                    1,
+                                    43
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'i' yield statement with the 'i++' yield statement in the foo function"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "yield.js"
+    ],
+    "patch": [
+        "diff --git a/yield.js b/yield.js",
+        "index e2088166..78ab2efe 100644",
+        "--- a/yield.js",
+        "+++ b/yield.js",
+        "@@ -1 +1 @@",
+        "-function* foo(){ var index = 0; yield i; }",
+        "+function* foo(){ var index = 0; yield i++; }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "994d3630d7493bcd3de8987ef154ab8791944584..04b9b20aaf2b5f555b5223dfba6c303f01450f5e"
+}
+,{
+    "testCaseDescription": "javascript-yield-delete-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "yield.js": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    33
+                                ],
+                                "end": [
+                                    1,
+                                    43
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    33
+                                ],
+                                "end": [
+                                    1,
+                                    41
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'i++' yield statement with the 'i' yield statement in the foo function"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "yield.js"
+    ],
+    "patch": [
+        "diff --git a/yield.js b/yield.js",
+        "index 78ab2efe..e2088166 100644",
+        "--- a/yield.js",
+        "+++ b/yield.js",
+        "@@ -1 +1 @@",
+        "-function* foo(){ var index = 0; yield i++; }",
+        "+function* foo(){ var index = 0; yield i; }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "04b9b20aaf2b5f555b5223dfba6c303f01450f5e..0f042b1a2b628149d5fe3d38ac22ddb0b1e1fd4a"
+}
+,{
+    "testCaseDescription": "javascript-yield-delete-insert-test",
+    "expectedResult": {
+        "changes": {
+            "yield.js": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                33
+                            ],
+                            "end": [
+                                1,
+                                41
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'i' yield statement in the foo function"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "yield.js"
+    ],
+    "patch": [
+        "diff --git a/yield.js b/yield.js",
+        "index e2088166..e01b17c7 100644",
+        "--- a/yield.js",
+        "+++ b/yield.js",
+        "@@ -1 +1 @@",
+        "-function* foo(){ var index = 0; yield i; }",
+        "+function* foo(){ var index = 0;  }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "0f042b1a2b628149d5fe3d38ac22ddb0b1e1fd4a..2bb888580d4105d265e9137474d813ab92ce6359"
+}
+,{
+    "testCaseDescription": "javascript-yield-teardown-test",
+    "expectedResult": {
+        "changes": {
+            "yield.js": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                35
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'foo' function"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "yield.js"
+    ],
+    "patch": [
+        "diff --git a/yield.js b/yield.js",
+        "index e01b17c7..e69de29b 100644",
+        "--- a/yield.js",
+        "+++ b/yield.js",
+        "@@ -1 +0,0 @@",
+        "-function* foo(){ var index = 0;  }"
+    ],
+    "gitDir": "test/corpus/repos/javascript",
+    "shas": "2bb888580d4105d265e9137474d813ab92ce6359..0e81c586bea55e0eeb46e3422b25ccba96c7d9ea"
+}]

test/corpus/diff-summaries/ruby/and-or.json

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo and bar' boolean operator"
+                    "summary": "Added the 'foo and bar' binary statement"
                 }
             ]
         },
@@ -34,7 +34,7 @@
         "+foo and bar"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "c7d3f438c72d2ab2a09e3fa47ba1cf9b175d2a9b..0bc5f86f8c781f501003b94889818004364037b9"
+    "shas": "48bff6bf54e74bb5709add925c8101431133d29b..718a1f41b48403cdcb927be311af138014047e2a"
 }
 ,{
     "testCaseDescription": "ruby-and-or-replacement-insert-test",
@@ -54,7 +54,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo or bar' boolean operator"
+                    "summary": "Added the 'foo or bar' binary statement"
                 },
                 {
                     "span": {
@@ -69,7 +69,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a or b and c' boolean operator"
+                    "summary": "Added the 'a or b and c' binary statement"
                 },
                 {
                     "span": {
@@ -84,7 +84,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo and bar' boolean operator"
+                    "summary": "Added the 'foo and bar' binary statement"
                 }
             ]
         },
@@ -105,13 +105,40 @@
         " foo and bar"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "0bc5f86f8c781f501003b94889818004364037b9..2c06275827cfa3bbaada5117072cd19574d8d7a9"
+    "shas": "718a1f41b48403cdcb927be311af138014047e2a..b7e04363c991e6a2cd1df38c5f20aa8e9ff7e337"
 }
 ,{
     "testCaseDescription": "ruby-and-or-delete-insert-test",
     "expectedResult": {
         "changes": {
             "and-or.rb": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    11
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    12
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'foo or bar' binary statement with the 'foo and bar' binary statement"
+                },
                 {
                     "span": {
                         "delete": {
@@ -125,7 +152,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a or b and c' boolean operator"
+                    "summary": "Deleted the 'a or b and c' binary statement"
                 }
             ]
         },
@@ -147,13 +174,40 @@
         " foo and bar"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "2c06275827cfa3bbaada5117072cd19574d8d7a9..e800a12b636011a03bc99b86835317cd7ad3ecd1"
+    "shas": "b7e04363c991e6a2cd1df38c5f20aa8e9ff7e337..82a2a103e2f86084de0d80d198270d87f02eda63"
 }
 ,{
     "testCaseDescription": "ruby-and-or-replacement-test",
     "expectedResult": {
         "changes": {
             "and-or.rb": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    12
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    11
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'foo and bar' binary statement with the 'foo or bar' binary statement"
+                },
                 {
                     "span": {
                         "insert": {
@@ -167,7 +221,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a or b and c' boolean operator"
+                    "summary": "Added the 'a or b and c' binary statement"
                 }
             ]
         },
@@ -189,7 +243,7 @@
         " foo and bar"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "e800a12b636011a03bc99b86835317cd7ad3ecd1..c9340cbb8ada35c896fa285761dd0e9dac96fd0b"
+    "shas": "82a2a103e2f86084de0d80d198270d87f02eda63..d10ab6a75880a64eef54c3aa82d677def1938901"
 }
 ,{
     "testCaseDescription": "ruby-and-or-delete-replacement-test",
@@ -200,46 +254,16 @@
                     "span": {
                         "delete": {
                             "start": [
-                                1,
+                                4,
                                 1
                             ],
                             "end": [
-                                1,
-                                11
+                                4,
+                                12
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo or bar' boolean operator"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                2,
-                                1
-                            ],
-                            "end": [
-                                2,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'a or b and c' boolean operator"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                3,
-                                1
-                            ],
-                            "end": [
-                                3,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'a or b and c' boolean operator"
+                    "summary": "Deleted the 'foo and bar' binary statement"
                 }
             ]
         },
@@ -261,7 +285,7 @@
         "-foo and bar"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "c9340cbb8ada35c896fa285761dd0e9dac96fd0b..66224b27113350bc8e9d7ffddc2fe22fee05baa2"
+    "shas": "d10ab6a75880a64eef54c3aa82d677def1938901..f4fa4f7622bdfac02faa1feecd7993e7201467b2"
 }
 ,{
     "testCaseDescription": "ruby-and-or-delete-test",
@@ -281,7 +305,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo and bar' boolean operator"
+                    "summary": "Deleted the 'foo and bar' binary statement"
                 }
             ]
         },
@@ -301,7 +325,7 @@
         " a or b and c"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "66224b27113350bc8e9d7ffddc2fe22fee05baa2..22157102e33b0c6c91eed738c3c7a3ce0edc3fa7"
+    "shas": "f4fa4f7622bdfac02faa1feecd7993e7201467b2..9971253676f78cad3cc69fd652b087501fb4c0bc"
 }
 ,{
     "testCaseDescription": "ruby-and-or-delete-rest-test",
@@ -321,7 +345,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo or bar' boolean operator"
+                    "summary": "Deleted the 'foo or bar' binary statement"
                 },
                 {
                     "span": {
@@ -336,7 +360,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a or b and c' boolean operator"
+                    "summary": "Deleted the 'a or b and c' binary statement"
                 }
             ]
         },
@@ -355,5 +379,5 @@
         "-a or b and c"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "22157102e33b0c6c91eed738c3c7a3ce0edc3fa7..956b136e24f76c977fefd27d5368ecd527f721ec"
+    "shas": "9971253676f78cad3cc69fd652b087501fb4c0bc..e29d844a20e10103ff1197d78c6639bba8fc6e8a"
 }]

test/corpus/diff-summaries/ruby/begin-block.json

@@ -0,0 +1,410 @@
+[{
+    "testCaseDescription": "ruby-begin-block-insert-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index e69de29..689ee83 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -0,0 +1,3 @@",
+        "+BEGIN {",
+        "+ foo",
+        "+}"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "94ad2a55ec6e672dc0141d4eb140eac51505c3f3..607d6ab0c10829f932b4105f680cf2001e69400f"
+}
+,{
+    "testCaseDescription": "ruby-begin-block-replacement-insert-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added a BEGIN block"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index 689ee83..6d35684 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -1,3 +1,10 @@",
+        "+foo",
+        "+BEGIN {",
+        "+ bar",
+        "+}",
+        "+BEGIN {",
+        "+ foo",
+        "+}",
+        " BEGIN {",
+        "  foo",
+        " }"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "607d6ab0c10829f932b4105f680cf2001e69400f..64af6701b22116fb4d3f49e6955735b9faccd69b"
+}
+,{
+    "testCaseDescription": "ruby-begin-block-delete-insert-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added a BEGIN block"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index 6d35684..59f3ea8 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -1,6 +1,5 @@",
+        "-foo",
+        " BEGIN {",
+        "- bar",
+        "+ foo",
+        " }",
+        " BEGIN {",
+        "  foo"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "64af6701b22116fb4d3f49e6955735b9faccd69b..899324a7bdf43e1171bad9545e44238ef55a818f"
+}
+,{
+    "testCaseDescription": "ruby-begin-block-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    2,
+                                    2
+                                ],
+                                "end": [
+                                    2,
+                                    5
+                                ]
+                            },
+                            {
+                                "start": [
+                                    3,
+                                    2
+                                ],
+                                "end": [
+                                    3,
+                                    5
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'foo' identifier with the 'bar' identifier in a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index 59f3ea8..6d35684 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -1,5 +1,6 @@",
+        "+foo",
+        " BEGIN {",
+        "- foo",
+        "+ bar",
+        " }",
+        " BEGIN {",
+        "  foo"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "899324a7bdf43e1171bad9545e44238ef55a818f..1df129cf1f0fbe27c7d05487a2e141a5b5ad02b4"
+}
+,{
+    "testCaseDescription": "ruby-begin-block-delete-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                1
+                            ],
+                            "end": [
+                                10,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index 6d35684..422d4eb 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -1,10 +1,7 @@",
+        "-foo",
+        "-BEGIN {",
+        "- bar",
+        "-}",
+        " BEGIN {",
+        "  foo",
+        " }",
+        "+foo",
+        " BEGIN {",
+        "- foo",
+        "+ bar",
+        " }"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "1df129cf1f0fbe27c7d05487a2e141a5b5ad02b4..ced5b35982c48d22ba622ed28fc36d14acdc31e2"
+}
+,{
+    "testCaseDescription": "ruby-begin-block-delete-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index 422d4eb..a936ce1 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -1,6 +1,3 @@",
+        "-BEGIN {",
+        "- foo",
+        "-}",
+        " foo",
+        " BEGIN {",
+        "  bar"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "ced5b35982c48d22ba622ed28fc36d14acdc31e2..dea1fe3882582fbae56c5370051baf5d951ae2c3"
+}
+,{
+    "testCaseDescription": "ruby-begin-block-delete-rest-test",
+    "expectedResult": {
+        "changes": {
+            "begin-block.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a BEGIN block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "begin-block.rb"
+    ],
+    "patch": [
+        "diff --git a/begin-block.rb b/begin-block.rb",
+        "index a936ce1..e69de29 100644",
+        "--- a/begin-block.rb",
+        "+++ b/begin-block.rb",
+        "@@ -1,4 +0,0 @@",
+        "-foo",
+        "-BEGIN {",
+        "- bar",
+        "-}"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "dea1fe3882582fbae56c5370051baf5d951ae2c3..82c6448a6e4e2d885ac6f12d9f86cdb1d6d1dd2d"
+}]

test/corpus/diff-summaries/ruby/begin.json

@@ -96,7 +96,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'puts('hi')' function call in a begin statement of the 'foo()' method"
+                    "summary": "Added the 'puts('hi')' method call in a begin statement of the 'foo()' method"
                 }
             ]
         },
@@ -138,7 +138,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'puts('hi')' function call in a begin statement of the 'foo()' method"
+                    "summary": "Deleted the 'puts('hi')' method call in a begin statement of the 'foo()' method"
                 }
             ]
         },

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

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a | b' bitwise operator"
+                    "summary": "Added the 'a | b' binary statement"
                 },
                 {
                     "span": {
@@ -31,7 +31,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a >> b' bitwise operator"
+                    "summary": "Added the 'a >> b' binary statement"
                 },
                 {
                     "span": {
@@ -46,7 +46,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a ^ b' bitwise operator"
+                    "summary": "Added the 'a ^ b' binary statement"
                 }
             ]
         },
@@ -66,7 +66,7 @@
         "+a ^ b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "70d36a6a9817b1e91707c1f7f830a0568b959efa..ce65ef18e5032a270bbfcef7d593c68d270abaf4"
+    "shas": "f7475f092fd81593aab4939187efba0e1a894cc6..1fb1f51718a4b8ddf240e498b79dd574de91f7ee"
 }
 ,{
     "testCaseDescription": "ruby-bitwise-operator-replacement-insert-test",
@@ -86,7 +86,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a & b' bitwise operator"
+                    "summary": "Added the 'a & b' binary statement"
                 },
                 {
                     "span": {
@@ -101,7 +101,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a << b' bitwise operator"
+                    "summary": "Added the 'a << b' binary statement"
                 },
                 {
                     "span": {
@@ -116,7 +116,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a | b' bitwise operator"
+                    "summary": "Added the 'a | b' binary statement"
                 },
                 {
                     "span": {
@@ -131,7 +131,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a >> b' bitwise operator"
+                    "summary": "Added the 'a >> b' binary statement"
                 },
                 {
                     "span": {
@@ -146,7 +146,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a ^ b' bitwise operator"
+                    "summary": "Added the 'a ^ b' binary statement"
                 }
             ]
         },
@@ -171,7 +171,7 @@
         " a ^ b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "ce65ef18e5032a270bbfcef7d593c68d270abaf4..3710a2840202f8625b9a440d8b556a6d30d2b6f6"
+    "shas": "1fb1f51718a4b8ddf240e498b79dd574de91f7ee..6aedb1ce3a8797ff587dd8ab390fd0ce6aeb0d47"
 }
 ,{
     "testCaseDescription": "ruby-bitwise-operator-delete-insert-test",
@@ -191,7 +191,61 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a | b' bitwise operator"
+                    "summary": "Added the 'a | b' binary statement"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    6
+                                ]
+                            },
+                            {
+                                "start": [
+                                    2,
+                                    1
+                                ],
+                                "end": [
+                                    2,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a & b' binary statement with the 'a >> b' binary statement"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    2,
+                                    1
+                                ],
+                                "end": [
+                                    2,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    3,
+                                    1
+                                ],
+                                "end": [
+                                    3,
+                                    6
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a << b' binary statement with the 'a ^ b' binary statement"
                 }
             ]
         },
@@ -216,13 +270,43 @@
         " a ^ b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "3710a2840202f8625b9a440d8b556a6d30d2b6f6..88289eb5fde1222a010efda881ce7888c282fe61"
+    "shas": "6aedb1ce3a8797ff587dd8ab390fd0ce6aeb0d47..0549c1aa48fc56756472ca67726a9003416f9454"
 }
 ,{
     "testCaseDescription": "ruby-bitwise-operator-replacement-test",
     "expectedResult": {
         "changes": {
             "bitwise-operator.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a & b' binary statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a << b' binary statement"
+                },
                 {
                     "span": {
                         "delete": {
@@ -236,7 +320,37 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a | b' bitwise operator"
+                    "summary": "Deleted the 'a | b' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a >> b' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a ^ b' binary statement"
                 }
             ]
         },
@@ -261,7 +375,7 @@
         " a ^ b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "88289eb5fde1222a010efda881ce7888c282fe61..5ae589defd184d837cb3d384ab225f42299801d8"
+    "shas": "0549c1aa48fc56756472ca67726a9003416f9454..8a618461620c18e9ea3a33b5b770de186e326ebc"
 }
 ,{
     "testCaseDescription": "ruby-bitwise-operator-delete-replacement-test",
@@ -281,7 +395,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a & b' bitwise operator"
+                    "summary": "Deleted the 'a & b' binary statement"
                 },
                 {
                     "span": {
@@ -296,7 +410,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a << b' bitwise operator"
+                    "summary": "Deleted the 'a << b' binary statement"
                 },
                 {
                     "span": {
@@ -311,7 +425,67 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a | b' bitwise operator"
+                    "summary": "Deleted the 'a | b' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a >> b' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a ^ b' binary statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a & b' binary statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a << b' binary statement"
                 }
             ]
         },
@@ -338,7 +512,7 @@
         "+a << b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "5ae589defd184d837cb3d384ab225f42299801d8..29cf76ea1e49cdef2e616fed189fec268693ca87"
+    "shas": "8a618461620c18e9ea3a33b5b770de186e326ebc..a5688f715668b3db076f20ff3399d2bff365d1da"
 }
 ,{
     "testCaseDescription": "ruby-bitwise-operator-delete-test",
@@ -358,7 +532,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a | b' bitwise operator"
+                    "summary": "Deleted the 'a | b' binary statement"
                 },
                 {
                     "span": {
@@ -373,7 +547,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a >> b' bitwise operator"
+                    "summary": "Deleted the 'a >> b' binary statement"
                 },
                 {
                     "span": {
@@ -388,7 +562,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a ^ b' bitwise operator"
+                    "summary": "Deleted the 'a ^ b' binary statement"
                 }
             ]
         },
@@ -410,7 +584,7 @@
         " a << b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "29cf76ea1e49cdef2e616fed189fec268693ca87..4bb4fee464aeaf7f957b7750b0947e7c02f2a8a8"
+    "shas": "a5688f715668b3db076f20ff3399d2bff365d1da..67a9aacd2e7ce87b09f9e3772b7766c58e875edd"
 }
 ,{
     "testCaseDescription": "ruby-bitwise-operator-delete-rest-test",
@@ -430,7 +604,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a & b' bitwise operator"
+                    "summary": "Deleted the 'a & b' binary statement"
                 },
                 {
                     "span": {
@@ -445,7 +619,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a << b' bitwise operator"
+                    "summary": "Deleted the 'a << b' binary statement"
                 }
             ]
         },
@@ -464,5 +638,5 @@
         "-a << b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "4bb4fee464aeaf7f957b7750b0947e7c02f2a8a8..8b196e55798c1a5f125a87a869f770dca83665d6"
+    "shas": "67a9aacd2e7ce87b09f9e3772b7766c58e875edd..1965f9bdeebab8468bebb4f2c29230d3a42c255e"
 }]

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

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a || b' boolean operator"
+                    "summary": "Added the 'a || b' binary statement"
                 }
             ]
         },
@@ -34,7 +34,7 @@
         "+a || b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "5b279526f66afb77b2588f5173ce44d7cc693f97..53ec9b4615b8872e47ba643814f579eb3d74ef32"
+    "shas": "e29d844a20e10103ff1197d78c6639bba8fc6e8a..df14bb28f16cb2a1559a25f79ed0f828988ae3f1"
 }
 ,{
     "testCaseDescription": "ruby-boolean-operator-replacement-insert-test",
@@ -54,7 +54,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a && b' boolean operator"
+                    "summary": "Added the 'a && b' binary statement"
                 },
                 {
                     "span": {
@@ -69,7 +69,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a || b' boolean operator"
+                    "summary": "Added the 'a || b' binary statement"
                 }
             ]
         },
@@ -89,12 +89,42 @@
         " a || b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "53ec9b4615b8872e47ba643814f579eb3d74ef32..02c804c5e37002a6843f3fc329c5db03ad4d51f6"
+    "shas": "df14bb28f16cb2a1559a25f79ed0f828988ae3f1..f5f5bd68d54c7d785cb8be9fa807e45b0edb3e49"
 }
 ,{
     "testCaseDescription": "ruby-boolean-operator-delete-insert-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "boolean-operator.rb": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a && b' binary statement with the 'a || b' binary statement"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -112,12 +142,42 @@
         " a || b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "02c804c5e37002a6843f3fc329c5db03ad4d51f6..144d5b79b707781d8b5d1d56e281bcaa8598ae17"
+    "shas": "f5f5bd68d54c7d785cb8be9fa807e45b0edb3e49..b6258c7694077f26c384afdba0d38ff1c987c01e"
 }
 ,{
     "testCaseDescription": "ruby-boolean-operator-replacement-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "boolean-operator.rb": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a || b' binary statement with the 'a && b' binary statement"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -135,7 +195,7 @@
         " a || b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "144d5b79b707781d8b5d1d56e281bcaa8598ae17..000c0198a566086df4d95a1ffd575748b7721552"
+    "shas": "b6258c7694077f26c384afdba0d38ff1c987c01e..53428a8acedfee4c1f2f28b0c8b798fc74d5ae20"
 }
 ,{
     "testCaseDescription": "ruby-boolean-operator-delete-replacement-test",
@@ -155,7 +215,37 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a && b' boolean operator"
+                    "summary": "Deleted the 'a && b' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a || b' binary statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a && b' binary statement"
                 }
             ]
         },
@@ -176,7 +266,7 @@
         "+a && b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "000c0198a566086df4d95a1ffd575748b7721552..f363216d5459fb0eafeb0168cc3f4af6d11f8cd5"
+    "shas": "53428a8acedfee4c1f2f28b0c8b798fc74d5ae20..11ad3b40423df923fb6260046df3bd83b3b2fc94"
 }
 ,{
     "testCaseDescription": "ruby-boolean-operator-delete-test",
@@ -196,7 +286,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a || b' boolean operator"
+                    "summary": "Deleted the 'a || b' binary statement"
                 }
             ]
         },
@@ -215,7 +305,7 @@
         " a && b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "f363216d5459fb0eafeb0168cc3f4af6d11f8cd5..57a8c0847390f2f78910231321007d7b2c86cc7a"
+    "shas": "11ad3b40423df923fb6260046df3bd83b3b2fc94..1a515a532b8a07afeeedbdd56956bf3e6a4f4f57"
 }
 ,{
     "testCaseDescription": "ruby-boolean-operator-delete-rest-test",
@@ -235,7 +325,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a && b' boolean operator"
+                    "summary": "Deleted the 'a && b' binary statement"
                 }
             ]
         },
@@ -253,5 +343,5 @@
         "-a && b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "57a8c0847390f2f78910231321007d7b2c86cc7a..0c8195a0d30149b84b53bc2c98687d24a787f4dd"
+    "shas": "1a515a532b8a07afeeedbdd56956bf3e6a4f4f57..7c5058a233fff0a5b08a6fa3752565ecbdde40e5"
 }]

test/corpus/diff-summaries/ruby/comparision-operator.json

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x < y' relational operator"
+                    "summary": "Added the 'x < y' binary statement"
                 },
                 {
                     "span": {
@@ -31,7 +31,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a > b' relational operator"
+                    "summary": "Added the 'a > b' binary statement"
                 }
             ]
         },
@@ -50,7 +50,7 @@
         "+a > b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "cc9a4a6fa2a1c65983250a900daf6501538b4cd8..d0eb4857f83d5eef8c789d9b1800947161d8876d"
+    "shas": "90aa585d4ae985a7c45200caf714149779717558..3f805e1231d263aaee85a8ac7d2ae11fd70c4fc6"
 }
 ,{
     "testCaseDescription": "ruby-comparision-operator-replacement-insert-test",
@@ -70,7 +70,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x <= y' relational operator"
+                    "summary": "Added the 'x <= y' binary statement"
                 },
                 {
                     "span": {
@@ -85,7 +85,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a >= b' relational operator"
+                    "summary": "Added the 'a >= b' binary statement"
                 },
                 {
                     "span": {
@@ -100,7 +100,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x < y' relational operator"
+                    "summary": "Added the 'x < y' binary statement"
                 },
                 {
                     "span": {
@@ -115,7 +115,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a > b' relational operator"
+                    "summary": "Added the 'a > b' binary statement"
                 }
             ]
         },
@@ -138,12 +138,69 @@
         " a > b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "d0eb4857f83d5eef8c789d9b1800947161d8876d..186f6c1cb9c2260246f3126b1203b54b9670ea09"
+    "shas": "3f805e1231d263aaee85a8ac7d2ae11fd70c4fc6..a6a5370ffbd9e6d6f1c2b0420eabe85b2724e073"
 }
 ,{
     "testCaseDescription": "ruby-comparision-operator-delete-insert-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "comparision-operator.rb": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    6
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'x <= y' binary statement with the 'x < y' binary statement"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    2,
+                                    1
+                                ],
+                                "end": [
+                                    2,
+                                    7
+                                ]
+                            },
+                            {
+                                "start": [
+                                    2,
+                                    1
+                                ],
+                                "end": [
+                                    2,
+                                    6
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a >= b' binary statement with the 'a > b' binary statement"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -164,12 +221,69 @@
         " x < y"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "186f6c1cb9c2260246f3126b1203b54b9670ea09..4e7370cd85c7f324871137855a459a1c583bce75"
+    "shas": "a6a5370ffbd9e6d6f1c2b0420eabe85b2724e073..eb604c0bcf71199d5c621faae2e35bf19d5d38f5"
 }
 ,{
     "testCaseDescription": "ruby-comparision-operator-replacement-test",
     "expectedResult": {
-        "changes": {},
+        "changes": {
+            "comparision-operator.rb": [
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    6
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    1
+                                ],
+                                "end": [
+                                    1,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'x < y' binary statement with the 'x <= y' binary statement"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    2,
+                                    1
+                                ],
+                                "end": [
+                                    2,
+                                    6
+                                ]
+                            },
+                            {
+                                "start": [
+                                    2,
+                                    1
+                                ],
+                                "end": [
+                                    2,
+                                    7
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'a > b' binary statement with the 'a >= b' binary statement"
+                }
+            ]
+        },
         "errors": {}
     },
     "filePaths": [
@@ -190,7 +304,7 @@
         " x < y"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "4e7370cd85c7f324871137855a459a1c583bce75..a26bfabeda46c054da38b6aaf5564c5b9e575294"
+    "shas": "eb604c0bcf71199d5c621faae2e35bf19d5d38f5..85ec514fd02a930895b759fde6c1ae1c168f2305"
 }
 ,{
     "testCaseDescription": "ruby-comparision-operator-delete-replacement-test",
@@ -210,7 +324,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x <= y' relational operator"
+                    "summary": "Deleted the 'x <= y' binary statement"
                 },
                 {
                     "span": {
@@ -225,7 +339,67 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a >= b' relational operator"
+                    "summary": "Deleted the 'a >= b' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x < y' binary statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a > b' binary statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x <= y' binary statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a >= b' binary statement"
                 }
             ]
         },
@@ -250,7 +424,7 @@
         "+a >= b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "a26bfabeda46c054da38b6aaf5564c5b9e575294..0e4db6b78d0c970ab1b1c30a357997ccd2dd80fa"
+    "shas": "85ec514fd02a930895b759fde6c1ae1c168f2305..6c1ce08787e2be33cdff965236183001674249e0"
 }
 ,{
     "testCaseDescription": "ruby-comparision-operator-delete-test",
@@ -270,7 +444,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x < y' relational operator"
+                    "summary": "Deleted the 'x < y' binary statement"
                 },
                 {
                     "span": {
@@ -285,7 +459,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a > b' relational operator"
+                    "summary": "Deleted the 'a > b' binary statement"
                 }
             ]
         },
@@ -306,7 +480,7 @@
         " a >= b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "0e4db6b78d0c970ab1b1c30a357997ccd2dd80fa..84a86501aebef11b8627b8524fc8d324665ffc44"
+    "shas": "6c1ce08787e2be33cdff965236183001674249e0..ef13be31a7ebb4b35e3c83e52bc45d3a345d0503"
 }
 ,{
     "testCaseDescription": "ruby-comparision-operator-delete-rest-test",
@@ -326,7 +500,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x <= y' relational operator"
+                    "summary": "Deleted the 'x <= y' binary statement"
                 },
                 {
                     "span": {
@@ -341,7 +515,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a >= b' relational operator"
+                    "summary": "Deleted the 'a >= b' binary statement"
                 }
             ]
         },
@@ -360,5 +534,5 @@
         "-a >= b"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "84a86501aebef11b8627b8524fc8d324665ffc44..70d36a6a9817b1e91707c1f7f830a0568b959efa"
+    "shas": "ef13be31a7ebb4b35e3c83e52bc45d3a345d0503..f7475f092fd81593aab4939187efba0e1a894cc6"
 }]

test/corpus/diff-summaries/ruby/conditional-assignment.json

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x' conditional assignment"
+                    "summary": "Added the 'x' operator assignment"
                 }
             ]
         },
@@ -34,7 +34,7 @@
         "+x ||= 5"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "6564c9c8832540d910a4118a6130305613ef9772..737bffe1cb105e55eb30dcb5e66499a162216c4d"
+    "shas": "bba90b67e00732e5f4f32a72f7b6b131d33dd30e..aed651d3923765ed3138e049c2cc0ba2cde6cb84"
 }
 ,{
     "testCaseDescription": "ruby-conditional-assignment-replacement-insert-test",
@@ -54,7 +54,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x' conditional assignment"
+                    "summary": "Added the 'x' operator assignment"
                 },
                 {
                     "span": {
@@ -69,7 +69,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x' conditional assignment"
+                    "summary": "Added the 'x' operator assignment"
                 }
             ]
         },
@@ -89,7 +89,7 @@
         " x ||= 5"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "737bffe1cb105e55eb30dcb5e66499a162216c4d..b4680d4032610561ef31cbb0508bfc9573be0d0c"
+    "shas": "aed651d3923765ed3138e049c2cc0ba2cde6cb84..db83fd26ce25ec9193f84fd776f8c36289ce7516"
 }
 ,{
     "testCaseDescription": "ruby-conditional-assignment-delete-insert-test",
@@ -121,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '7' with '5'"
+                    "summary": "Replaced '7' with '5' in the x operator assignment"
                 }
             ]
         },
@@ -142,7 +142,7 @@
         " x ||= 5"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "b4680d4032610561ef31cbb0508bfc9573be0d0c..cce1693dd4e7b6101f7cbcc9100b4c3276194fa2"
+    "shas": "db83fd26ce25ec9193f84fd776f8c36289ce7516..c9bcb43f918ac8a89adf2e4f5227113fd65c13cc"
 }
 ,{
     "testCaseDescription": "ruby-conditional-assignment-replacement-test",
@@ -174,7 +174,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '5' with '7'"
+                    "summary": "Replaced '5' with '7' in the x operator assignment"
                 }
             ]
         },
@@ -195,7 +195,7 @@
         " x ||= 5"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "cce1693dd4e7b6101f7cbcc9100b4c3276194fa2..8bd810b4f976b9701ff7a0ceb9d018bfeac4780e"
+    "shas": "c9bcb43f918ac8a89adf2e4f5227113fd65c13cc..12100cef49bba40f05ebaf7f015e6f39c409f2c2"
 }
 ,{
     "testCaseDescription": "ruby-conditional-assignment-delete-replacement-test",
@@ -215,7 +215,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x' conditional assignment"
+                    "summary": "Deleted the 'x' operator assignment"
                 },
                 {
                     "span": {
@@ -230,7 +230,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x' conditional assignment"
+                    "summary": "Deleted the 'x' operator assignment"
                 },
                 {
                     "span": {
@@ -245,7 +245,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x' conditional assignment"
+                    "summary": "Added the 'x' operator assignment"
                 }
             ]
         },
@@ -266,7 +266,7 @@
         "+x &&= 7"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "8bd810b4f976b9701ff7a0ceb9d018bfeac4780e..ddc2e0154b1f8cbb3c3e3800549d0c5126c7ff52"
+    "shas": "12100cef49bba40f05ebaf7f015e6f39c409f2c2..b2e02b7f3e454208a01199c2196b0a39eaabe4e0"
 }
 ,{
     "testCaseDescription": "ruby-conditional-assignment-delete-test",
@@ -286,7 +286,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x' conditional assignment"
+                    "summary": "Deleted the 'x' operator assignment"
                 }
             ]
         },
@@ -305,7 +305,7 @@
         " x &&= 7"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "ddc2e0154b1f8cbb3c3e3800549d0c5126c7ff52..4f41d6075e03521d205fb38e22fe31e8f89ffcd9"
+    "shas": "b2e02b7f3e454208a01199c2196b0a39eaabe4e0..923f68eae40f6ea6b48688f9c0170ceb67f54fb3"
 }
 ,{
     "testCaseDescription": "ruby-conditional-assignment-delete-rest-test",
@@ -325,7 +325,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x' conditional assignment"
+                    "summary": "Deleted the 'x' operator assignment"
                 }
             ]
         },
@@ -343,5 +343,5 @@
         "-x &&= 7"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "4f41d6075e03521d205fb38e22fe31e8f89ffcd9..78a9116b77a62e27008d72a5a1f2b1b9bec795bd"
+    "shas": "923f68eae40f6ea6b48688f9c0170ceb67f54fb3..016efbbed35a70176cf3ec8bb08369cf7889c2e7"
 }]

test/corpus/diff-summaries/ruby/else.json

@@ -109,7 +109,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced an else block with an 'bar()' function call in a begin statement"
+                    "summary": "Replaced an else block with the 'bar()' method call in a begin statement"
                 }
             ]
         },
@@ -163,7 +163,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'bar()' function call with the else block in a begin statement"
+                    "summary": "Replaced the 'bar()' method call with an else block in a begin statement"
                 }
             ]
         },

test/corpus/diff-summaries/ruby/elsif.json

@@ -97,7 +97,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'qoz()' function call in the 'baz' elsif block"
+                    "summary": "Added the 'qoz()' method call in the 'baz' elsif block"
                 }
             ]
         },
@@ -139,7 +139,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'qoz()' function call in the 'baz' elsif block"
+                    "summary": "Deleted the 'qoz()' method call in the 'baz' elsif block"
                 }
             ]
         },

test/corpus/diff-summaries/ruby/end-block.json

@@ -0,0 +1,410 @@
+[{
+    "testCaseDescription": "ruby-end-block-insert-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index e69de29..0684d73 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -0,0 +1,3 @@",
+        "+END {",
+        "+ foo",
+        "+}"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "82c6448a6e4e2d885ac6f12d9f86cdb1d6d1dd2d..d2ed526fb844a051febd47469d494caa75fe91f0"
+}
+,{
+    "testCaseDescription": "ruby-end-block-replacement-insert-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added an END block"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index 0684d73..6ab1278 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -1,3 +1,10 @@",
+        "+foo",
+        "+END {",
+        "+ bar",
+        "+}",
+        "+END {",
+        "+ foo",
+        "+}",
+        " END {",
+        "  foo",
+        " }"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "d2ed526fb844a051febd47469d494caa75fe91f0..d63a52f07a0f0bcf858af8cd8be7547da36d07f9"
+}
+,{
+    "testCaseDescription": "ruby-end-block-delete-insert-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added an END block"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index 6ab1278..6a9e874 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -1,6 +1,5 @@",
+        "-foo",
+        " END {",
+        "- bar",
+        "+ foo",
+        " }",
+        " END {",
+        "  foo"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "d63a52f07a0f0bcf858af8cd8be7547da36d07f9..e81caf1424dc328e8ab385e9c747a63d54698444"
+}
+,{
+    "testCaseDescription": "ruby-end-block-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    2,
+                                    2
+                                ],
+                                "end": [
+                                    2,
+                                    5
+                                ]
+                            },
+                            {
+                                "start": [
+                                    3,
+                                    2
+                                ],
+                                "end": [
+                                    3,
+                                    5
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'foo' identifier with the 'bar' identifier in an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index 6a9e874..6ab1278 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -1,5 +1,6 @@",
+        "+foo",
+        " END {",
+        "- foo",
+        "+ bar",
+        " }",
+        " END {",
+        "  foo"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "e81caf1424dc328e8ab385e9c747a63d54698444..e84b2b99dab363e56f8785e8b39c18a71009aa4e"
+}
+,{
+    "testCaseDescription": "ruby-end-block-delete-replacement-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                1
+                            ],
+                            "end": [
+                                10,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index 6ab1278..ad181ce 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -1,10 +1,7 @@",
+        "-foo",
+        "-END {",
+        "- bar",
+        "-}",
+        " END {",
+        "  foo",
+        " }",
+        "+foo",
+        " END {",
+        "- foo",
+        "+ bar",
+        " }"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "e84b2b99dab363e56f8785e8b39c18a71009aa4e..d064522cbf35b19bb71d3999617cd95576ef5d15"
+}
+,{
+    "testCaseDescription": "ruby-end-block-delete-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index ad181ce..dd2d1da 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -1,6 +1,3 @@",
+        "-END {",
+        "- foo",
+        "-}",
+        " foo",
+        " END {",
+        "  bar"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "d064522cbf35b19bb71d3999617cd95576ef5d15..f28e52757945cbfc7235452bdfb242f59fe209b6"
+}
+,{
+    "testCaseDescription": "ruby-end-block-delete-rest-test",
+    "expectedResult": {
+        "changes": {
+            "end-block.rb": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'foo' identifier"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted an END block"
+                }
+            ]
+        },
+        "errors": {}
+    },
+    "filePaths": [
+        "end-block.rb"
+    ],
+    "patch": [
+        "diff --git a/end-block.rb b/end-block.rb",
+        "index dd2d1da..e69de29 100644",
+        "--- a/end-block.rb",
+        "+++ b/end-block.rb",
+        "@@ -1,4 +0,0 @@",
+        "-foo",
+        "-END {",
+        "- bar",
+        "-}"
+    ],
+    "gitDir": "test/corpus/repos/ruby",
+    "shas": "f28e52757945cbfc7235452bdfb242f59fe209b6..ad37c6bddef1ebfea76c652b142476e8268b9f9f"
+}]

test/corpus/diff-summaries/ruby/ensure.json

@@ -109,7 +109,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced an ensure block with an 'bar' identifier in a begin statement"
+                    "summary": "Replaced an ensure block with the 'bar' identifier in a begin statement"
                 }
             ]
         },
@@ -163,7 +163,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'bar' identifier with the ensure block in a begin statement"
+                    "summary": "Replaced the 'bar' identifier with an ensure block in a begin statement"
                 }
             ]
         },

test/corpus/diff-summaries/ruby/hash.json

@@ -34,7 +34,7 @@
         "+{ :key1 => \"value\", :key2 => 1, \"key3\" => false, :\"symbol_key\" => 10 }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "1348e47cfcd21ebc8f7693453b14835daf726244..648f040b4932437ade8a705635587a0939858f24"
+    "shas": "5c66ec3700761ca4868e703f576449f5a190e5a5..8ed1097ecb63f00552d0dcf65c4d7f97e554660a"
 }
 ,{
     "testCaseDescription": "ruby-hash-replacement-insert-test",
@@ -89,7 +89,7 @@
         " { :key1 => \"value\", :key2 => 1, \"key3\" => false, :\"symbol_key\" => 10 }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "648f040b4932437ade8a705635587a0939858f24..84f022c36ea61cfde11d18137176a272015dfd29"
+    "shas": "8ed1097ecb63f00552d0dcf65c4d7f97e554660a..3f945480d1d0fdcff6cc85bbd257acb2471d9eb3"
 }
 ,{
     "testCaseDescription": "ruby-hash-delete-insert-test",
@@ -98,18 +98,30 @@
             "hash.rb": [
                 {
                     "span": {
-                        "insert": {
-                            "start": [
-                                1,
-                                3
-                            ],
-                            "end": [
-                                1,
-                                19
-                            ]
-                        }
+                        "replace": [
+                            {
+                                "start": [
+                                    1,
+                                    3
+                                ],
+                                "end": [
+                                    1,
+                                    24
+                                ]
+                            },
+                            {
+                                "start": [
+                                    1,
+                                    3
+                                ],
+                                "end": [
+                                    1,
+                                    19
+                                ]
+                            }
+                        ]
                     },
-                    "summary": "Added the ':key1 => \"value\"' pair"
+                    "summary": "Replaced the 'key1: \"changed value\"' pair with the ':key1 => \"value\"' pair"
                 },
                 {
                     "span": {
@@ -128,57 +140,48 @@
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    3
-                                ],
-                                "end": [
-                                    1,
-                                    24
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    33
-                                ],
-                                "end": [
-                                    1,
-                                    48
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                33
+                            ],
+                            "end": [
+                                1,
+                                48
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'key1: \"changed value\"' pair with the '\"key3\": false' pair"
+                    "summary": "Added the '\"key3\": false' pair"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    26
-                                ],
-                                "end": [
-                                    1,
-                                    33
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    50
-                                ],
-                                "end": [
-                                    1,
-                                    69
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                50
+                            ],
+                            "end": [
+                                1,
+                                69
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'key2: 2' pair with the ':\"symbol_key\" => 10' pair"
+                    "summary": "Added the ':\"symbol_key\" => 10' pair"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                26
+                            ],
+                            "end": [
+                                1,
+                                33
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'key2: 2' pair"
                 },
                 {
                     "span": {
@@ -214,28 +217,13 @@
         " { :key1 => \"value\", :key2 => 1, \"key3\" => false, :\"symbol_key\" => 10 }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "84f022c36ea61cfde11d18137176a272015dfd29..0e9857eefe9380563594d1e0fd97e258792e09e9"
+    "shas": "3f945480d1d0fdcff6cc85bbd257acb2471d9eb3..e651384951227cdfcca2e2aa341af92e0102c265"
 }
 ,{
     "testCaseDescription": "ruby-hash-replacement-test",
     "expectedResult": {
         "changes": {
             "hash.rb": [
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                1,
-                                3
-                            ],
-                            "end": [
-                                1,
-                                24
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'key1: \"changed value\"' pair"
-                },
                 {
                     "span": {
                         "replace": [
@@ -252,16 +240,31 @@
                             {
                                 "start": [
                                     1,
-                                    26
+                                    3
                                 ],
                                 "end": [
                                     1,
-                                    33
+                                    24
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the ':key1 => \"value\"' pair with the 'key2: 2' pair"
+                    "summary": "Replaced the ':key1 => \"value\"' pair with the 'key1: \"changed value\"' pair"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                26
+                            ],
+                            "end": [
+                                1,
+                                33
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'key2: 2' pair"
                 },
                 {
                     "span": {
@@ -339,7 +342,7 @@
         " { :key1 => \"value\", :key2 => 1, \"key3\" => false, :\"symbol_key\" => 10 }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "0e9857eefe9380563594d1e0fd97e258792e09e9..82454529535c539fd7208ad3dd7a6321959a1330"
+    "shas": "e651384951227cdfcca2e2aa341af92e0102c265..acf16b47847c4ad4eeea4f57c6591d882b4d7b81"
 }
 ,{
     "testCaseDescription": "ruby-hash-delete-replacement-test",
@@ -410,7 +413,7 @@
         "+{ key1: \"changed value\", key2: 2, key3: true }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "82454529535c539fd7208ad3dd7a6321959a1330..54bfbaa7b24548519cffc6c2182f5bb4624f00c3"
+    "shas": "acf16b47847c4ad4eeea4f57c6591d882b4d7b81..84a7aaf829ca724982d91d7067bd23f7e374d2a4"
 }
 ,{
     "testCaseDescription": "ruby-hash-delete-test",
@@ -449,7 +452,7 @@
         " { key1: \"changed value\", key2: 2, key3: true }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "54bfbaa7b24548519cffc6c2182f5bb4624f00c3..30cd85ffe6d456179c6c0d357d9d77019d4b8702"
+    "shas": "84a7aaf829ca724982d91d7067bd23f7e374d2a4..61ca4b1cef66d8a37f57f077826691d4b34ca91c"
 }
 ,{
     "testCaseDescription": "ruby-hash-delete-rest-test",
@@ -487,5 +490,5 @@
         "-{ key1: \"changed value\", key2: 2, key3: true }"
     ],
     "gitDir": "test/corpus/repos/ruby",
-    "shas": "30cd85ffe6d456179c6c0d357d9d77019d4b8702..a8b440ad76232e4e95f5a5ed53b9b6604ece8a17"
+    "shas": "61ca4b1cef66d8a37f57f077826691d4b34ca91c..39c849e6aaf280116d0b8523fe9ae7af2ff7ffee"
 }]