Merge pull request #937 from github/consolidate-common-term-assignment-patterns

Consolidate common term assignment patterns

src/Category.hs

@@ -13,7 +13,7 @@ data Category
   -- | The top-level branch node.
   = Program
   -- | A node indicating syntax errors.
-  | Error
+  | ParseError
   -- | A boolean expression.
   | Boolean
   -- | A bitwise operator.
@@ -240,7 +240,7 @@ instance (StringConv Category Text) where
 instance Listable Category where
   tiers
     =  cons0 Program
-    \/ cons0 Error
+    \/ cons0 ParseError
     \/ cons0 Boolean
     \/ cons0 BooleanOperator
     \/ cons0 MathOperator

src/DiffSummary.hs

@@ -16,6 +16,7 @@ import Category as C
 import Data.Functor.Both hiding (fst, snd)
 import qualified Data.Functor.Both as Both
 import Data.Functor.Listable
+import Data.List.NonEmpty (nonEmpty)
 import qualified Data.Text as Text
 import Data.Text.Listable
 import Data.Record
@@ -196,7 +197,7 @@ toTermName source term = case unwrap term of
   S.Defer expr -> toTermName' expr
   S.AnonymousFunction params _ -> "anonymous" <> paramsToArgNames params
   S.Fixed children -> termNameFromChildren term children
-  S.Indexed children -> fromMaybe "branch" $ (toCategoryName . category) . extract <$> head children
+  S.Indexed children -> maybe "branch" sconcat (nonEmpty (intersperse ", " (toTermName' <$> children)))
   Leaf leaf -> toS leaf
   S.Assignment identifier _ -> toTermName' identifier
   S.Function identifier _ _ _ -> toTermName' identifier
@@ -231,7 +232,7 @@ toTermName source term = case unwrap term of
   -- TODO: We should remove Case from Syntax since I don't think we should ever
   -- evaluate Case as a single toTermName Text - joshvera
   S.Case expr _ -> termNameFromSource expr
-  S.Switch expr _ -> maybe "" toTermName' expr
+  S.Switch exprs _ -> maybe "" toTermName' (fmap snd (unsnoc exprs))
   S.Ternary expr _ -> toTermName' expr
   S.OperatorAssignment id _ -> toTermName' id
   S.Operator _ -> termNameFromSource term
@@ -239,7 +240,7 @@ toTermName source term = case unwrap term of
   S.Pair k v -> toKeyName k <> toArgName v
   S.Return children -> Text.intercalate ", " (termNameFromSource <$> children)
   S.Yield children -> Text.intercalate ", " (termNameFromSource <$> children)
-  S.Error _ -> termNameFromSource term
+  S.ParseError _ -> termNameFromSource term
   S.If expr _ -> termNameFromSource expr
   S.For clauses _ -> termNameFromChildren term clauses
   S.While expr _ -> toTermName' expr
@@ -266,7 +267,7 @@ toTermName source term = case unwrap term of
   S.Continue expr -> maybe "" toTermName' expr
   S.BlockStatement children -> termNameFromChildren term children
   S.DefaultCase children -> termNameFromChildren term children
-  S.FieldDecl id expr tag -> termNameFromSource id <> (maybe "" (\expr' -> " " <> termNameFromSource expr') expr) <> (maybe "" ((" " <>) . termNameFromSource) tag)
+  S.FieldDecl id expr tag -> termNameFromSource id <> maybe "" (\expr' -> " " <> termNameFromSource expr') expr <> maybe "" ((" " <>) . termNameFromSource) tag
   where toTermName' = toTermName source
         termNameFromChildren term children = termNameFromRange (unionRangesFrom (range term) (range <$> children))
         termNameFromSource term = termNameFromRange (range term)
@@ -328,7 +329,7 @@ termToDiffInfo blob term = case unwrap term of
   S.AnonymousFunction _ _ -> LeafInfo C.AnonymousFunction (toTermName' term) (getField $ extract term)
   S.Comment _ -> HideInfo
   S.Commented cs leaf -> BranchInfo (termToDiffInfo' <$> cs <> maybeToList leaf) (category $ extract term) BCommented
-  S.Error _ -> ErrorInfo (getField $ extract term) (toTermName' term)
+  S.ParseError _ -> ErrorInfo (getField $ extract term) (toTermName' term)
   _ -> toLeafInfo term
   where toTermName' = toTermName blob
         termToDiffInfo' = termToDiffInfo blob
@@ -372,7 +373,7 @@ instance HasCategory Category where
     Boolean -> "boolean"
     DictionaryLiteral -> "dictionary"
     C.Comment -> "comment"
-    C.Error -> "error"
+    C.ParseError -> "error"
     ExpressionStatements -> "expression statements"
     C.Assignment -> "assignment"
     C.Function -> "function"

src/Info.hs

@@ -1,5 +1,22 @@
 {-# LANGUAGE DataKinds, GeneralizedNewtypeDeriving #-}
-module Info (Range(..), characterRange, setCharacterRange, Category(..), category, setCategory, Cost(..), cost, setCost, SourceSpan(..), SourcePos(..), SourceSpans(..), SourceText(..), sourceText) where
+module Info
+( Range(..)
+, characterRange
+, setCharacterRange
+, Category(..)
+, category
+, setCategory
+, Cost(..)
+, cost
+, setCost
+, SourceSpan(..)
+, SourcePos(..)
+, SourceSpans(..)
+, sourceSpan
+, setSourceSpan
+, SourceText(..)
+, sourceText
+) where
 
 import Data.Functor.Listable
 import Data.Record
@@ -30,12 +47,17 @@ setCategory = setField
 cost :: HasField fields Cost => Record fields -> Cost
 cost = getField
 
-sourceText :: HasField fields SourceText => Record fields -> SourceText
-sourceText = getField
-
 setCost :: HasField fields Cost => Record fields -> Cost -> Record fields
 setCost = setField
 
+sourceText :: HasField fields SourceText => Record fields -> SourceText
+sourceText = getField
+
+sourceSpan :: HasField fields SourceSpan => Record fields -> SourceSpan
+sourceSpan = getField
+
+setSourceSpan :: HasField fields SourceSpan => Record fields -> SourceSpan -> Record fields
+setSourceSpan = setField
 
 -- Instances
 

src/Interpreter.hs

@@ -63,7 +63,7 @@ algorithmWithTerms construct t1 t2 = maybe (recursively t1 t2) (fmap annotate) $
     S.FunctionCall <$> recursively identifierA identifierB
                    <*> bySimilarity argsA argsB
   (S.Switch exprA casesA, S.Switch exprB casesB) -> Just $
-    S.Switch <$> maybeRecursively exprA exprB
+    S.Switch <$> bySimilarity exprA exprB
              <*> bySimilarity casesA casesB
   (S.Object tyA a, S.Object tyB b) -> Just $
     S.Object <$> maybeRecursively tyA tyB

src/Language.hs

@@ -4,7 +4,6 @@ module Language where
 import Data.Record
 import Info
 import Prologue
-import Source
 import qualified Syntax as S
 import Term
 
@@ -41,23 +40,6 @@ languageForType mediaType = case mediaType of
     ".go" -> Just Language.Go
     _ -> Nothing
 
-termConstructor
-  :: Source Char -- ^ The source that the term occurs within.
-  -> SourceSpan -- ^ The span that the term occupies.
-  -> Category -- ^ The node’s Category.
-  -> 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 category range children _ =
-  withDefaultInfo $ case (category, children) of
-    (Error, _) -> S.Error children
-    (_, []) -> S.Leaf (toText $ slice range source)
-    _ -> S.Indexed children
-  where
-    withDefaultInfo syntax =
-      pure $! cofree ((range :. category :. sourceSpan :. Nil) :< syntax)
-
 toVarDecl :: (HasField fields Category) => Term (S.Syntax Text) (Record fields) -> Term (S.Syntax Text) (Record fields)
 toVarDecl child = cofree $ setCategory (extract child) VarDecl :< S.VarDecl child Nothing
 

src/Language/C.hs

@@ -1,28 +1,19 @@
 {-# LANGUAGE DataKinds #-}
 module Language.C where
 
-import Data.Record
 import Info
 import Prologue
 import Source
 import qualified Syntax as S
 import Term
 
-termConstructor
-  :: Source Char -- ^ The source that the term occurs within.
-  -> SourceSpan -- ^ The span that the term occupies.
-  -> Category -- ^ The node’s Category.
-  -> Range -- ^ The character range that the term occupies.
+termAssignment
+  :: Source Char -- ^ The source of the term.
+  -> Category -- ^ The category for the term.
   -> [ 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 category range children _
-  | category == Error = withDefaultInfo (S.Error children)
-  | otherwise = withDefaultInfo $ case children of
-  [] -> S.Leaf . toText $ slice range source
-  _ -> S.Indexed children
-  where
-    withDefaultInfo syntax = pure $! cofree ((range :. category :. sourceSpan :. Nil) :< syntax)
+  -> Maybe (S.Syntax Text (SyntaxTerm Text '[Range, Category, SourceSpan])) -- ^ The resulting term, in Maybe.
+termAssignment _ _ _ = Nothing
+
 
 categoryForCProductionName :: Text -> Category
 categoryForCProductionName = Other

src/Language/Go.hs

@@ -6,243 +6,72 @@ import Info
 import Source
 import Term
 import qualified Syntax as S
-import Data.Record
-import Range (unionRangesFrom)
-import SourceSpan (unionSourceSpansFrom)
 
-termConstructor
-  :: Source Char -- ^ The source that the term occurs within.
-  -> SourceSpan -- ^ The span that the term occupies.
-  -> Category -- ^ The node’s Category.
-  -> Range -- ^ The character range that the term occupies.
+termAssignment
+  :: Source Char -- ^ The source of the term.
+  -> Category -- ^ The category for the term.
   -> [ 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 category range children _ = pure $! case category of
-  Return -> withDefaultInfo $ S.Return children
-  Module -> case Prologue.break (\node -> Info.category (extract node) == Other "package_clause") children of
-    (comments, packageName : rest) -> case unwrap packageName of
-        S.Indexed [id] ->
-          let module' = withCategory Module (S.Module id rest)
-          in withCategory Program (S.Indexed (comments <> [module']))
-        _ -> withRanges range Error children (S.Error children)
-    _ -> withRanges range Error children (S.Error children)
-  Other "import_declaration" -> toImports children
-  Function -> withDefaultInfo $ case children of
-    [id, params, block] -> S.Function id (toList $ unwrap params) Nothing (toList $ unwrap block)
-    [id, params, ty, block] -> S.Function id (toList $ unwrap params) (Just ty) (toList $ unwrap block)
-    rest -> S.Error rest
-  For ->
-    withDefaultInfo $ case children of
-      [body] | Info.category (extract body) == Other "block" ->
-        S.For [] (toList $ unwrap body)
-      [forClause, body] | Info.category (extract forClause) == Other "for_clause" ->
-        S.For (toList $ unwrap forClause) (toList $ unwrap body)
-      [rangeClause, body] | Info.category (extract rangeClause) == Other "range_clause" ->
-        S.For (toList $ unwrap rangeClause) (toList $ unwrap body)
-      other -> S.Error other
-  TypeDecl -> toTypeDecl children
-  StructTy -> toStructTy children
-  FieldDecl -> toFieldDecl children
-  Switch ->
-    case Prologue.break isCaseClause children of
-      (clauses, cases) -> withDefaultInfo $ case clauses of
-        [id] -> S.Switch (Just id) cases -- type_switch_statement
-        [] -> S.Switch Nothing (toCase <$> cases)
-        _ -> S.Switch (Just (withCategory ExpressionStatements (S.Indexed clauses))) (toCase <$> cases)
-      where
-        isCaseClause = (== Case) . Info.category . extract
-        toCase clause = case toList (unwrap clause) of
-          clause' : rest -> case toList (unwrap clause') of
-            [clause''] -> withCategory Case $ S.Case clause'' rest
-            [] -> withCategory DefaultCase $ S.DefaultCase rest
-            rest -> withCategory Error $ S.Error rest
-          [] -> withCategory Error $ S.Error [clause]
-  ParameterDecl -> withDefaultInfo $ case children of
-    [param, ty] -> S.ParameterDecl (Just ty) param
-    [param] -> S.ParameterDecl Nothing param
-    _ -> S.Error children
-  Assignment -> toVarAssignment children
-  Select -> withDefaultInfo $ S.Select (toCommunicationCase =<< children)
-    where toCommunicationCase = toList . unwrap
-  Go -> withDefaultInfo $ toExpression S.Go children
-  Defer -> withDefaultInfo $ toExpression S.Defer children
-  SubscriptAccess -> withDefaultInfo $ toSubscriptAccess children
-  IndexExpression -> withDefaultInfo $ toSubscriptAccess children
-  Slice -> sliceToSubscriptAccess children
-  Other "composite_literal" -> toLiteral children
-  TypeAssertion -> withDefaultInfo $ case children of
-    [a, b] -> S.TypeAssertion a b
-    rest -> S.Error rest
-  TypeConversion -> withDefaultInfo $ case children of
-    [a, b] -> S.TypeConversion a b
-    rest -> S.Error rest
+  -> Maybe (S.Syntax Text (SyntaxTerm Text '[Range, Category, SourceSpan])) -- ^ The resulting term, in Maybe.
+termAssignment source category children = case (category, children) of
+  (Module, [moduleName]) -> Just $ S.Module moduleName []
+  (Import, [importName]) -> Just $ S.Import importName []
+  (Function, [id, params, block]) -> Just $ S.Function id (toList (unwrap params)) Nothing (toList (unwrap block))
+  (Function, [id, params, ty, block]) -> Just $ S.Function id (toList (unwrap params)) (Just ty) (toList (unwrap block))
+  (For, [body]) | Other "block" <- Info.category (extract body) -> Just $ S.For [] (toList (unwrap body))
+  (For, [forClause, body]) | Other "for_clause" <- Info.category (extract forClause) -> Just $ S.For (toList (unwrap forClause)) (toList (unwrap body))
+  (For, [rangeClause, body]) | Other "range_clause" <- Info.category (extract rangeClause) -> Just $ S.For (toList (unwrap rangeClause)) (toList (unwrap body))
+  (TypeDecl, [identifier, ty]) -> Just $ S.TypeDecl identifier ty
+  (StructTy, _) -> Just (S.Ty children)
+  (FieldDecl, [idList])
+    | [ident] <- toList (unwrap idList)
+    -> Just (S.FieldDecl ident Nothing Nothing)
+  (FieldDecl, [idList, ty])
+    | [ident] <- toList (unwrap idList)
+    -> Just $ case Info.category (extract ty) of
+      StringLiteral -> S.FieldDecl ident Nothing (Just ty)
+      _ -> S.FieldDecl ident (Just ty) Nothing
+  (FieldDecl, [idList, ty, tag])
+    | [ident] <- toList (unwrap idList)
+    -> Just (S.FieldDecl ident (Just ty) (Just tag))
+  (ParameterDecl, param : ty) -> Just $ S.ParameterDecl (listToMaybe ty) param
+  (Assignment, [identifier, expression]) -> Just $ S.VarAssignment identifier expression
+  (Select, _) -> Just $ S.Select (children >>= toList . unwrap)
+  (Go, [expr]) -> Just $ S.Go expr
+  (Defer, [expr]) -> Just $ S.Defer expr
+  (SubscriptAccess, [a, b]) -> Just $ S.SubscriptAccess a b
+  (IndexExpression, [a, b]) -> Just $ S.SubscriptAccess a b
+  (Slice, [a, rest]) -> Just $ S.SubscriptAccess a rest
+  (Other "composite_literal", [ty, values])
+    | ArrayTy <- Info.category (extract ty)
+    -> Just $ S.Array (Just ty) (toList (unwrap values))
+    | DictionaryTy <- Info.category (extract ty)
+    -> Just $ S.Object (Just ty) (toList (unwrap values))
+    | SliceTy <- Info.category (extract ty)
+    -> Just $ S.SubscriptAccess ty values
+  (Other "composite_literal", []) -> Just $ S.Struct Nothing []
+  (Other "composite_literal", [ty]) -> Just $ S.Struct (Just ty) []
+  (Other "composite_literal", [ty, values]) -> Just $ S.Struct (Just ty) (toList (unwrap values))
+  (TypeAssertion, [a, b]) -> Just $ S.TypeAssertion a b
+  (TypeConversion, [a, b]) -> Just $ S.TypeConversion a b
   -- TODO: Handle multiple var specs
-  Other "var_declaration" -> toVarDecls children
-  VarAssignment -> toVarAssignment children
-  VarDecl -> toVarAssignment children
-  If -> toIfStatement children
-  FunctionCall -> withDefaultInfo $ case children of
-    [id] -> S.FunctionCall id []
-    id : rest -> S.FunctionCall id rest
-    rest -> S.Error rest
-  Other "const_declaration" -> toConsts children
-  AnonymousFunction -> withDefaultInfo $ case children of
-    [params, _, body] -> case toList (unwrap params) of
-      [params'] -> S.AnonymousFunction (toList $ unwrap params') (toList $ unwrap body)
-      rest -> S.Error rest
-    rest -> S.Error rest
-  PointerTy -> withDefaultInfo $ case children of
-    [ty] -> S.Ty ty
-    rest -> S.Error rest
-  ChannelTy -> withDefaultInfo $ case children of
-    [ty] -> S.Ty ty
-    rest -> S.Error rest
-  Send -> withDefaultInfo $ case children of
-    [channel, expr] -> S.Send channel expr
-    rest -> S.Error rest
-  Operator -> withDefaultInfo $ S.Operator children
-  FunctionTy ->
-    let params = withRanges range Params children $ S.Indexed children
-    in withDefaultInfo $ S.Ty params
-  IncrementStatement ->
-    withDefaultInfo $ S.Leaf . toText $ slice range source
-  DecrementStatement ->
-    withDefaultInfo $ S.Leaf . toText $ slice range source
-  QualifiedIdentifier ->
-    withDefaultInfo $ S.Leaf . toText $ slice range source
-  Break -> toBreak children
-  Continue -> toContinue children
-  Pair -> toPair children
-  Method -> toMethod children
-  _ -> withDefaultInfo $ case children of
-    [] -> S.Leaf . toText $ slice range source
-    _ -> S.Indexed children
-  where
-    toMethod = \case
-      [params, name, fun] -> withDefaultInfo (S.Method name Nothing (toList $ unwrap params) (toList $ unwrap fun))
-      [params, name, outParams, fun] ->
-        let params' = toList (unwrap params)
-            outParams' = toList (unwrap outParams)
-            allParams = params' <> outParams'
-        in withDefaultInfo (S.Method name Nothing allParams (toList $ unwrap fun))
-      [params, name, outParams, ty, fun] ->
-        let params' = toList (unwrap params)
-            outParams' = toList (unwrap outParams)
-            allParams = params' <> outParams'
-        in withDefaultInfo (S.Method name (Just ty) allParams (toList $ unwrap fun))
-      rest -> withCategory Error (S.Error rest)
-    toPair = \case
-      [key, value] -> withDefaultInfo (S.Pair key value)
-      rest -> withCategory Error (S.Error rest)
-    toBreak = \case
-      [label] -> withDefaultInfo (S.Break (Just label))
-      [] -> withDefaultInfo (S.Break Nothing)
-      rest -> withCategory Error (S.Error rest)
-    toContinue = \case
-      [label] -> withDefaultInfo (S.Continue (Just label))
-      [] -> withDefaultInfo (S.Continue Nothing)
-      rest -> withCategory Error (S.Error rest)
-
-    toStructTy children =
-      withDefaultInfo (S.Ty (withRanges range FieldDeclarations children (S.Indexed children)))
-
-    toLiteral = \case
-      children@[ty, _] -> case Info.category (extract ty) of
-        ArrayTy -> toImplicitArray children
-        DictionaryTy -> toMap children
-        SliceTy -> sliceToSubscriptAccess children
-        _ -> toStruct children
-      rest -> withRanges range Error rest $ S.Error rest
-    toImplicitArray = \case
-      [ty, values] -> withCategory ArrayLiteral (S.Array (Just ty) (toList $ unwrap values))
-      rest -> withRanges range Error rest $ S.Error rest
-    toMap = \case
-      [ty, values] -> withCategory DictionaryLiteral (S.Object (Just ty) (toList $ unwrap values))
-      rest -> withRanges range Error rest $ S.Error rest
-    toStruct = \case
-      [] -> withCategory Struct (S.Struct Nothing [])
-      [ty] -> withCategory Struct (S.Struct (Just ty) [])
-      [ty, values] -> withCategory Struct (S.Struct (Just ty) (toList $ unwrap values))
-      rest -> withRanges range Error rest $ S.Error rest
-    toFieldDecl = \case
-      [idList, ty] ->
-        case Info.category (extract ty) of
-          StringLiteral -> withCategory FieldDecl (S.FieldDecl (toIdent (toList (unwrap idList))) Nothing (Just ty))
-          _ -> withCategory FieldDecl (S.FieldDecl (toIdent (toList (unwrap idList))) (Just ty) Nothing)
-      [idList] ->
-        withCategory FieldDecl (S.FieldDecl (toIdent (toList (unwrap idList))) Nothing Nothing)
-      [idList, ty, tag] ->
-        withCategory FieldDecl (S.FieldDecl (toIdent (toList (unwrap idList))) (Just ty) (Just tag))
-      rest -> withRanges range Error rest (S.Error rest)
-
-      where
-        toIdent = \case
-          [ident] -> ident
-          rest -> withRanges range Error rest (S.Error rest)
-
-
-    toExpression f = \case
-      [expr] -> f expr
-      rest -> S.Error rest
-    toSubscriptAccess = \case
-      [a, b] -> S.SubscriptAccess a b
-      rest -> S.Error rest
-    sliceToSubscriptAccess = \case
-      a : rest ->
-        let sliceElement = withRanges range Element rest $ S.Fixed rest
-        in withCategory Slice (S.SubscriptAccess a sliceElement)
-      rest -> withRanges range Error rest $ S.Error rest
-
-    toIfStatement children = case Prologue.break ((Other "block" ==) . Info.category . extract) children of
-      (clauses, blocks) ->
-        let clauses' = withRanges range ExpressionStatements clauses (S.Indexed clauses)
-            blocks' = foldMap (toList . unwrap) blocks
-        in withDefaultInfo (S.If clauses' blocks')
-
-    toTypeDecl = \case
-      [identifier, ty] -> withDefaultInfo $ S.TypeDecl identifier ty
-      rest -> withRanges range Error rest $ S.Error rest
-
-    toImports imports =
-      withDefaultInfo $ S.Indexed (imports >>= toImport)
-      where
-        toImport i = case toList (unwrap i) of
-          [importName] -> [ withCategory Import (S.Import importName []) ]
-          rest@(_:_) -> [ withRanges range Error rest (S.Error rest)]
-          [] -> []
-
-    toVarDecls children = withDefaultInfo (S.Indexed children)
-
-    toConsts constSpecs = withDefaultInfo (S.Indexed constSpecs)
-
-    toVarAssignment = \case
-        [idList, ty] | Info.category (extract ty) == Identifier ->
-          let ids = toList (unwrap idList)
-              idList' = (\id -> withRanges range VarDecl [id] (S.VarDecl id (Just ty))) <$> ids
-          in withRanges range ExpressionStatements idList' (S.Indexed idList')
-        [idList, expressionList] | Info.category (extract expressionList) == Other "expression_list" ->
-          let assignments' = zipWith (\id expr ->
-                withCategory VarAssignment $ S.VarAssignment id expr)
-                (toList $ unwrap idList) (toList $ unwrap expressionList)
-          in withRanges range ExpressionStatements assignments' (S.Indexed assignments')
-        [idList, _, expressionList] ->
-          let assignments' = zipWith (\id expr ->
-                withCategory VarAssignment $ S.VarAssignment id expr) (toList $ unwrap idList) (toList $ unwrap expressionList)
-          in withRanges range ExpressionStatements assignments' (S.Indexed assignments')
-        [idList] -> withDefaultInfo (S.Indexed [idList])
-        rest -> withRanges range Error rest (S.Error rest)
-
-    withRanges originalRange category' terms syntax =
-      let ranges' = getField . extract <$> terms
-          sourceSpans' = getField . extract <$> terms
-      in
-      cofree ((unionRangesFrom originalRange ranges' :. category' :. unionSourceSpansFrom sourceSpan sourceSpans' :. Nil) :< syntax)
-
-    withCategory category syntax =
-      cofree ((range :. category :. sourceSpan :. Nil) :< syntax)
-
-    withDefaultInfo = withCategory category
+  (VarAssignment, [identifier, expression]) -> Just $ S.VarAssignment identifier expression
+  (VarDecl, [idList, ty]) | Identifier <- Info.category (extract ty) -> Just $ S.VarDecl idList (Just ty)
+  (FunctionCall, id : rest) -> Just $ S.FunctionCall id rest
+  (AnonymousFunction, [params, _, body])
+    | [params'] <- toList (unwrap params)
+    -> Just $ S.AnonymousFunction (toList (unwrap params')) (toList (unwrap body))
+  (PointerTy, _) -> Just $ S.Ty children
+  (ChannelTy, _) -> Just $ S.Ty children
+  (Send, [channel, expr]) -> Just $ S.Send channel expr
+  (Operator, _) -> Just $ S.Operator children
+  (FunctionTy, _) -> Just $ S.Ty children
+  (IncrementStatement, _) -> Just $ S.Leaf $ toText source
+  (DecrementStatement, _) -> Just $ S.Leaf $ toText source
+  (QualifiedIdentifier, _) -> Just $ S.Leaf $ toText source
+  (Method, [params, name, fun]) -> Just (S.Method name Nothing (toList (unwrap params)) (toList (unwrap fun)))
+  (Method, [params, name, outParams, fun]) -> Just (S.Method name Nothing (toList (unwrap params) <> toList (unwrap outParams)) (toList (unwrap fun)))
+  (Method, [params, name, outParams, ty, fun]) -> Just (S.Method name (Just ty) (toList (unwrap params) <> toList (unwrap outParams)) (toList (unwrap fun)))
+  _ -> Nothing
 
 categoryForGoName :: Text -> Category
 categoryForGoName = \case
@@ -265,7 +94,8 @@ categoryForGoName = \case
   "var_spec" -> VarAssignment
   "const_spec" -> VarAssignment
   "assignment_statement" -> Assignment
-  "source_file" -> Module
+  "source_file" -> Program
+  "package_clause" -> Module
   "if_statement" -> If
   "for_statement" -> For
   "expression_switch_statement" -> Switch
@@ -294,7 +124,6 @@ categoryForGoName = \case
   "channel_type" -> ChannelTy
   "send_statement" -> Send
   "unary_expression" -> Operator
-  "ERROR" -> Error
   "function_type" -> FunctionTy
   "inc_statement" -> IncrementStatement
   "dec_statement" -> DecrementStatement
@@ -303,4 +132,6 @@ categoryForGoName = \case
   "continue_statement" -> Continue
   "rune_literal" -> RuneLiteral
   "method_declaration" -> Method
+  "import_spec" -> Import
+  "block" -> ExpressionStatements
   s -> Other (toS s)

src/Language/JavaScript.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 module Language.JavaScript where
 
-import Data.Record
 import Info
 import Prologue
 import Source
@@ -9,104 +8,60 @@ import Language
 import qualified Syntax as S
 import Term
 
-operators :: [Category]
-operators = [ Operator, BooleanOperator, MathOperator, RelationalOperator, BitwiseOperator ]
-
-termConstructor
-  :: Source Char -- ^ The source that the term occurs within.
-  -> SourceSpan -- ^ The span that the term occupies.
-  -> Category -- ^ The node’s Category.
-  -> Range -- ^ The character range that the term occupies.
+termAssignment
+  :: Source Char -- ^ The source of the term.
+  -> Category -- ^ The category for the term.
   -> [ 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 category range children allChildren
-  | category == Error = withDefaultInfo (S.Error children)
-  | category `elem` operators = do
-    allChildren' <- allChildren
-    withDefaultInfo $ S.Operator allChildren'
-  | otherwise = withDefaultInfo $ case (category, children) of
-    (Return, _) -> S.Return children
-    (Assignment, [ identifier, value ]) -> S.Assignment identifier value
-    (Assignment, _ ) -> S.Error children
-    (MathAssignment, [ identifier, value ]) -> S.OperatorAssignment identifier value
-    (MathAssignment, _ ) -> S.Error children
-    (MemberAccess, [ base, property ]) -> S.MemberAccess base property
-    (MemberAccess, _ ) -> S.Error children
-    (SubscriptAccess, [ base, element ]) -> S.SubscriptAccess base element
-    (SubscriptAccess, _ ) -> S.Error children
-    (CommaOperator, [ a, b ]) -> case unwrap b of
-      S.Indexed rest -> S.Indexed $ a : rest
-      _ -> S.Indexed children
-    (CommaOperator, _ ) -> S.Error children
-    (FunctionCall, _) -> case children of
-      member : args | Info.category (extract member) == MemberAccess -> case toList (unwrap member) of
-        [target, method] -> S.MethodCall target method (toList . unwrap =<< args)
-        _ -> S.Error children
-      function : args -> S.FunctionCall function (toList . unwrap =<< args)
-      _ -> S.Error children
-    (Ternary, condition : cases) -> S.Ternary condition cases
-    (Ternary, _ ) -> S.Error children
-    (VarAssignment, [ x, y ]) -> S.VarAssignment x y
-    (VarAssignment, _ ) -> S.Error children
-    (VarDecl, _) -> S.Indexed $ toVarDecl <$> children
-    (Switch, expr : rest) -> S.Switch (Just expr) rest
-    (Switch, _ ) -> S.Error children
-    (Case, [ expr, body ]) -> S.Case expr [body]
-    (Case, _ ) -> S.Error children
-    (Object, _) -> S.Object Nothing $ foldMap toTuple children
-    (Pair, _) -> S.Fixed children
-    (Comment, _) -> S.Comment . toText $ slice range source
-    (If, expr : rest ) -> S.If expr rest
-    (If, _ ) -> S.Error children
-    (While, expr : rest ) -> S.While expr rest
-    (While, _ ) -> S.Error children
-    (DoWhile, [ expr, body ]) -> S.DoWhile expr body
-    (DoWhile, _ ) -> S.Error children
-    (Throw, [ expr ]) -> S.Throw expr
-    (Throw, _ ) -> S.Error children
-    (Constructor, [ expr ]) -> S.Constructor expr
-    (Constructor, _ ) -> S.Error children
-    (Try, _) -> case children of
-      [ body ] -> S.Try [body] [] Nothing Nothing
-      [ body, catch ] | Catch <- Info.category (extract catch) -> S.Try [body] [catch] Nothing Nothing
-      [ body, finally ] | Finally <- Info.category (extract finally) -> S.Try [body] [] Nothing (Just finally)
-      [ body, catch, finally ]
-        | Catch <- Info.category (extract catch)
-        , Finally <- Info.category (extract finally) -> S.Try [body] [catch] Nothing (Just finally)
-      _ -> S.Error children
-    (ArrayLiteral, _) -> S.Array Nothing children
-    (Method, [ identifier, params, exprs ]) -> S.Method identifier Nothing (toList (unwrap params)) (toList (unwrap exprs))
-    (Method, [ identifier, exprs ]) -> S.Method identifier Nothing [] (toList (unwrap exprs))
-    (Method, _ ) -> S.Error children
-    (Class, [ identifier, superclass, definitions ]) -> S.Class identifier (Just superclass) (toList (unwrap definitions))
-    (Class, [ identifier, definitions ]) -> S.Class identifier Nothing (toList (unwrap definitions))
-    (Class, _ ) -> S.Error children
-    (Import, [ statements, identifier ] ) -> S.Import identifier (toList (unwrap statements))
-    (Import, [ identifier ] ) -> S.Import identifier []
-    (Import, _ ) -> S.Error children
-    (Export, [ statements, identifier] ) -> S.Export (Just identifier) (toList (unwrap statements))
-    (Export, [ statements ] ) -> case unwrap statements of
-      S.Indexed _ -> S.Export Nothing (toList (unwrap statements))
-      _ -> S.Export (Just statements) []
-    (Export, _ ) -> S.Error children
-    (Break, [ expr ] ) -> S.Break (Just expr)
-    (Yield, _ ) -> S.Yield children
-    (For, _) -> case unsnoc children of
-      Just (exprs, body) -> S.For exprs [body]
-      _ -> S.Error children
-    (Function, _) -> case children of
-      [ body ] -> S.AnonymousFunction [] [body]
-      [ params, body ] -> S.AnonymousFunction (toList (unwrap params)) [body]
-      [ id, params, body ] -> S.Function id (toList (unwrap params)) Nothing [body]
-      _ -> S.Error children
-    (_, []) -> S.Leaf . toText $ slice range source
-    _ -> S.Indexed children
-  where
-    withDefaultInfo syntax =
-      pure $! case syntax of
-        S.MethodCall{} -> cofree ((range :.  MethodCall :. sourceSpan :. Nil) :< syntax)
-        _ -> cofree ((range :. category :. sourceSpan :. Nil) :< syntax)
+  -> Maybe (S.Syntax Text (SyntaxTerm Text '[Range, Category, SourceSpan])) -- ^ The resulting term, in Maybe.
+termAssignment _ category children
+  = case (category, children) of
+    (Assignment, [ identifier, value ]) -> Just $ S.Assignment identifier value
+    (MathAssignment, [ identifier, value ]) -> Just $ S.OperatorAssignment identifier value
+    (MemberAccess, [ base, property ]) -> Just $ S.MemberAccess base property
+    (SubscriptAccess, [ base, element ]) -> Just $ S.SubscriptAccess base element
+    (CommaOperator, [ a, b ])
+      | S.Indexed rest <- unwrap b
+      -> Just $ S.Indexed $ a : rest
+    (FunctionCall, member : args)
+      | S.MemberAccess target method <- unwrap member
+      -> Just $ S.MethodCall target method (toList . unwrap =<< args)
+    (FunctionCall, function : args) -> Just $ S.FunctionCall function (toList . unwrap =<< args)
+    (Ternary, condition : cases) -> Just $ S.Ternary condition cases
+    (VarAssignment, [ x, y ]) -> Just $ S.VarAssignment x y
+    (VarDecl, _) -> Just . S.Indexed $ toVarDecl <$> children
+    (Object, _) -> Just . S.Object Nothing $ foldMap toTuple children
+    (DoWhile, [ expr, body ]) -> Just $ S.DoWhile expr body
+    (Constructor, [ expr ]) -> Just $ S.Constructor expr
+    (Try, [ body ]) -> Just $ S.Try [body] [] Nothing Nothing
+    (Try, [ body, catch ])
+      | Catch <- Info.category (extract catch)
+      -> Just $ S.Try [body] [catch] Nothing Nothing
+    (Try, [ body, finally ])
+      | Finally <- Info.category (extract finally)
+      -> Just $ S.Try [body] [] Nothing (Just finally)
+    (Try, [ body, catch, finally ])
+      | Catch <- Info.category (extract catch)
+      , Finally <- Info.category (extract finally)
+      -> Just $ S.Try [body] [catch] Nothing (Just finally)
+    (ArrayLiteral, _) -> Just $ S.Array Nothing children
+    (Method, [ identifier, params, exprs ]) -> Just $ S.Method identifier Nothing (toList (unwrap params)) (toList (unwrap exprs))
+    (Method, [ identifier, exprs ]) -> Just $ S.Method identifier Nothing [] (toList (unwrap exprs))
+    (Class, [ identifier, superclass, definitions ]) -> Just $ S.Class identifier (Just superclass) (toList (unwrap definitions))
+    (Class, [ identifier, definitions ]) -> Just $ S.Class identifier Nothing (toList (unwrap definitions))
+    (Import, [ statements, identifier ] ) -> Just $ S.Import identifier (toList (unwrap statements))
+    (Import, [ identifier ] ) -> Just $ S.Import identifier []
+    (Export, [ statements, identifier] ) -> Just $ S.Export (Just identifier) (toList (unwrap statements))
+    (Export, [ statements ] )
+      | S.Indexed _ <- unwrap statements
+      -> Just $ S.Export Nothing (toList (unwrap statements))
+      | otherwise -> Just $ S.Export (Just statements) []
+    (For, _)
+      | Just (exprs, body) <- unsnoc children
+      -> Just $ S.For exprs [body]
+    (Function, [ body ]) -> Just $ S.AnonymousFunction [] [body]
+    (Function, [ params, body ]) -> Just $ S.AnonymousFunction (toList (unwrap params)) [body]
+    (Function, [ id, params, body ]) -> Just $ S.Function id (toList (unwrap params)) Nothing [body]
+    _ -> Nothing
 
 categoryForJavaScriptProductionName :: Text -> Category
 categoryForJavaScriptProductionName name = case name of
@@ -138,7 +93,6 @@ categoryForJavaScriptProductionName name = case name of
   "trailing_if_statement" -> If
   "empty_statement" -> Empty
   "program" -> Program
-  "ERROR" -> Error
   "function_call" -> FunctionCall
   "pair" -> Pair
   "string" -> StringLiteral

src/Language/Ruby.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 module Language.Ruby where
 
-import Data.Record
 import Data.List (partition)
 import Info
 import Prologue
@@ -10,35 +9,22 @@ import Language
 import qualified Syntax as S
 import Term
 
-operators :: [Category]
-operators = [ Binary, Unary, RangeExpression, ScopeOperator ]
-
-termConstructor
-  :: Source Char -- ^ The source that the term occurs within.
-  -> SourceSpan -- ^ The span that the term occupies.
-  -> Category -- ^ The node’s Category.
-  -> Range -- ^ The character range that the term occupies.
+termAssignment
+  :: Source Char -- ^ The source of the term.
+  -> Category -- ^ The category for the term.
   -> [ 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 category range children allChildren
-  | category == Error = pure $! withDefaultInfo (S.Error children)
-  | category `elem` operators = do
-    allChildren' <- allChildren
-    pure $! withDefaultInfo $ S.Operator allChildren'
-  | otherwise = pure . withDefaultInfo $ case (category, children) of
-    (ArgumentPair, [ k, v ] ) -> S.Pair k v
-    (ArgumentPair, _ ) -> S.Error children
-    (KeywordParameter, [ k, v ] ) -> S.Pair k v
+  -> Maybe (S.Syntax Text (SyntaxTerm Text '[Range, Category, SourceSpan])) -- ^ The resulting term, in Maybe.
+termAssignment _ category children
+  = case (category, children) of
+    (ArgumentPair, [ k, v ] ) -> Just $ S.Pair k v
+    (KeywordParameter, [ k, v ] ) -> Just $ S.Pair k v
     -- NB: ("keyword_parameter", k) is a required keyword parameter, e.g.:
     --    def foo(name:); end
     -- Let it fall through to generate an Indexed syntax.
-    (OptionalParameter, [ k, v ] ) -> S.Pair k v
-    (OptionalParameter, _ ) -> S.Error children
-    (ArrayLiteral, _ ) -> S.Array Nothing children
-    (Assignment, [ identifier, value ]) -> S.Assignment identifier value
-    (Assignment, _ ) -> S.Error children
-    (Begin, _ ) -> case partition (\x -> Info.category (extract x) == Rescue) children of
+    (OptionalParameter, [ k, v ] ) -> Just $ S.Pair k v
+    (ArrayLiteral, _ ) -> Just $ S.Array Nothing children
+    (Assignment, [ identifier, value ]) -> Just $ S.Assignment identifier value
+    (Begin, _ ) -> Just $ case partition (\x -> Info.category (extract x) == Rescue) children of
       (rescues, rest) -> case partition (\x -> Info.category (extract x) == Ensure || Info.category (extract x) == Else) rest of
         (ensureElse, body) -> case ensureElse of
           [ elseBlock, ensure ]
@@ -50,84 +36,59 @@ termConstructor source sourceSpan category range children allChildren
           [ elseBlock ] | Else <- Info.category (extract elseBlock) -> S.Try body rescues (Just elseBlock) Nothing
           [ ensure ] | Ensure <- Info.category (extract ensure) -> S.Try body rescues Nothing (Just ensure)
           _ -> S.Try body rescues Nothing Nothing
-    (Case, expr : body ) -> S.Switch (Just 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 <- Info.category (extract superclass) -> S.Class constant (Just superclass) body
-      _ -> S.Class constant Nothing rest
-    (Class, _ ) -> S.Error children
-    (SingletonClass, identifier : rest ) -> S.Class identifier Nothing rest
-    (SingletonClass, _ ) -> S.Error children
-    (Comment, _ ) -> S.Comment . toText $ slice range source
-    (Ternary, condition : cases) -> S.Ternary condition cases
-    (Ternary, _ ) -> S.Error children
-    (Constant, _ ) -> S.Fixed children
-    (MethodCall, _ ) -> case children of
-      member : args | MemberAccess <- Info.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
-    (Other "lambda", _) -> case children of
-      [ body ] -> S.AnonymousFunction [] [body]
-      ( params : body ) -> S.AnonymousFunction (toList (unwrap params)) body
-      _ -> S.Error children
-    (Object, _ ) -> S.Object Nothing $ foldMap toTuple children
-    (Modifier If, [ lhs, condition ]) -> S.If condition [lhs]
-    (Modifier If, _) -> S.Error children
-    (If, condition : body ) -> S.If condition body
-    (If, _ ) -> S.Error children
-    (Modifier Unless, [lhs, rhs]) -> S.If (withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)) [lhs]
-    (Modifier Unless, _) -> S.Error children
-    (Unless, expr : rest) -> S.If (withRecord (setCategory (extract expr) Negate) (S.Negate expr)) rest
-    (Unless, _) -> S.Error children
-    (Modifier Until, [ lhs, rhs ]) -> S.While (withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)) [lhs]
-    (Modifier Until, _) -> S.Error children
-    (Until, expr : rest) -> S.While (withRecord (setCategory (extract expr) Negate) (S.Negate expr)) rest
-    (Until, _) -> S.Error children
-    (Elsif, condition : body ) -> S.If condition body
-    (Elsif, _ ) -> S.Error children
-    (SubscriptAccess, [ base, element ]) -> S.SubscriptAccess base element
-    (SubscriptAccess, _ ) -> S.Error children
-    (For, lhs : expr : rest ) -> S.For [lhs, expr] rest
-    (For, _ ) -> S.Error children
-    (OperatorAssignment, [ identifier, value ]) -> S.OperatorAssignment identifier value
-    (OperatorAssignment, _ ) -> S.Error children
-    (MemberAccess, [ base, property ]) -> S.MemberAccess base property
-    (MemberAccess, _ ) -> S.Error children
-    (Method, _ ) -> case children of
-      identifier : params : body | Params <- Info.category (extract params) -> S.Method identifier Nothing (toList (unwrap params)) body
-      identifier : body -> S.Method identifier Nothing [] body
-      _ -> S.Error children
-    (Module, constant : body ) -> S.Module constant body
-    (Module, _ ) -> S.Error children
-    (Modifier Rescue, [lhs, rhs] ) -> S.Rescue [lhs] [rhs]
-    (Modifier Rescue, _) -> S.Error children
-    (Rescue, _ ) -> case children of
-      exceptions : exceptionVar : rest
-        | RescueArgs <- Info.category (extract exceptions)
-        , RescuedException <- Info.category (extract exceptionVar) -> S.Rescue (toList (unwrap exceptions) <> [exceptionVar]) rest
-      exceptionVar : rest | RescuedException <- Info.category (extract exceptionVar) -> S.Rescue [exceptionVar] rest
-      exceptions : body | RescueArgs <- Info.category (extract exceptions) -> S.Rescue (toList (unwrap exceptions)) body
-      body -> S.Rescue [] body
-    (Return, _ ) -> S.Return children
-    (Modifier While, [ lhs, condition ]) -> S.While condition [lhs]
-    (Modifier While, _) -> S.Error children
-    (While, expr : rest ) -> S.While expr rest
-    (While, _ ) -> S.Error children
-    (Yield, _ ) -> S.Yield children
-    _ | category `elem` [ BeginBlock, EndBlock ] -> S.BlockStatement children
-    (_, []) -> S.Leaf . toText $ slice range source
-    _  -> S.Indexed children
+    (Class, constant : superclass : body)
+      | Superclass <- Info.category (extract superclass)
+      -> Just $ S.Class constant (Just superclass) body
+    (Class, constant : rest) -> Just $ S.Class constant Nothing rest
+    (SingletonClass, identifier : rest) -> Just $ S.Class identifier Nothing rest
+    (Case, _) -> Just $ uncurry S.Switch (Prologue.break ((== When) . Info.category . extract) children)
+    (When, expr : body) -> Just $ S.Case expr body
+    (Ternary, condition : cases) -> Just $ S.Ternary condition cases
+    (Constant, _ ) -> Just $ S.Fixed children
+    (MethodCall, fn : args)
+      | MemberAccess <- Info.category (extract fn)
+      , [target, method] <- toList (unwrap fn)
+      -> Just $ S.MethodCall target method (toList . unwrap =<< args)
+      | otherwise
+      -> Just $ S.FunctionCall fn (toList . unwrap =<< args)
+    (Other "lambda", first : rest)
+      | null rest -> Just $ S.AnonymousFunction [] [first]
+      | otherwise -> Just $ S.AnonymousFunction (toList (unwrap first)) rest
+    (Object, _ ) -> Just . S.Object Nothing $ foldMap toTuple children
+    (Modifier If, [ lhs, condition ]) -> Just $ S.If condition [lhs]
+    (Modifier Unless, [lhs, rhs]) -> Just $ S.If (withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)) [lhs]
+    (Unless, expr : rest) -> Just $ S.If (withRecord (setCategory (extract expr) Negate) (S.Negate expr)) rest
+    (Modifier Until, [ lhs, rhs ]) -> Just $ S.While (withRecord (setCategory (extract rhs) Negate) (S.Negate rhs)) [lhs]
+    (Until, expr : rest) -> Just $ S.While (withRecord (setCategory (extract expr) Negate) (S.Negate expr)) rest
+    (Elsif, condition : body ) -> Just $ S.If condition body
+    (SubscriptAccess, [ base, element ]) -> Just $ S.SubscriptAccess base element
+    (For, lhs : expr : rest ) -> Just $ S.For [lhs, expr] rest
+    (OperatorAssignment, [ identifier, value ]) -> Just $ S.OperatorAssignment identifier value
+    (MemberAccess, [ base, property ]) -> Just $ S.MemberAccess base property
+    (Method, identifier : rest)
+      | params : body <- rest
+      , Params <- Info.category (extract params)
+      -> Just $ S.Method identifier Nothing (toList (unwrap params)) body
+      | otherwise
+      -> Just $ S.Method identifier Nothing [] rest
+    (Module, constant : body ) -> Just $ S.Module constant body
+    (Modifier Rescue, [lhs, rhs] ) -> Just $ S.Rescue [lhs] [rhs]
+    (Rescue, exceptions : exceptionVar : rest)
+      | RescueArgs <- Info.category (extract exceptions)
+      , RescuedException <- Info.category (extract exceptionVar)
+      -> Just $ S.Rescue (toList (unwrap exceptions) <> [exceptionVar]) rest
+    (Rescue, exceptionVar : rest)
+      | RescuedException <- Info.category (extract exceptionVar)
+      -> Just $ S.Rescue [exceptionVar] rest
+    (Rescue, exceptions : body)
+      | RescueArgs <- Info.category (extract exceptions)
+      -> Just $ S.Rescue (toList (unwrap exceptions)) body
+    (Rescue, body) -> Just $ S.Rescue [] body
+    (Modifier While, [ lhs, condition ]) -> Just $ S.While condition [lhs]
+    _ | category `elem` [ BeginBlock, EndBlock ] -> Just $ S.BlockStatement children
+    _  -> Nothing
   where
     withRecord record syntax = cofree (record :< syntax)
-    withCategory category syntax =
-      cofree ((range :. category :. sourceSpan :. Nil) :< syntax)
-    withDefaultInfo syntax = case syntax of
-      S.MethodCall{} -> withCategory MethodCall syntax
-      _ -> withCategory category syntax
 
 categoryForRubyName :: Text -> Category
 categoryForRubyName = \case
@@ -151,7 +112,6 @@ categoryForRubyName = \case
   "elsif" -> Elsif
   "end_block" -> EndBlock
   "ensure" -> Ensure
-  "ERROR" -> Error
   "exception_variable" -> RescuedException
   "exceptions" -> RescueArgs
   "false" -> Boolean

src/Range.hs

@@ -2,6 +2,7 @@ module Range where
 
 import qualified Data.Char as Char
 import Data.List (span)
+import Data.List.NonEmpty (nonEmpty)
 import Data.Semigroup
 import Data.String
 import Prologue
@@ -60,17 +61,9 @@ intersectionRange range1 range2 = Range (max (start range1) (start range2)) (min
 unionRange :: Range -> Range -> Range
 unionRange (Range start1 end1) (Range start2 end2) = Range (min start1 start2) (max end1 end2)
 
--- | Return a range that contains all the ranges in a Foldable, or Range 0 0 if it’s empty.
-unionRanges :: Foldable f => f Range -> Range
-unionRanges = unionRangesFrom (Range 0 0)
-
--- | Return Just the concatenation of any elements in a Foldable, or Nothing if it is empty.
-maybeConcat :: (Foldable f, Semigroup a) => f a -> Maybe a
-maybeConcat = getOption . foldMap (Option . Just)
-
 -- | Return a range that contains all the ranges in a Foldable, or the passed Range if the Foldable is empty.
 unionRangesFrom :: Foldable f => Range -> f Range -> Range
-unionRangesFrom range = fromMaybe range . maybeConcat
+unionRangesFrom range = maybe range sconcat . nonEmpty . toList
 
 
 -- Instances

src/Renderer/JSON.hs

@@ -119,7 +119,7 @@ syntaxToTermField syntax = case syntax of
   S.Pair a b -> childrenFields [a, b]
   S.Comment _ -> []
   S.Commented comments child -> childrenFields (comments <> maybeToList child)
-  S.Error c -> childrenFields c
+  S.ParseError c -> childrenFields c
   S.For expressions body -> [ "expressions" .= expressions ] <> [ "body" .= body ]
   S.DoWhile expression body -> [ "expression" .= expression ]  <> [ "body" .= body ]
   S.While expression body -> [ "expression" .= expression ]  <> [ "body" .= body ]

src/Renderer/Split.hs

@@ -33,7 +33,7 @@ classifyMarkup category element = (element !) . A.class_ . textValue $ styleName
 styleName :: Category -> Text
 styleName category = "category-" <> case category of
   Program -> "program"
-  C.Error -> "error"
+  C.ParseError -> "error"
   BooleanOperator -> "boolean_operator"
   MathOperator -> "math_operator"
   BitwiseOperator -> "bitwise_operator"

src/SourceSpan.hs

@@ -8,6 +8,7 @@ module SourceSpan where
 
 import Data.Aeson ((.=), (.:))
 import qualified Data.Aeson as A
+import Data.List.NonEmpty (nonEmpty)
 import Data.Semigroup
 import Data.These
 import Prologue
@@ -55,13 +56,7 @@ displayStartEndPos sp =
   displaySourcePos (spanStart sp) <> " - " <> displaySourcePos (spanEnd sp)
 
 unionSourceSpansFrom :: Foldable f => SourceSpan -> f SourceSpan -> SourceSpan
-unionSourceSpansFrom sourceSpan = fromMaybe sourceSpan . maybeConcat
-
-maybeConcat :: (Foldable f, Semigroup a) => f a -> Maybe a
-maybeConcat = getOption . foldMap (Option . Just)
-
-unionSourceSpans :: Foldable f => f SourceSpan -> SourceSpan
-unionSourceSpans = unionSourceSpansFrom emptySourceSpan
+unionSourceSpansFrom sourceSpan = maybe sourceSpan sconcat . nonEmpty . toList
 
 unionSourceSpan :: SourceSpan -> SourceSpan -> SourceSpan
 unionSourceSpan (SourceSpan start1 end1) (SourceSpan start2 end2) = SourceSpan (min start1 start2) (max end1 end2)

src/Syntax.hs

@@ -45,7 +45,7 @@ data Syntax a f
   -- | A subscript access contains a syntax, and another syntax that indefies a property or value in the first syntax.
   -- | e.g. in Javascript x["y"] represents a subscript access syntax.
   | SubscriptAccess { subscriptId :: f, subscriptElement :: f }
-  | Switch { switchExpr :: (Maybe f), cases :: [f] }
+  | Switch { switchExpr :: [f], cases :: [f] }
   | Case { caseExpr :: f, caseStatements :: [f] }
   -- | A default case in a switch statement.
   | DefaultCase [f]
@@ -57,7 +57,7 @@ data Syntax a f
   | Comment a
   -- | A term preceded or followed by any number of comments.
   | Commented [f] (Maybe f)
-  | Error [f]
+  | ParseError [f]
   -- | A for statement has a list of expressions to setup the iteration and then a list of expressions in the body.
   | For [f] [f]
   | DoWhile { doWhileBody :: f, doWhileExpr :: f }
@@ -101,7 +101,7 @@ data Syntax a f
   -- | A field declaration with an optional type, and an optional tag.
   | FieldDecl f (Maybe f) (Maybe f)
   -- | A type.
-  | Ty f
+  | Ty [f]
   -- | A send statement has a channel and an expression in Go.
   | Send f f
   deriving (Eq, Foldable, Functor, Generic, Generic1, Mergeable, Ord, Show, Traversable, ToJSON)
@@ -133,7 +133,7 @@ instance Listable2 Syntax where
     \/ liftCons2 recur recur Pair
     \/ liftCons1 leaf Comment
     \/ liftCons2 (liftTiers recur) (liftTiers recur) Commented
-    \/ liftCons1 (liftTiers recur) Syntax.Error
+    \/ liftCons1 (liftTiers recur) Syntax.ParseError
     \/ liftCons2 (liftTiers recur) (liftTiers recur) For
     \/ liftCons2 recur recur DoWhile
     \/ liftCons2 recur (liftTiers recur) While
@@ -161,7 +161,7 @@ instance Listable2 Syntax where
     \/ liftCons2 (liftTiers recur) recur ParameterDecl
     \/ liftCons2 recur recur TypeDecl
     \/ liftCons3 recur (liftTiers recur) (liftTiers recur) FieldDecl
-    \/ liftCons1 recur Ty
+    \/ liftCons1 (liftTiers recur) Ty
     \/ liftCons2 recur recur Send
     \/ liftCons1 (liftTiers recur) DefaultCase
 

src/TreeSitter.hs

@@ -1,5 +1,8 @@
 {-# LANGUAGE DataKinds #-}
-module TreeSitter (treeSitterParser) where
+module TreeSitter
+( treeSitterParser
+, defaultTermAssignment
+) where
 
 import Prologue hiding (Constructor)
 import Category
@@ -15,6 +18,8 @@ import Source
 import qualified Syntax
 import Foreign
 import Foreign.C.String
+import qualified Syntax as S
+import Term
 import Text.Parser.TreeSitter hiding (Language(..))
 import qualified Text.Parser.TreeSitter as TS
 import SourceSpan
@@ -56,23 +61,73 @@ documentToTerm language document SourceBlob{..} = alloca $ \ root -> do
           -- Without it, we may not evaluate the value 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` sourceSpan `seq` termConstructor source sourceSpan (categoryForLanguageProductionName language (toS name)) range children allChildren
+          range `seq` sourceSpan `seq` assignTerm language (slice range source) (range :. categoryForLanguageProductionName language (toS name) :. sourceSpan :. Nil) 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
-          Language.Go -> Go.termConstructor
-          Ruby -> Ruby.termConstructor
-          _ -> Language.termConstructor
         isNonEmpty child = category (extract child) /= Empty
 
+assignTerm :: Language -> Source Char -> Record '[Range, Category, SourceSpan] -> [ SyntaxTerm Text '[ Range, Category, SourceSpan ] ] -> IO [ SyntaxTerm Text '[ Range, Category, SourceSpan ] ] -> IO (SyntaxTerm Text '[ Range, Category, SourceSpan ])
+assignTerm language source annotation children allChildren =
+  cofree . (annotation :<) <$> case assignTermByLanguage language source (category annotation) children of
+    Just a -> pure a
+    _ -> defaultTermAssignment source (category annotation) children allChildren
+  where assignTermByLanguage :: Language -> Source Char -> Category -> [ SyntaxTerm Text '[ Range, Category, SourceSpan ] ] -> Maybe (S.Syntax Text (SyntaxTerm Text '[ Range, Category, SourceSpan ]))
+        assignTermByLanguage = \case
+          JavaScript -> JS.termAssignment
+          C -> C.termAssignment
+          Language.Go -> Go.termAssignment
+          Ruby -> Ruby.termAssignment
+          _ -> \ _ _ _ -> Nothing
+
+defaultTermAssignment :: Source Char -> Category -> [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -> IO [ SyntaxTerm Text '[Range, Category, SourceSpan] ] -> IO (S.Syntax Text (SyntaxTerm Text '[Range, Category, SourceSpan]))
+defaultTermAssignment source category children allChildren
+  | category `elem` operatorCategories = S.Operator <$> allChildren
+  | otherwise = pure $! case (category, children) of
+    (ParseError, children) -> S.ParseError children
+
+    (Comment, _) -> S.Comment (toText source)
+
+    (Pair, [key, value]) -> S.Pair key value
+
+    -- Control flow statements
+    (If, condition : body) -> S.If condition body
+    (Switch, _) -> uncurry S.Switch (Prologue.break ((== Case) . Info.category . extract) children)
+    (Case, expr : body) -> S.Case expr body
+    (While, expr : rest) -> S.While expr rest
+
+    -- Statements
+    (Return, _) -> S.Return children
+    (Yield, _) -> S.Yield children
+    (Throw, [expr]) -> S.Throw expr
+    (Break, [label]) -> S.Break (Just label)
+    (Break, []) -> S.Break Nothing
+    (Continue, [label]) -> S.Continue (Just label)
+    (Continue, []) -> S.Continue Nothing
+
+    (_, []) -> S.Leaf (toText source)
+    (_, children) -> S.Indexed children
+  where operatorCategories =
+          [ Operator
+          , Binary
+          , Unary
+          , RangeExpression
+          , ScopeOperator
+          , BooleanOperator
+          , MathOperator
+          , RelationalOperator
+          , BitwiseOperator
+          ]
+
+
 categoryForLanguageProductionName :: Language -> Text -> Category
-categoryForLanguageProductionName = \case
+categoryForLanguageProductionName = withDefaults . \case
   JavaScript -> JS.categoryForJavaScriptProductionName
   C -> C.categoryForCProductionName
   Ruby -> Ruby.categoryForRubyName
   Language.Go -> Go.categoryForGoName
   _ -> Other
+  where withDefaults productionMap = \case
+          "ERROR" -> ParseError
+          s -> productionMap s

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2a8d9f01f7c78b4014cc0cf0057b991673c39dd0..2c7a579aacd6880fb8754faf1c5344053d1c2d0f"
+    "shas": "26a0f67120f1cf6fc8e13694d29195177fe1040e..c78b61e9c9b8281f97e59c9c8f20975e41409ed6"
 }
 ,{
     "testCaseDescription": "go-array-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'a' type declaration in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2c7a579aacd6880fb8754faf1c5344053d1c2d0f..ec664b52de32519f5ab8e36f4574394f41e4b355"
+    "shas": "c78b61e9c9b8281f97e59c9c8f20975e41409ed6..2309b08e406723f9c132aa816d302bf8cc88ed71"
 }
 ,{
     "testCaseDescription": "go-array-types-replacement-test",
@@ -190,7 +205,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ec664b52de32519f5ab8e36f4574394f41e4b355..faa453789421465ab0581edc344b9b587d4a6085"
+    "shas": "2309b08e406723f9c132aa816d302bf8cc88ed71..c474dfe7ba478f742c76c8ad39a8ea012b94cd0a"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-replacement-test",
@@ -299,7 +314,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "faa453789421465ab0581edc344b9b587d4a6085..28c283b6b69d706d24fa6797e8132b3dc19f77fb"
+    "shas": "c474dfe7ba478f742c76c8ad39a8ea012b94cd0a..00ced47bbecee34a07334faeb92f0093e2de599f"
 }
 ,{
     "testCaseDescription": "go-array-types-delete-insert-test",
@@ -319,7 +334,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' type declaration in the main function"
                 }
             ]
         },
@@ -342,7 +357,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "28c283b6b69d706d24fa6797e8132b3dc19f77fb..b48fc843a07daf06dcd9a8eebb418c6e6c5a3eb0"
+    "shas": "00ced47bbecee34a07334faeb92f0093e2de599f..5ef5fdfe7d8f7c1cd02153ff01390ec3a5261233"
 }
 ,{
     "testCaseDescription": "go-array-types-teardown-test",
@@ -357,12 +372,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -384,5 +414,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b48fc843a07daf06dcd9a8eebb418c6e6c5a3eb0..50b59edcf73e7686cbfc6db242bf00346aebcf11"
+    "shas": "5ef5fdfe7d8f7c1cd02153ff01390ec3a5261233..242b339cd8dd07d6f1232ff7f96ee2eb324516d9"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ce81a7d517fc9a2808b223f5e2ec2b77fd6fad64..500b648128cc717a6a3abe3c3aa11fc82556659e"
+    "shas": "576026694b333d8935d7a3e88a32dbd0ed0b3fa4..e880dbc369823d4b5c4e1643d1301395af59040b"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a1' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'a1' var assignment in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "500b648128cc717a6a3abe3c3aa11fc82556659e..bc51671fc62602f0d5a1e399a8cd0cdd272507dd"
+    "shas": "e880dbc369823d4b5c4e1643d1301395af59040b..b5893374f1fc215bc0e9639fbff6745b22594bc0"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-replacement-test",
@@ -101,7 +116,7 @@
                             ]
                         }
                     },
-                    "summary": "Added '4' in the [...]int array of the 'main' function"
+                    "summary": "Added '4' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -128,7 +143,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '5' in the [...]int array of the 'main' function"
+                    "summary": "Replaced '1' with '5' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -143,7 +158,7 @@
                             ]
                         }
                     },
-                    "summary": "Added '6' in the [...]int array of the 'main' function"
+                    "summary": "Added '6' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -158,7 +173,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted '2' in the [...]int array of the 'main' function"
+                    "summary": "Deleted '2' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -173,7 +188,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted '3' in the [...]int array of the 'main' function"
+                    "summary": "Deleted '3' in the [...]int composite_literal of the 'main' function"
                 }
             ]
         },
@@ -196,7 +211,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bc51671fc62602f0d5a1e399a8cd0cdd272507dd..6a2f0882912e58d2f3e34875a6bb44804d586279"
+    "shas": "b5893374f1fc215bc0e9639fbff6745b22594bc0..235fa8a9d47005f230e6db96c1d2bf4d8e935851"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-replacement-test",
@@ -216,7 +231,7 @@
                             ]
                         }
                     },
-                    "summary": "Added '1' in the [...]int array of the 'main' function"
+                    "summary": "Added '1' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -231,7 +246,7 @@
                             ]
                         }
                     },
-                    "summary": "Added '2' in the [...]int array of the 'main' function"
+                    "summary": "Added '2' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -246,7 +261,7 @@
                             ]
                         }
                     },
-                    "summary": "Added '3' in the [...]int array of the 'main' function"
+                    "summary": "Added '3' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -261,7 +276,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted '4' in the [...]int array of the 'main' function"
+                    "summary": "Deleted '4' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -276,7 +291,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted '5' in the [...]int array of the 'main' function"
+                    "summary": "Deleted '5' in the [...]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -291,7 +306,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted '6' in the [...]int array of the 'main' function"
+                    "summary": "Deleted '6' in the [...]int composite_literal of the 'main' function"
                 }
             ]
         },
@@ -314,7 +329,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6a2f0882912e58d2f3e34875a6bb44804d586279..b8316cf1b4504b16bf1ede60ccd875adbc2f737b"
+    "shas": "235fa8a9d47005f230e6db96c1d2bf4d8e935851..2dce176e86c49d2fd4be864e3a388ac25674f9d1"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-delete-insert-test",
@@ -334,7 +349,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a1' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'a1' var assignment in the main function"
                 }
             ]
         },
@@ -357,7 +372,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b8316cf1b4504b16bf1ede60ccd875adbc2f737b..555892195608bc7b16f133fe3389a59785aa83bf"
+    "shas": "2dce176e86c49d2fd4be864e3a388ac25674f9d1..b98fb6db21b918f40b3caf936b11bb72c07cb9dd"
 }
 ,{
     "testCaseDescription": "go-array-with-implicit-length-teardown-test",
@@ -372,12 +387,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -399,5 +429,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "555892195608bc7b16f133fe3389a59785aa83bf..6e579109cc2a3c535790233b54306a5473f1a55d"
+    "shas": "b98fb6db21b918f40b3caf936b11bb72c07cb9dd..b8e41392436d04ec37de7c7358f5c6f016fc7726"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "091bc58290f6343880a29ef209a9d87aa7a3fcc0..545e6cd93c1d697e514d1fdad37a57f0d937a526"
+    "shas": "65295513fb69f053f466c62e25b12d37872a7543..90d5492eca694a1db6462f9037889549357c3854"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'a' assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,22 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' var assignment in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                1
-                            ],
-                            "end": [
-                                5,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'c' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'b, c' assignment in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'd' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'd' assignment in the main function"
                 },
                 {
                     "span": {
@@ -118,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'e' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'e' assignment in the main function"
                 }
             ]
         },
@@ -144,7 +144,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "545e6cd93c1d697e514d1fdad37a57f0d937a526..e0bbb0f31468f4684ee8e2777fc8993596caa1f0"
+    "shas": "90d5492eca694a1db6462f9037889549357c3854..98ea82656603de04b6b95f411bdcfd58b63e189e"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-replacement-test",
@@ -176,7 +176,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the x var assignment of the 'main' function"
+                    "summary": "Replaced the 'a' identifier with the 'x' identifier in an assignment to x of the 'main' function"
                 },
                 {
                     "span": {
@@ -203,22 +203,34 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the y var assignment of the 'main' function"
+                    "summary": "Replaced the 'b' identifier with the 'y' identifier in an assignment to y, c of the 'main' function"
                 },
                 {
                     "span": {
-                        "insert": {
-                            "start": [
-                                6,
-                                1
-                            ],
-                            "end": [
-                                6,
-                                7
-                            ]
-                        }
+                        "replace": [
+                            {
+                                "start": [
+                                    6,
+                                    1
+                                ],
+                                "end": [
+                                    6,
+                                    2
+                                ]
+                            },
+                            {
+                                "start": [
+                                    6,
+                                    1
+                                ],
+                                "end": [
+                                    6,
+                                    2
+                                ]
+                            }
+                        ]
                     },
-                    "summary": "Added the 'z' var assignment in the main function of the 'main' module"
+                    "summary": "Replaced the 'd' identifier with the 'z' identifier in an assignment to z of the 'main' function"
                 },
                 {
                     "span": {
@@ -233,22 +245,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'h' var assignment in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                6,
-                                1
-                            ],
-                            "end": [
-                                6,
-                                7
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'd' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'h' assignment in the main function"
                 },
                 {
                     "span": {
@@ -263,7 +260,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'e' assignment in the main function"
                 }
             ]
         },
@@ -292,7 +289,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e0bbb0f31468f4684ee8e2777fc8993596caa1f0..284fe9eeee9487470f4e11d93047de38ef682b7e"
+    "shas": "98ea82656603de04b6b95f411bdcfd58b63e189e..4130e7b48740376e3b3e44d8c622245374813a1f"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-delete-replacement-test",
@@ -324,7 +321,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x' identifier with the 'a' identifier in the a var assignment of the 'main' function"
+                    "summary": "Replaced the 'x' identifier with the 'a' identifier in an assignment to a of the 'main' function"
                 },
                 {
                     "span": {
@@ -351,76 +348,49 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'y' identifier with the 'b' identifier in the b var assignment of the 'main' function"
+                    "summary": "Replaced the 'y' identifier with the 'b' identifier in an assignment to b, c of the 'main' function"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    6,
+                                    1
+                                ],
+                                "end": [
+                                    6,
+                                    2
+                                ]
+                            },
+                            {
+                                "start": [
+                                    6,
+                                    1
+                                ],
+                                "end": [
+                                    6,
+                                    2
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'z' identifier with the 'd' identifier in an assignment to d of the 'main' function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                6,
+                                7,
                                 1
                             ],
                             "end": [
-                                6,
+                                7,
                                 7
                             ]
                         }
                     },
-                    "summary": "Added the 'd' var assignment in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    6,
-                                    1
-                                ],
-                                "end": [
-                                    6,
-                                    2
-                                ]
-                            },
-                            {
-                                "start": [
-                                    7,
-                                    1
-                                ],
-                                "end": [
-                                    7,
-                                    2
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the 'z' identifier with the 'e' identifier in the e var assignment of the 'main' function"
-                },
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    6,
-                                    6
-                                ],
-                                "end": [
-                                    6,
-                                    7
-                                ]
-                            },
-                            {
-                                "start": [
-                                    7,
-                                    6
-                                ],
-                                "end": [
-                                    7,
-                                    7
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced '3' with '1' in the e var assignment of the 'main' function"
+                    "summary": "Added the 'e' assignment in the main function"
                 },
                 {
                     "span": {
@@ -435,7 +405,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'h' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'h' assignment in the main function"
                 }
             ]
         },
@@ -464,7 +434,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "284fe9eeee9487470f4e11d93047de38ef682b7e..6ab478bb986f0227f287e5128a038117685d82f0"
+    "shas": "4130e7b48740376e3b3e44d8c622245374813a1f..67ba411108a71a2f98e7bc597e4178dbcfac0031"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-delete-insert-test",
@@ -484,7 +454,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' assignment in the main function"
                 },
                 {
                     "span": {
@@ -499,22 +469,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' var assignment in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                1
-                            ],
-                            "end": [
-                                5,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'c' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'b, c' assignment in the main function"
                 },
                 {
                     "span": {
@@ -529,7 +484,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'd' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'd' assignment in the main function"
                 },
                 {
                     "span": {
@@ -544,7 +499,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'e' assignment in the main function"
                 }
             ]
         },
@@ -570,7 +525,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6ab478bb986f0227f287e5128a038117685d82f0..6963690336efde9f4763222a83afe4ce714bf5e7"
+    "shas": "67ba411108a71a2f98e7bc597e4178dbcfac0031..36092fdf255e0236862c27135098a4fa4e9dbd75"
 }
 ,{
     "testCaseDescription": "go-assignment-statements-teardown-test",
@@ -585,12 +540,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -612,5 +582,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6963690336efde9f4763222a83afe4ce714bf5e7..2d4500613c50791e41a932edd1885da8e9830f8e"
+    "shas": "36092fdf255e0236862c27135098a4fa4e9dbd75..3f2a09bd95dfbff3712c14095a53c1f0a3855648"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "47074688bbb73b3e4bf4fe48f221e411e5a9dcae..0bed7aaac9a7223bee7e747c7e956609d61b142f"
+    "shas": "d5f8f49ab00e91cf9cf8a71dd94c14b3fa29aad8..0f348f4e761af93c4036be91a81c370254edab79"
 }
 ,{
     "testCaseDescription": "go-call-expressions-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'x(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'y(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'y(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'z(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'z(b, c)' function call in the main function"
                 }
             ]
         },
@@ -113,7 +128,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0bed7aaac9a7223bee7e747c7e956609d61b142f..aba38b132e19f43e2dbbe7c9f084f7e89348a63f"
+    "shas": "0f348f4e761af93c4036be91a81c370254edab79..8032ef9f0136e422475ec94f40416071beacb1b3"
 }
 ,{
     "testCaseDescription": "go-call-expressions-replacement-test",
@@ -133,7 +148,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'a(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -148,7 +163,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'b(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -163,7 +178,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'c(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -178,7 +193,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'x(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -193,7 +208,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'y(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'y(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -208,7 +223,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'z(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'z(b, c)' function call in the main function"
                 }
             ]
         },
@@ -235,7 +250,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "aba38b132e19f43e2dbbe7c9f084f7e89348a63f..a75e3fa8a8d7ff7860d1e63172a25e15146f8970"
+    "shas": "8032ef9f0136e422475ec94f40416071beacb1b3..8dda64263242afa2d8deb5d25140852ebfb07b71"
 }
 ,{
     "testCaseDescription": "go-call-expressions-delete-replacement-test",
@@ -255,7 +270,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'x(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -270,7 +285,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'y(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'y(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -285,7 +300,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'z(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'z(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -300,7 +315,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'a(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -315,7 +330,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'b(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -330,7 +345,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'c(b, c)' function call in the main function"
                 }
             ]
         },
@@ -357,7 +372,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a75e3fa8a8d7ff7860d1e63172a25e15146f8970..a954830b0bda0e385a0a8eb61e6e4a123d2dfb66"
+    "shas": "8dda64263242afa2d8deb5d25140852ebfb07b71..dd71d5503cc5e5b1f7e85ccabd36d64c891e48d2"
 }
 ,{
     "testCaseDescription": "go-call-expressions-delete-insert-test",
@@ -377,7 +392,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'x(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -392,7 +407,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'y(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'y(b, c)' function call in the main function"
                 },
                 {
                     "span": {
@@ -407,7 +422,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'z(b, c)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'z(b, c)' function call in the main function"
                 }
             ]
         },
@@ -432,7 +447,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a954830b0bda0e385a0a8eb61e6e4a123d2dfb66..d5de8ed9734efb140a7bb970951f13a1ca345dad"
+    "shas": "dd71d5503cc5e5b1f7e85ccabd36d64c891e48d2..a9a077abbee74593f4f64c4491602102a47e0f0d"
 }
 ,{
     "testCaseDescription": "go-call-expressions-teardown-test",
@@ -447,12 +462,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -474,5 +504,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d5de8ed9734efb140a7bb970951f13a1ca345dad..a5f99e0c9f8b9b96e1f64f8b5fd79ed8c9490ebd"
+    "shas": "a9a077abbee74593f4f64c4491602102a47e0f0d..cbd953ad26bc63e3ddd57f753a0d7bf09ed21706"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d294ce5018da872a8921d3401c507217daf06328..c54949d55a43937b2ac33296ac3b5cecb50d6382"
+    "shas": "840ffcc3fb49c5769944cce7b4fc8f444c2b1aed..30e5ee71dd288a98026159bc4762ba813caf1e5a"
 }
 ,{
     "testCaseDescription": "go-case-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added a switch statement in the main function of the 'main' module"
+                    "summary": "Added a switch statement in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c54949d55a43937b2ac33296ac3b5cecb50d6382..c215ea9b6a3b10e2eaa8ae424350795e9f093004"
+    "shas": "30e5ee71dd288a98026159bc4762ba813caf1e5a..a7af99836429ee5953956b39612d30c98099952d"
 }
 ,{
     "testCaseDescription": "go-case-statements-replacement-test",
@@ -93,15 +108,15 @@
                         "insert": {
                             "start": [
                                 4,
-                                1
+                                10
                             ],
                             "end": [
                                 4,
-                                26
+                                24
                             ]
                         }
                     },
-                    "summary": "Added the 'foo' case statement in a switch statement of the 'main' function"
+                    "summary": "Added the 'case foo' case statement in a switch statement of the 'main' function"
                 }
             ]
         },
@@ -124,7 +139,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c215ea9b6a3b10e2eaa8ae424350795e9f093004..7d12abcf1f4702639d6e7363776cfdf6598491b7"
+    "shas": "a7af99836429ee5953956b39612d30c98099952d..ce974189409e1cc2547615421f390b953e234699"
 }
 ,{
     "testCaseDescription": "go-case-statements-delete-replacement-test",
@@ -136,15 +151,15 @@
                         "delete": {
                             "start": [
                                 4,
-                                1
+                                10
                             ],
                             "end": [
                                 4,
-                                26
+                                24
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo' case statement in a switch statement of the 'main' function"
+                    "summary": "Deleted the 'case foo' case statement in a switch statement of the 'main' function"
                 }
             ]
         },
@@ -167,7 +182,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7d12abcf1f4702639d6e7363776cfdf6598491b7..e7a7b4af3503fe63d5a954f7b5576a09d2185778"
+    "shas": "ce974189409e1cc2547615421f390b953e234699..84d84920f7bcdff865c2a05d49e6d3d98e633866"
 }
 ,{
     "testCaseDescription": "go-case-statements-delete-insert-test",
@@ -187,7 +202,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted a switch statement in the main function of the 'main' module"
+                    "summary": "Deleted a switch statement in the main function"
                 }
             ]
         },
@@ -210,7 +225,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e7a7b4af3503fe63d5a954f7b5576a09d2185778..4fc08573a3964379df9d9213e239adc5b9048eb5"
+    "shas": "84d84920f7bcdff865c2a05d49e6d3d98e633866..c455ac8dfc52ad0fcd50455429971b6e5814a066"
 }
 ,{
     "testCaseDescription": "go-case-statements-teardown-test",
@@ -225,12 +240,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -252,5 +282,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4fc08573a3964379df9d9213e239adc5b9048eb5..965eb67a3019ef8aea91e5f5a3975bd6c27ddbd5"
+    "shas": "c455ac8dfc52ad0fcd50455429971b6e5814a066..65bbc171b8f70b289f47abe480d261056b5ea251"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ffe628ad363e676d5234caa95a87cf6b7f3626f8..ee8ae407698b4ba69acdd85afb82dcfe2afc2392"
+    "shas": "8ae798e3c9773e3d5b6af35228d06445dd50426f..6fe1a8a05f8eeab5c979450824cdceb0e994abc8"
 }
 ,{
     "testCaseDescription": "go-channel-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c1' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c2' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c3' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c3' type declaration in the main function"
                 }
             ]
         },
@@ -115,7 +130,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ee8ae407698b4ba69acdd85afb82dcfe2afc2392..9c27dde8873170108674ea419a12befe26e5f35a"
+    "shas": "6fe1a8a05f8eeab5c979450824cdceb0e994abc8..61f2e4717656268758d47a3c63c366ab6478f195"
 }
 ,{
     "testCaseDescription": "go-channel-types-replacement-test",
@@ -135,7 +150,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c2' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -150,7 +165,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c3' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c3' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -219,7 +234,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c2' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -234,7 +249,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c3' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c3' type declaration in the main function"
                 }
             ]
         },
@@ -262,7 +277,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9c27dde8873170108674ea419a12befe26e5f35a..6f3368fcd07690cdf7f7d4d61f8eaa947c9e3f15"
+    "shas": "61f2e4717656268758d47a3c63c366ab6478f195..911fb96ddd154bd39c0c4434674776d5c08202f2"
 }
 ,{
     "testCaseDescription": "go-channel-types-delete-replacement-test",
@@ -282,7 +297,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c1' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -351,7 +366,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c4' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c4' type declaration in the main function"
                 }
             ]
         },
@@ -379,7 +394,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6f3368fcd07690cdf7f7d4d61f8eaa947c9e3f15..fd1261f44224fa51c15b3a11b47a0cd38e79a9b7"
+    "shas": "911fb96ddd154bd39c0c4434674776d5c08202f2..d31e3bb2f6b29b37edbb1c325a5511c763a405d1"
 }
 ,{
     "testCaseDescription": "go-channel-types-delete-insert-test",
@@ -399,7 +414,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c1' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -414,7 +429,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c2' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -429,7 +444,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c3' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c3' type declaration in the main function"
                 }
             ]
         },
@@ -456,7 +471,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fd1261f44224fa51c15b3a11b47a0cd38e79a9b7..492604fdcd016b630b1c780e3593d58aeb587a5b"
+    "shas": "d31e3bb2f6b29b37edbb1c325a5511c763a405d1..e9f2625fc7ae3bb80505b2f21de51da17d92d883"
 }
 ,{
     "testCaseDescription": "go-channel-types-teardown-test",
@@ -471,12 +486,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -498,5 +528,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "492604fdcd016b630b1c780e3593d58aeb587a5b..cc8aac0f8db0de4e459571ae4c68771e7c442c63"
+    "shas": "e9f2625fc7ae3bb80505b2f21de51da17d92d883..190f44e86419bb122daf395748920e3c5779b66b"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,30 +53,12 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d6bf5b852da48acbbdc8d627de9e645d28d7f38d..72de8c7f39e9b0669a38c1babcdffcff64e96ea5"
+    "shas": "67d576bfc545aeab08b6970a41866b4643831ec5..9c970f2efc403f74275b43a78017615dc8d96d34"
 }
 ,{
     "testCaseDescription": "go-comment-insert-test",
     "expectedResult": {
-        "changes": {
-            "comment.go": [
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                4,
-                                1
-                            ],
-                            "end": [
-                                4,
-                                21
-                            ]
-                        }
-                    },
-                    "summary": "Added the '// this is a comment' comment in the main function of the 'main' module"
-                }
-            ]
-        },
+        "changes": {},
         "errors": {}
     },
     "filePaths": [
@@ -81,42 +78,12 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "72de8c7f39e9b0669a38c1babcdffcff64e96ea5..52ce6212c93764a59bdb61da67e20b54d3f288c6"
+    "shas": "9c970f2efc403f74275b43a78017615dc8d96d34..10fa1c97aa81bb87a389d1ead5d52eda2754a14b"
 }
 ,{
     "testCaseDescription": "go-comment-replacement-test",
     "expectedResult": {
-        "changes": {
-            "comment.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    4,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    21
-                                ]
-                            },
-                            {
-                                "start": [
-                                    4,
-                                    1
-                                ],
-                                "end": [
-                                    6,
-                                    3
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the '// this is a comment' comment with the '/*\nthis is a block comment\n*/' comment in the main function of the 'main' module"
-                }
-            ]
-        },
+        "changes": {},
         "errors": {}
     },
     "filePaths": [
@@ -138,42 +105,12 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "52ce6212c93764a59bdb61da67e20b54d3f288c6..0224d1c4ae63ed9bc69a5b9da5a691cae9c3b34a"
+    "shas": "10fa1c97aa81bb87a389d1ead5d52eda2754a14b..2fa774b3862130654f8cca4f2be3dac35b209fc5"
 }
 ,{
     "testCaseDescription": "go-comment-delete-replacement-test",
     "expectedResult": {
-        "changes": {
-            "comment.go": [
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    4,
-                                    1
-                                ],
-                                "end": [
-                                    6,
-                                    3
-                                ]
-                            },
-                            {
-                                "start": [
-                                    4,
-                                    1
-                                ],
-                                "end": [
-                                    4,
-                                    21
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced the '/*\nthis is a block comment\n*/' comment with the '// this is a comment' comment in the main function of the 'main' module"
-                }
-            ]
-        },
+        "changes": {},
         "errors": {}
     },
     "filePaths": [
@@ -195,30 +132,12 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0224d1c4ae63ed9bc69a5b9da5a691cae9c3b34a..2dd7c846c7d7ee0360f5421181a1c014158ae61e"
+    "shas": "2fa774b3862130654f8cca4f2be3dac35b209fc5..d406d59cc62f4b839107355542037c763747f90b"
 }
 ,{
     "testCaseDescription": "go-comment-delete-insert-test",
     "expectedResult": {
-        "changes": {
-            "comment.go": [
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                4,
-                                1
-                            ],
-                            "end": [
-                                4,
-                                21
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the '// this is a comment' comment in the main function of the 'main' module"
-                }
-            ]
-        },
+        "changes": {},
         "errors": {}
     },
     "filePaths": [
@@ -238,7 +157,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2dd7c846c7d7ee0360f5421181a1c014158ae61e..3e6d5559211855ffca53000e0b49d8c5d1e68bde"
+    "shas": "d406d59cc62f4b839107355542037c763747f90b..e280c452debf7fa9838e27bbda560e056a973742"
 }
 ,{
     "testCaseDescription": "go-comment-teardown-test",
@@ -253,12 +172,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -280,5 +214,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3e6d5559211855ffca53000e0b49d8c5d1e68bde..ab3e3926dc779249680c1d053599892d614e1cbf"
+    "shas": "e280c452debf7fa9838e27bbda560e056a973742..f5a9b8a54a3841db93e420bf8eff96b4d2d6858a"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "49e6e021a47203dec0d5eef92e0afd35f24628a1..d888fa9002a01cd57957e18377a0498dd5f67341"
+    "shas": "4a6aceb384ae2a8fd0779a62812d50a760f55bda..9b5af2a7e62ee2d129c735f56cc34b089c706020"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-insert-test",
@@ -52,13 +67,43 @@
                                 4,
                                 7
                             ],
+                            "end": [
+                                4,
+                                11
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'zero' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                12
+                            ],
+                            "end": [
+                                4,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'int' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                18
+                            ],
                             "end": [
                                 4,
                                 19
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Added '0' in the main function"
                 }
             ]
         },
@@ -81,7 +126,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d888fa9002a01cd57957e18377a0498dd5f67341..04775f661102a38b009cb92e1ac97e69c3b8a279"
+    "shas": "9b5af2a7e62ee2d129c735f56cc34b089c706020..e1177c66dfe74dd4143ee6ac133bdd25f82e5786"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-replacement-test",
@@ -113,7 +158,49 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one var assignment of the 'main' function"
+                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                12
+                            ],
+                            "end": [
+                                4,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'two' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    4,
+                                    12
+                                ],
+                                "end": [
+                                    4,
+                                    15
+                                ]
+                            },
+                            {
+                                "start": [
+                                    4,
+                                    16
+                                ],
+                                "end": [
+                                    4,
+                                    23
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'int' identifier with the 'uiint64' identifier in the main function"
                 },
                 {
                     "span": {
@@ -140,14 +227,14 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '0' with '1' in the one var assignment of the 'main' function"
+                    "summary": "Replaced '0' with '1' in the main function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
                                 4,
-                                7
+                                29
                             ],
                             "end": [
                                 4,
@@ -155,7 +242,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Added '2' in the main function"
                 }
             ]
         },
@@ -178,7 +265,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "04775f661102a38b009cb92e1ac97e69c3b8a279..8837603403d627dfaafe8982de7f1b4783ce3fe5"
+    "shas": "e1177c66dfe74dd4143ee6ac133bdd25f82e5786..70e5c6a4cfe3fb36ce3d1ff158e8f303d04d8f95"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-replacement-test",
@@ -210,7 +297,49 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero var assignment of the 'main' function"
+                    "summary": "Replaced the 'one' identifier with the 'zero' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                12
+                            ],
+                            "end": [
+                                4,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'two' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    4,
+                                    16
+                                ],
+                                "end": [
+                                    4,
+                                    23
+                                ]
+                            },
+                            {
+                                "start": [
+                                    4,
+                                    12
+                                ],
+                                "end": [
+                                    4,
+                                    15
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced the 'uiint64' identifier with the 'int' identifier in the main function"
                 },
                 {
                     "span": {
@@ -237,14 +366,14 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '1' with '0' in the zero var assignment of the 'main' function"
+                    "summary": "Replaced '1' with '0' in the main function"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
                                 4,
-                                7
+                                29
                             ],
                             "end": [
                                 4,
@@ -252,7 +381,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the main function"
                 }
             ]
         },
@@ -275,7 +404,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8837603403d627dfaafe8982de7f1b4783ce3fe5..687838a4cbf247779e1fa5a133b868839b4d6f8c"
+    "shas": "70e5c6a4cfe3fb36ce3d1ff158e8f303d04d8f95..df53cc08219f7164eb848225b84a7baa8f519650"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-delete-insert-test",
@@ -289,13 +418,43 @@
                                 4,
                                 7
                             ],
+                            "end": [
+                                4,
+                                11
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'zero' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                12
+                            ],
+                            "end": [
+                                4,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'int' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                18
+                            ],
                             "end": [
                                 4,
                                 19
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '0' in the main function"
                 }
             ]
         },
@@ -318,7 +477,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "687838a4cbf247779e1fa5a133b868839b4d6f8c..67348ad5cb4f13aa0f0d2b14b092f9747b950b0f"
+    "shas": "df53cc08219f7164eb848225b84a7baa8f519650..411866d01813ed979fa88a20ba91c74073c361cb"
 }
 ,{
     "testCaseDescription": "go-const-declarations-with-types-teardown-test",
@@ -333,12 +492,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -360,5 +534,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "67348ad5cb4f13aa0f0d2b14b092f9747b950b0f..d7c7c21bb12a3b1d9bc3d7ac212a3bdada677d71"
+    "shas": "411866d01813ed979fa88a20ba91c74073c361cb..9c509bdfabb537255c810cd09cf45b53bf65628f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "802da3fcac3bb5bd8d87025c78e2dd27694ea5c4..ec2a7031fea2ff0233a9e1c9fe24a97d924abfea"
+    "shas": "bda742d270e92cc83a8a8f229714661cfae58fee..8fae5b68a9e2dc9d3f96f39c86521f932addd607"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'zero' var assignment in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ec2a7031fea2ff0233a9e1c9fe24a97d924abfea..4214dd04363c5d7668acb7f4468a4cdb8da3a931"
+    "shas": "8fae5b68a9e2dc9d3f96f39c86521f932addd607..136dc284d185b35d4482cd64e0c82e1ae86df6d5"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-replacement-test",
@@ -113,7 +128,22 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one var assignment of the 'main' function"
+                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one, two var assignment of the 'main' function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                12
+                            ],
+                            "end": [
+                                4,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'two' identifier in the one, two var assignment of the 'main' function"
                 },
                 {
                     "span": {
@@ -140,14 +170,14 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '0' with '1' in the one var assignment of the 'main' function"
+                    "summary": "Replaced '0' with '1' in the one, two var assignment of the 'main' function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
                                 4,
-                                7
+                                21
                             ],
                             "end": [
                                 4,
@@ -155,7 +185,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Added '2' in the one, two var assignment of the 'main' function"
                 }
             ]
         },
@@ -178,7 +208,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4214dd04363c5d7668acb7f4468a4cdb8da3a931..4ea74b4fbd9a5a19f10019dcd75e772aad148469"
+    "shas": "136dc284d185b35d4482cd64e0c82e1ae86df6d5..a5bc508cdc3816266f5896654a06d90c8372a929"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-replacement-test",
@@ -212,6 +242,21 @@
                     },
                     "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero var assignment of the 'main' function"
                 },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                12
+                            ],
+                            "end": [
+                                4,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'two' identifier in the zero var assignment of the 'main' function"
+                },
                 {
                     "span": {
                         "replace": [
@@ -244,7 +289,7 @@
                         "delete": {
                             "start": [
                                 4,
-                                7
+                                21
                             ],
                             "end": [
                                 4,
@@ -252,7 +297,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the zero var assignment of the 'main' function"
                 }
             ]
         },
@@ -275,7 +320,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4ea74b4fbd9a5a19f10019dcd75e772aad148469..ad9ba646f6304dddedc688f25eb07527ada8874a"
+    "shas": "a5bc508cdc3816266f5896654a06d90c8372a929..eeec9538fdf788ff7220f7c45e18723c8f8c6213"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-delete-insert-test",
@@ -295,7 +340,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'zero' var assignment in the main function"
                 }
             ]
         },
@@ -318,7 +363,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ad9ba646f6304dddedc688f25eb07527ada8874a..cc7080fad53918620542bcf3106f75416db8009c"
+    "shas": "eeec9538fdf788ff7220f7c45e18723c8f8c6213..cb36960674fd5af8ce3bb29a4050ad30c517af4a"
 }
 ,{
     "testCaseDescription": "go-const-declarations-without-types-teardown-test",
@@ -333,12 +378,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -360,5 +420,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cc7080fad53918620542bcf3106f75416db8009c..49e6e021a47203dec0d5eef92e0afd35f24628a1"
+    "shas": "cb36960674fd5af8ce3bb29a4050ad30c517af4a..4a6aceb384ae2a8fd0779a62812d50a760f55bda"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cbaa77e08635ce41d412574590df4152cae3e4bc..e0c8f19fd1c161ea882f3f342c32cffec193ec12"
+    "shas": "8b23ffed2230fe0c2e75c1a02c179c9ff1726d8f..937443c336d969595e6a83ebc8db77307b5961da"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'zero' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'one' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'one' identifier in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'two' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'two' identifier in the main function"
                 }
             ]
         },
@@ -115,7 +130,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e0c8f19fd1c161ea882f3f342c32cffec193ec12..cdd8a3bc77b30595aa011aa0c1b0de5421c7ad7f"
+    "shas": "937443c336d969595e6a83ebc8db77307b5961da..389c40207cfccd6a33e8ade86a25334277f5c378"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-replacement-test",
@@ -174,7 +189,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -201,7 +216,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the main function"
                 }
             ]
         },
@@ -229,7 +244,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cdd8a3bc77b30595aa011aa0c1b0de5421c7ad7f..6f35b88ea479e8069a61e7cb6615e8932d6898de"
+    "shas": "389c40207cfccd6a33e8ade86a25334277f5c378..efbb02340a4f156d3ca28e917ddb684999f88c29"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-replacement-test",
@@ -288,7 +303,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the main function"
                 },
                 {
                     "span": {
@@ -315,7 +330,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the main function"
                 }
             ]
         },
@@ -343,7 +358,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6f35b88ea479e8069a61e7cb6615e8932d6898de..8956f659859ecfc3c8399d8d7b60825aeee2aebf"
+    "shas": "efbb02340a4f156d3ca28e917ddb684999f88c29..eec730b7debfaa8297c9b4563171986277737960"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-delete-insert-test",
@@ -363,7 +378,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'zero' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -378,7 +393,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'one' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'one' identifier in the main function"
                 },
                 {
                     "span": {
@@ -393,7 +408,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'two' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'two' identifier in the main function"
                 }
             ]
         },
@@ -420,7 +435,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8956f659859ecfc3c8399d8d7b60825aeee2aebf..55a0deb4c32a514960cfc33bae65b4c42e5c3a11"
+    "shas": "eec730b7debfaa8297c9b4563171986277737960..4e2c650c7a3af1c7b5e5a22da3548d002c9ad050"
 }
 ,{
     "testCaseDescription": "go-const-with-implicit-values-teardown-test",
@@ -435,12 +450,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -462,5 +492,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "55a0deb4c32a514960cfc33bae65b4c42e5c3a11..e18c5b5c1ca8b1a73b3c2e745671fc99a77f14af"
+    "shas": "4e2c650c7a3af1c7b5e5a22da3548d002c9ad050..024afce27e9882ceae4b057bb8bfb8586761a13f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e18c5b5c1ca8b1a73b3c2e745671fc99a77f14af..25fba0aed3ea4c1773ec3549eaff40d913c079d1"
+    "shas": "024afce27e9882ceae4b057bb8bfb8586761a13f..6fc6c8edcc929af03c8663dc5e5aa3ee5370202c"
 }
 ,{
     "testCaseDescription": "go-constructors-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'make(chan<- int)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'make(chan<- int)' function call in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'make(chan<- int, …)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'make(chan<- int, …)' function call in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'make(chan<- int, 5, 10)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'make(chan<- int, 5, 10)' function call in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'new(…)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'new(…)' function call in the main function"
                 }
             ]
         },
@@ -129,7 +144,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "25fba0aed3ea4c1773ec3549eaff40d913c079d1..e63a03ba5fd522be40676c7ab9df3fa580a42ce1"
+    "shas": "6fc6c8edcc929af03c8663dc5e5aa3ee5370202c..e4b0010eb1c1c21136301481d464e9c4b3c114ae"
 }
 ,{
     "testCaseDescription": "go-constructors-replacement-test",
@@ -352,7 +367,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e63a03ba5fd522be40676c7ab9df3fa580a42ce1..663d1012955d9772510ea5a37c0e4875dca5ae3b"
+    "shas": "e4b0010eb1c1c21136301481d464e9c4b3c114ae..56b8228e835ad78277d22d4148192e2ad4111abd"
 }
 ,{
     "testCaseDescription": "go-constructors-delete-replacement-test",
@@ -575,7 +590,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "663d1012955d9772510ea5a37c0e4875dca5ae3b..a87fbe18288708a89f31aea5f2dfbe4469bd6440"
+    "shas": "56b8228e835ad78277d22d4148192e2ad4111abd..ace430b5760091e3c1bb339eb0452bc93a155e10"
 }
 ,{
     "testCaseDescription": "go-constructors-delete-insert-test",
@@ -595,7 +610,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'make(chan<- int)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'make(chan<- int)' function call in the main function"
                 },
                 {
                     "span": {
@@ -610,7 +625,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'make(chan<- int, …)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'make(chan<- int, …)' function call in the main function"
                 },
                 {
                     "span": {
@@ -625,7 +640,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'make(chan<- int, 5, 10)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'make(chan<- int, 5, 10)' function call in the main function"
                 },
                 {
                     "span": {
@@ -640,7 +655,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'new(…)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'new(…)' function call in the main function"
                 }
             ]
         },
@@ -666,7 +681,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a87fbe18288708a89f31aea5f2dfbe4469bd6440..234571e05897ca34177bb1df91bb9beee6be2258"
+    "shas": "ace430b5760091e3c1bb339eb0452bc93a155e10..a5327fc1a6f44c26f33075bb2f294b406574c8a3"
 }
 ,{
     "testCaseDescription": "go-constructors-teardown-test",
@@ -681,12 +696,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -708,5 +738,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "234571e05897ca34177bb1df91bb9beee6be2258..92abc0a7c86e4fde9374babdb2efcd398d27f6ac"
+    "shas": "a5327fc1a6f44c26f33075bb2f294b406574c8a3..eca7c6083f4f3169ebc3bf726c3d936818a2d174"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bd47547e797a6e76a34e259077fc32181d6667f5..f5e354dad5a3fbf87368c8d94c2a5f3afe01144b"
+    "shas": "6ea06aa1e8431651d63087d1f623f409947a25f1..a03d106f4668e2d39bf52c3e278b68cf682165b1"
 }
 ,{
     "testCaseDescription": "go-float-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f1' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'f1' assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f2' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'f2' assignment in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f3' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'f3' assignment in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f4' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'f4' assignment in the main function"
                 },
                 {
                     "span": {
@@ -118,7 +133,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f5' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'f5' assignment in the main function"
                 }
             ]
         },
@@ -145,7 +160,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f5e354dad5a3fbf87368c8d94c2a5f3afe01144b..6bffa6e449c92bd384ef85d90fd502ae13553a94"
+    "shas": "a03d106f4668e2d39bf52c3e278b68cf682165b1..841ab7a1e0173f62bcb428551152d9d47f123025"
 }
 ,{
     "testCaseDescription": "go-float-literals-replacement-test",
@@ -154,138 +169,153 @@
             "float-literals.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    4,
-                                    6
-                                ],
-                                "end": [
-                                    4,
-                                    9
-                                ]
-                            },
-                            {
-                                "start": [
-                                    4,
-                                    6
-                                ],
-                                "end": [
-                                    4,
-                                    9
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                9
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '1.5' float with the '2.6' float in the f1 var assignment of the 'main' function"
+                    "summary": "Added the 'f1' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    5,
-                                    6
-                                ],
-                                "end": [
-                                    5,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    5,
-                                    6
-                                ],
-                                "end": [
-                                    5,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                13
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '1.5e100' float with the '2.6e211' float in the f2 var assignment of the 'main' function"
+                    "summary": "Added the 'f2' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    6,
-                                    6
-                                ],
-                                "end": [
-                                    6,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    6,
-                                    6
-                                ],
-                                "end": [
-                                    6,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                6,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                13
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '1.5e+50' float with the '2.6e+60' float in the f3 var assignment of the 'main' function"
+                    "summary": "Added the 'f3' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    7,
-                                    6
-                                ],
-                                "end": [
-                                    7,
-                                    12
-                                ]
-                            },
-                            {
-                                "start": [
-                                    7,
-                                    6
-                                ],
-                                "end": [
-                                    7,
-                                    12
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                7,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                12
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '1.5e-5' float with the '2.6e-7' float in the f4 var assignment of the 'main' function"
+                    "summary": "Added the 'f4' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    8,
-                                    6
-                                ],
-                                "end": [
-                                    8,
-                                    12
-                                ]
-                            },
-                            {
-                                "start": [
-                                    8,
-                                    6
-                                ],
-                                "end": [
-                                    8,
-                                    12
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                8,
+                                1
+                            ],
+                            "end": [
+                                8,
+                                12
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '.5e-50' float with the '.6e-60' float in the f5 var assignment of the 'main' function"
+                    "summary": "Added the 'f5' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f1' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f2' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                6,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f3' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                7,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f4' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                1
+                            ],
+                            "end": [
+                                8,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f5' assignment in the main function"
                 }
             ]
         },
@@ -316,7 +346,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6bffa6e449c92bd384ef85d90fd502ae13553a94..be9a2fd6304558d0123d42b545eb6de27b3d7e58"
+    "shas": "841ab7a1e0173f62bcb428551152d9d47f123025..5e8653295137112c6645a93a98308e0c690247b7"
 }
 ,{
     "testCaseDescription": "go-float-literals-delete-replacement-test",
@@ -325,138 +355,153 @@
             "float-literals.go": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    4,
-                                    6
-                                ],
-                                "end": [
-                                    4,
-                                    9
-                                ]
-                            },
-                            {
-                                "start": [
-                                    4,
-                                    6
-                                ],
-                                "end": [
-                                    4,
-                                    9
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                9
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '2.6' float with the '1.5' float in the f1 var assignment of the 'main' function"
+                    "summary": "Added the 'f1' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    5,
-                                    6
-                                ],
-                                "end": [
-                                    5,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    5,
-                                    6
-                                ],
-                                "end": [
-                                    5,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                13
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '2.6e211' float with the '1.5e100' float in the f2 var assignment of the 'main' function"
+                    "summary": "Added the 'f2' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    6,
-                                    6
-                                ],
-                                "end": [
-                                    6,
-                                    13
-                                ]
-                            },
-                            {
-                                "start": [
-                                    6,
-                                    6
-                                ],
-                                "end": [
-                                    6,
-                                    13
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                6,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                13
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '2.6e+60' float with the '1.5e+50' float in the f3 var assignment of the 'main' function"
+                    "summary": "Added the 'f3' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    7,
-                                    6
-                                ],
-                                "end": [
-                                    7,
-                                    12
-                                ]
-                            },
-                            {
-                                "start": [
-                                    7,
-                                    6
-                                ],
-                                "end": [
-                                    7,
-                                    12
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                7,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                12
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '2.6e-7' float with the '1.5e-5' float in the f4 var assignment of the 'main' function"
+                    "summary": "Added the 'f4' assignment in the main function"
                 },
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    8,
-                                    6
-                                ],
-                                "end": [
-                                    8,
-                                    12
-                                ]
-                            },
-                            {
-                                "start": [
-                                    8,
-                                    6
-                                ],
-                                "end": [
-                                    8,
-                                    12
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                8,
+                                1
+                            ],
+                            "end": [
+                                8,
+                                12
+                            ]
+                        }
                     },
-                    "summary": "Replaced the '.6e-60' float with the '.5e-50' float in the f5 var assignment of the 'main' function"
+                    "summary": "Added the 'f5' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f1' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f2' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                6,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f3' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                7,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f4' assignment in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                1
+                            ],
+                            "end": [
+                                8,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f5' assignment in the main function"
                 }
             ]
         },
@@ -487,7 +532,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "be9a2fd6304558d0123d42b545eb6de27b3d7e58..eba46660d9fd1d6bcb4320bbcabd63ef2f97de45"
+    "shas": "5e8653295137112c6645a93a98308e0c690247b7..371f187f2f1bf7fb9a1feff41ea8d1d6c4d3e25e"
 }
 ,{
     "testCaseDescription": "go-float-literals-delete-insert-test",
@@ -507,7 +552,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f1' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'f1' assignment in the main function"
                 },
                 {
                     "span": {
@@ -522,7 +567,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f2' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'f2' assignment in the main function"
                 },
                 {
                     "span": {
@@ -537,7 +582,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f3' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'f3' assignment in the main function"
                 },
                 {
                     "span": {
@@ -552,7 +597,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f4' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'f4' assignment in the main function"
                 },
                 {
                     "span": {
@@ -567,7 +612,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f5' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'f5' assignment in the main function"
                 }
             ]
         },
@@ -594,7 +639,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "eba46660d9fd1d6bcb4320bbcabd63ef2f97de45..bcccf71a9ce250474dd60b0f6d2b6361c4e83b03"
+    "shas": "371f187f2f1bf7fb9a1feff41ea8d1d6c4d3e25e..e1f25ce6d6735b3b0590d3cf21f59bb32675ff2d"
 }
 ,{
     "testCaseDescription": "go-float-literals-teardown-test",
@@ -609,12 +654,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -636,5 +696,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bcccf71a9ce250474dd60b0f6d2b6361c4e83b03..39b5a7d4eaa477c3d1636e32ab2c5cf5c930372a"
+    "shas": "e1f25ce6d6735b3b0590d3cf21f59bb32675ff2d..663f0278d8c41aca54ae0d1849efc76213f9ba1f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a759987355f2393c92a9df39d4c9e56a2ea2ce19..96a05e960540a57f232ce834347a05b414d55d05"
+    "shas": "030876029c6aa56a60b06740ec65bec788ad8715..e273179f5e9abd6bc426d0dabf1d847d9fc3e4f6"
 }
 ,{
     "testCaseDescription": "go-for-statements-insert-test",
@@ -49,16 +64,31 @@
                     "span": {
                         "insert": {
                             "start": [
-                                4,
-                                2
+                                5,
+                                1
                             ],
                             "end": [
-                                7,
-                                2
+                                5,
+                                4
                             ]
                         }
                     },
-                    "summary": "Added the 'for {\na()\ngoto loop\n}' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'a()' function call in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                6,
+                                6
+                            ],
+                            "end": [
+                                6,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'loop' identifier in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i := 0; i < 5; i++' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'i := 0; i < 5; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i < 10; i++' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'i < 10; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +133,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'for ;; {\na()\ncontinue\n}' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'for ;; {\na()\ncontinue\n}' for statement in the main function"
                 },
                 {
                     "span": {
@@ -118,7 +148,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x := range y' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'x := range y' for statement in the main function"
                 }
             ]
         },
@@ -160,13 +190,28 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "96a05e960540a57f232ce834347a05b414d55d05..51b3d18d617cd963d917fb4792134e63ceb460df"
+    "shas": "e273179f5e9abd6bc426d0dabf1d847d9fc3e4f6..f25b62b1979ac923c37947e26b12ab7b07772a65"
 }
 ,{
     "testCaseDescription": "go-for-statements-replacement-test",
     "expectedResult": {
         "changes": {
             "for-statements.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                2
+                            ],
+                            "end": [
+                                7,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'for ;; {\na()\ngoto loop\n}' for statement in the main function"
+                },
                 {
                     "span": {
                         "insert": {
@@ -180,7 +225,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x := range y' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'x := range y' for statement in the main function"
                 },
                 {
                     "span": {
@@ -195,7 +240,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'for ;; {\na()\ncontinue loop2\n}' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'for ;; {\na()\ncontinue loop2\n}' for statement in the main function"
                 },
                 {
                     "span": {
@@ -210,22 +255,52 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i < 10; i++' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'i < 10; i++' for statement in the main function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                20,
-                                1
+                                21,
+                                3
                             ],
                             "end": [
-                                23,
-                                2
+                                21,
+                                4
                             ]
                         }
                     },
-                    "summary": "Added the 'for  {\na(x)\nbreak\n}' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'x' identifier in the a(x) function call of the 'main' function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                22,
+                                1
+                            ],
+                            "end": [
+                                22,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Added a break statement in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                6,
+                                6
+                            ],
+                            "end": [
+                                6,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'loop' identifier in the main function"
                 },
                 {
                     "span": {
@@ -240,7 +315,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i := 0; i < 5; i++' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'i := 0; i < 5; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -255,7 +330,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i < 10; i++' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'i < 10; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -270,7 +345,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'for ;; {\na()\ncontinue\n}' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'for ;; {\na()\ncontinue\n}' for statement in the main function"
                 },
                 {
                     "span": {
@@ -285,7 +360,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x := range y' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'x := range y' for statement in the main function"
                 }
             ]
         },
@@ -330,13 +405,43 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "51b3d18d617cd963d917fb4792134e63ceb460df..bc8c77df5715b792acde0ee8f5348762365c458e"
+    "shas": "f25b62b1979ac923c37947e26b12ab7b07772a65..1d87bb5117646fb05a6eb77fab4add841c79e49c"
 }
 ,{
     "testCaseDescription": "go-for-statements-delete-replacement-test",
     "expectedResult": {
         "changes": {
             "for-statements.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a()' function call in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                6,
+                                6
+                            ],
+                            "end": [
+                                6,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'loop' identifier in the main function"
+                },
                 {
                     "span": {
                         "insert": {
@@ -350,7 +455,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i := 0; i < 5; i++' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'i := 0; i < 5; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -365,22 +470,34 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i < 10; i++' for statement in the main function of the 'main' module"
+                    "summary": "Added the 'i < 10; i++' for statement in the main function"
                 },
                 {
                     "span": {
-                        "insert": {
-                            "start": [
-                                16,
-                                1
-                            ],
-                            "end": [
-                                19,
-                                2
-                            ]
-                        }
+                        "replace": [
+                            {
+                                "start": [
+                                    4,
+                                    2
+                                ],
+                                "end": [
+                                    7,
+                                    2
+                                ]
+                            },
+                            {
+                                "start": [
+                                    16,
+                                    1
+                                ],
+                                "end": [
+                                    19,
+                                    2
+                                ]
+                            }
+                        ]
                     },
-                    "summary": "Added the 'for ;; {\na()\ncontinue\n}' for statement in the main function of the 'main' module"
+                    "summary": "Replaced the 'for ;; {\na()\ngoto loop\n}' for statement with the 'for ;; {\na()\ncontinue\n}' for statement in the main function"
                 },
                 {
                     "span": {
@@ -410,7 +527,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'loop' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'loop' identifier in the main function"
                 },
                 {
                     "span": {
@@ -425,7 +542,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'for ;; {\na()\ncontinue loop2\n}' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'for ;; {\na()\ncontinue loop2\n}' for statement in the main function"
                 },
                 {
                     "span": {
@@ -440,22 +557,37 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i < 10; i++' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'i < 10; i++' for statement in the main function"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                20,
+                                21,
                                 1
                             ],
                             "end": [
-                                23,
-                                2
+                                21,
+                                5
                             ]
                         }
                     },
-                    "summary": "Deleted the 'for  {\na(x)\nbreak\n}' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'a(x)' function call in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                22,
+                                1
+                            ],
+                            "end": [
+                                22,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted a break statement in the main function"
                 }
             ]
         },
@@ -500,7 +632,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bc8c77df5715b792acde0ee8f5348762365c458e..8053ecd74ec3e0c07b9fea654f0b8fcce78a3d76"
+    "shas": "1d87bb5117646fb05a6eb77fab4add841c79e49c..1743b5d6f9c95bb0d7dbec59c2e254d7d444ca0f"
 }
 ,{
     "testCaseDescription": "go-for-statements-delete-insert-test",
@@ -511,16 +643,31 @@
                     "span": {
                         "delete": {
                             "start": [
-                                4,
-                                2
+                                5,
+                                1
                             ],
                             "end": [
-                                7,
-                                2
+                                5,
+                                4
                             ]
                         }
                     },
-                    "summary": "Deleted the 'for {\na()\ngoto loop\n}' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'a()' function call in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                6,
+                                6
+                            ],
+                            "end": [
+                                6,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'loop' identifier in the main function"
                 },
                 {
                     "span": {
@@ -535,7 +682,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i := 0; i < 5; i++' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'i := 0; i < 5; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -550,7 +697,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i < 10; i++' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'i < 10; i++' for statement in the main function"
                 },
                 {
                     "span": {
@@ -565,7 +712,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'for ;; {\na()\ncontinue\n}' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'for ;; {\na()\ncontinue\n}' for statement in the main function"
                 },
                 {
                     "span": {
@@ -580,7 +727,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x := range y' for statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'x := range y' for statement in the main function"
                 }
             ]
         },
@@ -622,7 +769,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8053ecd74ec3e0c07b9fea654f0b8fcce78a3d76..109ecfd74440e6d35d565ab30dc4fa34a656edbd"
+    "shas": "1743b5d6f9c95bb0d7dbec59c2e254d7d444ca0f..59eb24ea939ad8ac2cf5e8e16edce93aac3981fd"
 }
 ,{
     "testCaseDescription": "go-for-statements-teardown-test",
@@ -637,12 +784,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -664,5 +826,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "109ecfd74440e6d35d565ab30dc4fa34a656edbd..090bcfe2072c5d36d06f9f588c308abeb046e46e"
+    "shas": "59eb24ea939ad8ac2cf5e8e16edce93aac3981fd..b9e8cbc963d70681826124d682474977bcef4d33"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "090bcfe2072c5d36d06f9f588c308abeb046e46e..4c821ecfcd1dffc01f8b59326d656fa810c27da1"
+    "shas": "b9e8cbc963d70681826124d682474977bcef4d33..75b2b30297a1bb14866f352c5291cae0ad1711b6"
 }
 ,{
     "testCaseDescription": "go-function-declarations-insert-test",
@@ -54,8 +69,8 @@
                                     1
                                 ],
                                 "end": [
-                                    6,
-                                    1
+                                    1,
+                                    13
                                 ]
                             },
                             {
@@ -64,13 +79,13 @@
                                     1
                                 ],
                                 "end": [
-                                    8,
+                                    9,
                                     1
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Replaced the 'main' module with 'package main\n\nfunc main() {\nfunc f1() {}\nfunc f2(a int, b, c, d string) int {}\nfunc f2() (int, error) {}\nfunc f2() (result int, err error) {}\n}\n' at line 1, column 1 - line 9, column 1"
                 }
             ]
         },
@@ -96,7 +111,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4c821ecfcd1dffc01f8b59326d656fa810c27da1..bcd66229a828820e1dc6df15bdc2e17348f1adcb"
+    "shas": "75b2b30297a1bb14866f352c5291cae0ad1711b6..aced7850a95b463c3083658d0a6b2a9e25021b74"
 }
 ,{
     "testCaseDescription": "go-function-declarations-replacement-test",
@@ -155,7 +170,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f2' identifier with the 'fb' identifier in the fb function of the 'main' module"
+                    "summary": "Replaced the 'f2' identifier with the 'fb' identifier in the fb function"
                 },
                 {
                     "span": {
@@ -182,7 +197,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f2' identifier with the 'fc' identifier in the fc function of the 'main' module"
+                    "summary": "Replaced the 'f2' identifier with the 'fc' identifier in the fc function"
                 },
                 {
                     "span": {
@@ -209,7 +224,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f2' identifier with the 'fd' identifier in the fd function of the 'main' module"
+                    "summary": "Replaced the 'f2' identifier with the 'fd' identifier in the fd function"
                 }
             ]
         },
@@ -238,7 +253,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bcd66229a828820e1dc6df15bdc2e17348f1adcb..25682bee4a82b03d9d7f9ab96c28428ad50270dc"
+    "shas": "aced7850a95b463c3083658d0a6b2a9e25021b74..d0160ccee51c30218f5ca3f776ca8c21cf6ccfd2"
 }
 ,{
     "testCaseDescription": "go-function-declarations-delete-replacement-test",
@@ -297,7 +312,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'fb' identifier with the 'f2' identifier in the f2 function of the 'main' module"
+                    "summary": "Replaced the 'fb' identifier with the 'f2' identifier in the f2 function"
                 },
                 {
                     "span": {
@@ -324,7 +339,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'fc' identifier with the 'f2' identifier in the f2 function of the 'main' module"
+                    "summary": "Replaced the 'fc' identifier with the 'f2' identifier in the f2 function"
                 },
                 {
                     "span": {
@@ -351,7 +366,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'fd' identifier with the 'f2' identifier in the f2 function of the 'main' module"
+                    "summary": "Replaced the 'fd' identifier with the 'f2' identifier in the f2 function"
                 }
             ]
         },
@@ -380,7 +395,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "25682bee4a82b03d9d7f9ab96c28428ad50270dc..fe1c5c29ff27e556e88630190814a22566eaf082"
+    "shas": "d0160ccee51c30218f5ca3f776ca8c21cf6ccfd2..5e7095ac8137e91c12215c45438bbd29c382290e"
 }
 ,{
     "testCaseDescription": "go-function-declarations-delete-insert-test",
@@ -396,7 +411,7 @@
                                     1
                                 ],
                                 "end": [
-                                    8,
+                                    9,
                                     1
                                 ]
                             },
@@ -406,13 +421,13 @@
                                     1
                                 ],
                                 "end": [
-                                    6,
-                                    1
+                                    1,
+                                    13
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'main' module with the 'main' module"
+                    "summary": "Replaced 'package main\n\nfunc main() {\nfunc f1() {}\nfunc f2(a int, b, c, d string) int {}\nfunc f2() (int, error) {}\nfunc f2() (result int, err error) {}\n}\n' at line 1, column 1 - line 9, column 1 with the 'main' module"
                 }
             ]
         },
@@ -438,7 +453,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fe1c5c29ff27e556e88630190814a22566eaf082..e5826998ff4221f34b05da09b478a8136e3c4ff0"
+    "shas": "5e7095ac8137e91c12215c45438bbd29c382290e..432d945a039effe38996415a0be25ec7a92dc22f"
 }
 ,{
     "testCaseDescription": "go-function-declarations-teardown-test",
@@ -453,12 +468,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -480,5 +510,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e5826998ff4221f34b05da09b478a8136e3c4ff0..e5224329c24b2e2d564a10269e63b36c492d7bf5"
+    "shas": "432d945a039effe38996415a0be25ec7a92dc22f..7ebca2c2e26873ec2ec3d92c6922446eb95bb61f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a5f99e0c9f8b9b96e1f64f8b5fd79ed8c9490ebd..3551d67225e67a496d576b38b507dddf941970af"
+    "shas": "cbd953ad26bc63e3ddd57f753a0d7bf09ed21706..74d2004a9be4bf5167b1d97e6732bbe137e3a460"
 }
 ,{
     "testCaseDescription": "go-function-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's1' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's1' var assignment in the main function"
                 }
             ]
         },
@@ -83,7 +98,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3551d67225e67a496d576b38b507dddf941970af..4a0681b812c1080f3b42dcdb472f7cdf6689ca3c"
+    "shas": "74d2004a9be4bf5167b1d97e6732bbe137e3a460..04192192923a0a0e3af386c560b3cd34bc1b63ce"
 }
 ,{
     "testCaseDescription": "go-function-literals-replacement-test",
@@ -167,7 +182,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4a0681b812c1080f3b42dcdb472f7cdf6689ca3c..b8b10ef9de564860494347b02f5e0fe36f915b14"
+    "shas": "04192192923a0a0e3af386c560b3cd34bc1b63ce..0ef7e22a17c2ed105f74e285979fae66528aad70"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-replacement-test",
@@ -251,7 +266,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b8b10ef9de564860494347b02f5e0fe36f915b14..3dfb64b1ce98af88f0435b8cfb6b46ba8a1caa08"
+    "shas": "0ef7e22a17c2ed105f74e285979fae66528aad70..ba516525d99d7da0277fccb9f9ff68aec352e5f3"
 }
 ,{
     "testCaseDescription": "go-function-literals-delete-insert-test",
@@ -271,7 +286,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's1' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's1' var assignment in the main function"
                 }
             ]
         },
@@ -296,7 +311,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3dfb64b1ce98af88f0435b8cfb6b46ba8a1caa08..b48bee5be118ec48670688a78247ef8e8d46a97f"
+    "shas": "ba516525d99d7da0277fccb9f9ff68aec352e5f3..13743127bcf07e1e88a6fc021b0a8b6a698a4a25"
 }
 ,{
     "testCaseDescription": "go-function-literals-teardown-test",
@@ -311,12 +326,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -338,5 +368,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b48bee5be118ec48670688a78247ef8e8d46a97f..802da3fcac3bb5bd8d87025c78e2dd27694ea5c4"
+    "shas": "13743127bcf07e1e88a6fc021b0a8b6a698a4a25..bda742d270e92cc83a8a8f229714661cfae58fee"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cc8aac0f8db0de4e459571ae4c68771e7c442c63..d0826f8e4f35be91943404925263e1e1e9603357"
+    "shas": "190f44e86419bb122daf395748920e3c5779b66b..1815f5ac7ccb734cfb2c19bc68c7577305301768"
 }
 ,{
     "testCaseDescription": "go-function-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'b' type declaration in the main function"
                 }
             ]
         },
@@ -99,7 +114,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d0826f8e4f35be91943404925263e1e1e9603357..40f24f05af6d2ed0d4b263cf4991347c84103a50"
+    "shas": "1815f5ac7ccb734cfb2c19bc68c7577305301768..3606d9bc10b8730dea35f76b1aa221b078bbadfe"
 }
 ,{
     "testCaseDescription": "go-function-types-replacement-test",
@@ -313,7 +328,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "40f24f05af6d2ed0d4b263cf4991347c84103a50..9b9fdaa9a541472468aecf2a623c190ed8aa71bc"
+    "shas": "3606d9bc10b8730dea35f76b1aa221b078bbadfe..58b1cdcdee55c272dae229c1c5118cc6a830596c"
 }
 ,{
     "testCaseDescription": "go-function-types-delete-replacement-test",
@@ -527,7 +542,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9b9fdaa9a541472468aecf2a623c190ed8aa71bc..10c85ec2a8794ad974c5931a228bdd533464b5e6"
+    "shas": "58b1cdcdee55c272dae229c1c5118cc6a830596c..f17fbf867be99922b4ceae5821169d4c80acbd6b"
 }
 ,{
     "testCaseDescription": "go-function-types-delete-insert-test",
@@ -547,7 +562,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -562,7 +577,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'b' type declaration in the main function"
                 }
             ]
         },
@@ -588,7 +603,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "10c85ec2a8794ad974c5931a228bdd533464b5e6..a42e34067a86f039ab807cab9b0f18af0e2af0f6"
+    "shas": "f17fbf867be99922b4ceae5821169d4c80acbd6b..0426718d4af0fec65a3ffdf23db55358449ba5a2"
 }
 ,{
     "testCaseDescription": "go-function-types-teardown-test",
@@ -603,12 +618,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -630,5 +660,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a42e34067a86f039ab807cab9b0f18af0e2af0f6..e8d08e2eedd6b2a25ec4649df0ad12534a6c3c09"
+    "shas": "0426718d4af0fec65a3ffdf23db55358449ba5a2..57bf5ffc56480fbb108aa9d683b4dfd5324acbbf"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8ae829c0b1cf177164c31d8a3d6678bbc51d20c5..6a61b25a986a2736faaaa06dfb1f4abcf40739dc"
+    "shas": "fa9acd974705290312a7cebdba09b18008dc6093..d00a7d7d9b0063f84a7033c6182913c365412974"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x[y]()' defer statement in the main function of the 'main' module"
+                    "summary": "Added the 'x[y]()' defer statement in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x[y]()' go statement in the main function of the 'main' module"
+                    "summary": "Added the 'x[y]()' go statement in the main function"
                 }
             ]
         },
@@ -97,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6a61b25a986a2736faaaa06dfb1f4abcf40739dc..913fcfe4be1ad959ae12965780f22e6b6484358a"
+    "shas": "d00a7d7d9b0063f84a7033c6182913c365412974..eafca6f1008f09b4b1a1c39a58d69aa84ac352b6"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-replacement-test",
@@ -235,7 +250,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "913fcfe4be1ad959ae12965780f22e6b6484358a..6d08af2b7f337f388175cd015e74670d2b2d0de2"
+    "shas": "eafca6f1008f09b4b1a1c39a58d69aa84ac352b6..949b06caae4bd83cfbfd6a4a2af62754e5426afc"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-replacement-test",
@@ -373,7 +388,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6d08af2b7f337f388175cd015e74670d2b2d0de2..8f41e4a938613f3989caee22a4e442573e580e94"
+    "shas": "949b06caae4bd83cfbfd6a4a2af62754e5426afc..6a0c93da8aace8b01e5dcd171ecb9482ec200cb9"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-insert-test",
@@ -393,7 +408,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x[y]()' defer statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'x[y]()' defer statement in the main function"
                 },
                 {
                     "span": {
@@ -408,7 +423,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x[y]()' go statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'x[y]()' go statement in the main function"
                 }
             ]
         },
@@ -432,7 +447,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8f41e4a938613f3989caee22a4e442573e580e94..2364dc45f38f6de83d0ee043be6aa264c4d53406"
+    "shas": "6a0c93da8aace8b01e5dcd171ecb9482ec200cb9..8b9931aef1a3b18f61b2dee680cdc1d159cb4f36"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-teardown-test",
@@ -447,12 +462,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -474,5 +504,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2364dc45f38f6de83d0ee043be6aa264c4d53406..27df5c61699f3ed1d465e409ed4793a9a141e7bd"
+    "shas": "8b9931aef1a3b18f61b2dee680cdc1d159cb4f36..43ac69d0304e8f5a93bb985e3f4e05d9dff5d2b6"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,13 +53,12 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2c47fd719e136db59fa2b3ccfab4572fe4c1be2c..c6819c24c299e2220e4f833a52987d0ab624030f"
+    "shas": "126db53cee9459e0927b80ed1af574cc273f948e..6b9c8e7943b9fee465f5ae36a8e60f309fd34f53"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-insert-test",
     "expectedResult": {
-        "changes": {},
-        "errors": {
+        "changes": {
             "grouped-import-declarations.go": [
                 {
                     "span": {
@@ -54,12 +68,46 @@
                                 1
                             ],
                             "end": [
-                                8,
-                                2
+                                4,
+                                7
                             ]
                         }
                     },
-                    "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"
+                    "summary": "Added the 'import' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                11
+                            ]
+                        }
+                    },
+                    "summary": "Added the \"net/http\" string in the main function"
+                }
+            ]
+        },
+        "errors": {
+            "grouped-import-declarations.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                6,
+                                3
+                            ],
+                            "end": [
+                                7,
+                                23
+                            ]
+                        }
+                    },
+                    "summary": "Added '. \"some/dsl\"\n  alias \"some/package\"' at line 6, column 3 - line 7, column 23 in the main function"
                 }
             ]
         }
@@ -85,7 +133,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c6819c24c299e2220e4f833a52987d0ab624030f..19482fe3d5e6dddd8e28228c1af0952ceac64894"
+    "shas": "6b9c8e7943b9fee465f5ae36a8e60f309fd34f53..da13ed2e396030607a1566cd6b4aa3295a2d1221"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-replacement-test",
@@ -117,7 +165,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"net/http\" string with the \"net/socket\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"net/http\" string with the \"net/socket\" string in the main function"
                 },
                 {
                     "span": {
@@ -144,7 +192,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the main function"
                 },
                 {
                     "span": {
@@ -171,7 +219,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"some/package\" string with the \"awesome/package\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"some/package\" string with the \"awesome/package\" string in the main function"
                 }
             ]
         },
@@ -199,7 +247,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "19482fe3d5e6dddd8e28228c1af0952ceac64894..99e842e6e87b98e39d823e8d6c543d41ee49ed2c"
+    "shas": "da13ed2e396030607a1566cd6b4aa3295a2d1221..d10a69e54f224c4a48b4ab0489e435f86ac84de1"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-replacement-test",
@@ -231,7 +279,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"net/socket\" string with the \"net/http\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"net/socket\" string with the \"net/http\" string in the main function"
                 },
                 {
                     "span": {
@@ -258,7 +306,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the main function"
                 },
                 {
                     "span": {
@@ -285,7 +333,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"awesome/package\" string with the \"some/package\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"awesome/package\" string with the \"some/package\" string in the main function"
                 }
             ]
         },
@@ -313,13 +361,12 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "99e842e6e87b98e39d823e8d6c543d41ee49ed2c..25c7452f65645a864deb0d14a037205de2740e2f"
+    "shas": "d10a69e54f224c4a48b4ab0489e435f86ac84de1..6a25d985a312ed1935f33359735bfc3fad514a37"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-delete-insert-test",
     "expectedResult": {
-        "changes": {},
-        "errors": {
+        "changes": {
             "grouped-import-declarations.go": [
                 {
                     "span": {
@@ -329,12 +376,46 @@
                                 1
                             ],
                             "end": [
-                                8,
-                                2
+                                4,
+                                7
                             ]
                         }
                     },
-                    "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"
+                    "summary": "Deleted the 'import' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                11
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the \"net/http\" string in the main function"
+                }
+            ]
+        },
+        "errors": {
+            "grouped-import-declarations.go": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                6,
+                                3
+                            ],
+                            "end": [
+                                7,
+                                23
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '. \"some/dsl\"\n  alias \"some/package\"' at line 6, column 3 - line 7, column 23 in the main function"
                 }
             ]
         }
@@ -360,7 +441,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "25c7452f65645a864deb0d14a037205de2740e2f..baf2152faedc0a6facf152568c6b680c7e52fd86"
+    "shas": "6a25d985a312ed1935f33359735bfc3fad514a37..0b75622a824ba8367f3f6dee95cfdccbfcc4eb8f"
 }
 ,{
     "testCaseDescription": "go-grouped-import-declarations-teardown-test",
@@ -375,12 +456,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -402,5 +498,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "baf2152faedc0a6facf152568c6b680c7e52fd86..038d3fd0f1c08ca004a0a2d0c61ecc27b0535e67"
+    "shas": "0b75622a824ba8367f3f6dee95cfdccbfcc4eb8f..d4d30589c4945d693f9b6b7e327ddbcd45e70321"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e75c5ac355ded95806073c70e83be9e9b3634163..79a6631220e4e84f5dcce34f797e4144d06d4962"
+    "shas": "3dba2a559a0cc46933a2663e7b9cdcd4a92808d9..24b5a7da7f83d445e406076f4e5cd0eb29b81187"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'zero' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'one' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'one' var assignment in the main function"
                 }
             ]
         },
@@ -99,7 +114,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "79a6631220e4e84f5dcce34f797e4144d06d4962..06f0d2493c8d5b70a8dee0ee3905f151ea506795"
+    "shas": "24b5a7da7f83d445e406076f4e5cd0eb29b81187..47a9982c7ce46ecab0a4eea473b1e0e63686a8fd"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-replacement-test",
@@ -184,7 +199,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "06f0d2493c8d5b70a8dee0ee3905f151ea506795..f73a7fc0adae36e82e2aaeb5d696abea6b23a3fb"
+    "shas": "47a9982c7ce46ecab0a4eea473b1e0e63686a8fd..e12f033c84f4d6f59ae1e0542ed68873634f85ff"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-replacement-test",
@@ -269,7 +284,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f73a7fc0adae36e82e2aaeb5d696abea6b23a3fb..035552bf16bcde92ba554125718245d842b7d9d3"
+    "shas": "e12f033c84f4d6f59ae1e0542ed68873634f85ff..0df3b93f76d7331db5126eb444c15d5ef2829485"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-delete-insert-test",
@@ -289,7 +304,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'zero' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -304,7 +319,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'one' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'one' var assignment in the main function"
                 }
             ]
         },
@@ -330,7 +345,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "035552bf16bcde92ba554125718245d842b7d9d3..d30e22d42d938d8dc1099d7fb7f6e692aad85407"
+    "shas": "0df3b93f76d7331db5126eb444c15d5ef2829485..c681a4b6c5b308af84285b1b48b80d02adb0dba3"
 }
 ,{
     "testCaseDescription": "go-grouped-var-declarations-teardown-test",
@@ -345,12 +360,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -372,5 +402,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d30e22d42d938d8dc1099d7fb7f6e692aad85407..6e1ebffb2ad214b1c4a7ab7a8efed9b6a25e8470"
+    "shas": "c681a4b6c5b308af84285b1b48b80d02adb0dba3..08c2e3dcd4ce51ddc9fd673ef182af5f0748761d"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2d4500613c50791e41a932edd1885da8e9830f8e..c98826eee37b8054f73558f3295f06a90ca954c1"
+    "shas": "3f2a09bd95dfbff3712c14095a53c1f0a3855648..003b74b612db2ce7c8b3cafa4767e2d93c80857b"
 }
 ,{
     "testCaseDescription": "go-if-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a()' if statement in the main function of the 'main' module"
+                    "summary": "Added the 'a()' if statement in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a := b(); c' if statement in the main function of the 'main' module"
+                    "summary": "Added the 'a := b()' if statement in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a()' if statement in the main function of the 'main' module"
+                    "summary": "Added the 'a()' if statement in the main function"
                 }
             ]
         },
@@ -121,7 +136,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c98826eee37b8054f73558f3295f06a90ca954c1..8d270696b97d37fa644ea92e22e8f8aaff35c2ff"
+    "shas": "003b74b612db2ce7c8b3cafa4767e2d93c80857b..90a41d97fa0420b82f8d8d7b550dd92171663b0f"
 }
 ,{
     "testCaseDescription": "go-if-statements-replacement-test",
@@ -180,7 +195,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'y' identifier in the y var assignment of the 'main' function"
+                    "summary": "Replaced the 'a' identifier with the 'y' identifier in the 'y := b()' if statement of the 'main' function"
                 },
                 {
                     "span": {
@@ -240,7 +255,7 @@
         " c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8d270696b97d37fa644ea92e22e8f8aaff35c2ff..88d296f03520e7b0c4358f9b31cb5c8098fb763b"
+    "shas": "90a41d97fa0420b82f8d8d7b550dd92171663b0f..5b8d17f1bd7bf95dece870548aa1a2dc603ae25c"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-replacement-test",
@@ -299,7 +314,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'y' identifier with the 'a' identifier in the a var assignment of the 'main' function"
+                    "summary": "Replaced the 'y' identifier with the 'a' identifier in the 'a := b()' if statement of the 'main' function"
                 },
                 {
                     "span": {
@@ -359,7 +374,7 @@
         " c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "88d296f03520e7b0c4358f9b31cb5c8098fb763b..37697f71afa721d3e1b6be5604618344b856808a"
+    "shas": "5b8d17f1bd7bf95dece870548aa1a2dc603ae25c..2c0ac08501ad5b8bc5e1383946ac2adc645a1102"
 }
 ,{
     "testCaseDescription": "go-if-statements-delete-insert-test",
@@ -379,7 +394,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a()' if statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'a()' if statement in the main function"
                 },
                 {
                     "span": {
@@ -394,7 +409,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a := b(); c' if statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'a := b()' if statement in the main function"
                 },
                 {
                     "span": {
@@ -409,7 +424,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a()' if statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'a()' if statement in the main function"
                 }
             ]
         },
@@ -442,7 +457,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "37697f71afa721d3e1b6be5604618344b856808a..d216b0b498b90c21e79ccadfedd6c57e66289d1c"
+    "shas": "2c0ac08501ad5b8bc5e1383946ac2adc645a1102..ca18125942a9a260c9187e56d003f1b21e71002f"
 }
 ,{
     "testCaseDescription": "go-if-statements-teardown-test",
@@ -457,12 +472,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -484,5 +514,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d216b0b498b90c21e79ccadfedd6c57e66289d1c..b534a2624a6f74eebed7bd6da21bc7df27018a96"
+    "shas": "ca18125942a9a260c9187e56d003f1b21e71002f..e3c2411f013b063d1c440d3a295be6485170c63d"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a43f5210e8e5da594371eacab324e27889547ce0..aad2c18c5e34b74bf3c0326af866aa1031297abf"
+    "shas": "fd41bb91afdd6087f0c3e6c54566857b7105df8c..5712b1395e13d1c0fa00cffacbf8bc0951053d35"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'a' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'b' var assignment in the main function"
                 }
             ]
         },
@@ -99,7 +114,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "aad2c18c5e34b74bf3c0326af866aa1031297abf..1e90859d681fb50b514a36f0a4d00fa96c1f0331"
+    "shas": "5712b1395e13d1c0fa00cffacbf8bc0951053d35..22932b78378effd2b941d482834bf0a72286edec"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-replacement-test",
@@ -184,7 +199,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1e90859d681fb50b514a36f0a4d00fa96c1f0331..71841ec35c87085fe43e09014faf9d861f63307a"
+    "shas": "22932b78378effd2b941d482834bf0a72286edec..9f5d0bbee0d79018b1b0187ba73c28d0f9d72c78"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-replacement-test",
@@ -269,7 +284,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "71841ec35c87085fe43e09014faf9d861f63307a..978db2c8b0ffe2143eb8a281234c6129fa285e9a"
+    "shas": "9f5d0bbee0d79018b1b0187ba73c28d0f9d72c78..30a750a5c56e53a8f94fcc56d10cca85093b2286"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-delete-insert-test",
@@ -289,7 +304,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -304,7 +319,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'b' var assignment in the main function"
                 }
             ]
         },
@@ -330,7 +345,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "978db2c8b0ffe2143eb8a281234c6129fa285e9a..25724e370d9a7945d55448d91da88ab0001fcebc"
+    "shas": "30a750a5c56e53a8f94fcc56d10cca85093b2286..9b4c1d9f9789b88f196087dafbad93a21508c9c2"
 }
 ,{
     "testCaseDescription": "go-imaginary-literals-teardown-test",
@@ -345,12 +360,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -372,5 +402,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "25724e370d9a7945d55448d91da88ab0001fcebc..1ed63b35351e352f6ae6a546bb49920585747c54"
+    "shas": "9b4c1d9f9789b88f196087dafbad93a21508c9c2..d39cc6bcd81255864bc210bd0ab92a71c0a80cc2"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "adb2401da7e74b66c885cf959788358c7ba5c3ee..59dcf1fcc48c84b1a9938e79d788af6b13a328a8"
+    "shas": "bb4ba3185a52b92f422411ad6cae97a82e2b2657..16dda00e283e0850677a63b7e489cf83d5c5a5b6"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i++' increment statement in the main function of the 'main' module"
+                    "summary": "Added the 'i++' increment statement in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'j--' decrement statement in the main function of the 'main' module"
+                    "summary": "Added the 'j--' decrement statement in the main function"
                 }
             ]
         },
@@ -97,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "59dcf1fcc48c84b1a9938e79d788af6b13a328a8..b2a71db8b841f85ec6d62c4ee5cb758a502bfcb3"
+    "shas": "16dda00e283e0850677a63b7e489cf83d5c5a5b6..741d8660e0bf62db6265e192fd6b90e50b9eef4f"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-replacement-test",
@@ -129,7 +144,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'i++' increment statement with the 'foo++' increment statement in the main function of the 'main' module"
+                    "summary": "Replaced the 'i++' increment statement with the 'foo++' increment statement in the main function"
                 },
                 {
                     "span": {
@@ -144,7 +159,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x++' increment statement in the main function of the 'main' module"
+                    "summary": "Added the 'x++' increment statement in the main function"
                 },
                 {
                     "span": {
@@ -159,7 +174,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'j--' decrement statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'j--' decrement statement in the main function"
                 }
             ]
         },
@@ -184,7 +199,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b2a71db8b841f85ec6d62c4ee5cb758a502bfcb3..6b16aefff065ed5a41e6891dd94ad040e85f312b"
+    "shas": "741d8660e0bf62db6265e192fd6b90e50b9eef4f..a0c075e89018b1d3e99ed50b0462c9c6fe12e267"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-replacement-test",
@@ -216,7 +231,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'foo++' increment statement with the 'i++' increment statement in the main function of the 'main' module"
+                    "summary": "Replaced the 'foo++' increment statement with the 'i++' increment statement in the main function"
                 },
                 {
                     "span": {
@@ -231,7 +246,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'j--' decrement statement in the main function of the 'main' module"
+                    "summary": "Added the 'j--' decrement statement in the main function"
                 },
                 {
                     "span": {
@@ -246,7 +261,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x++' increment statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'x++' increment statement in the main function"
                 }
             ]
         },
@@ -271,7 +286,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6b16aefff065ed5a41e6891dd94ad040e85f312b..cceed70a20fed7d8cd1d84eb6800ca37ea02bc01"
+    "shas": "a0c075e89018b1d3e99ed50b0462c9c6fe12e267..251078b70b5dafb8b9a682ec094530dfb8c39572"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-delete-insert-test",
@@ -291,7 +306,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i++' increment statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'i++' increment statement in the main function"
                 },
                 {
                     "span": {
@@ -306,7 +321,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'j--' decrement statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'j--' decrement statement in the main function"
                 }
             ]
         },
@@ -330,7 +345,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cceed70a20fed7d8cd1d84eb6800ca37ea02bc01..f82a411f0daeb75a2800293d5651522df8f1bbd6"
+    "shas": "251078b70b5dafb8b9a682ec094530dfb8c39572..759e0718fcbd72afbcc54da11715a66d338f9696"
 }
 ,{
     "testCaseDescription": "go-increment-decrement-statements-teardown-test",
@@ -345,12 +360,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -372,5 +402,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f82a411f0daeb75a2800293d5651522df8f1bbd6..9b6482e7bca1a74c6ecdc400cf0ed146ebb6a29a"
+    "shas": "759e0718fcbd72afbcc54da11715a66d338f9696..e86ae4b80ecf2b01260ea4afc56327253ab59646"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "54cc2c98c56816e321a4fffb6927c2793f3cc794..d19eab9ef64c9690bb40f960167fe7f379050ce1"
+    "shas": "0a55a88480be2cc766ee756b5b5f7bf45704376c..4f60b48123030197c6618ae645a4374972ea4c36"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a[1]' index expression in the main function of the 'main' module"
+                    "summary": "Added the 'a[1]' index expression in the main function"
                 },
                 {
                     "span": {
@@ -69,11 +84,11 @@
                             ],
                             "end": [
                                 5,
-                                6
+                                3
                             ]
                         }
                     },
-                    "summary": "Added the 'b[b[:]]' slice literal in the main function of the 'main' module"
+                    "summary": "Added the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c[1]' slice literal in the main function of the 'main' module"
+                    "summary": "Added the 'c[1]' slice literal in the main function"
                 },
                 {
                     "span": {
@@ -99,41 +114,146 @@
                             ],
                             "end": [
                                 7,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'd' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                7,
+                                4
+                            ],
+                            "end": [
+                                7,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added '1' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                7,
+                                6
+                            ],
+                            "end": [
+                                7,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added '2' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                8,
+                                2
+                            ],
+                            "end": [
+                                8,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'e' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                8,
+                                5
+                            ],
+                            "end": [
+                                8,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Added '2' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                8,
+                                7
+                            ],
+                            "end": [
+                                8,
                                 8
                             ]
                         }
                     },
-                    "summary": "Added the 'd[1:2]' slice literal in the main function of the 'main' module"
+                    "summary": "Added '3' in the main function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
-                                8,
+                                9,
                                 2
                             ],
                             "end": [
-                                8,
+                                9,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'f' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                9,
+                                4
+                            ],
+                            "end": [
+                                9,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added '1' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                9,
+                                6
+                            ],
+                            "end": [
+                                9,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added '2' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                9,
+                                8
+                            ],
+                            "end": [
+                                9,
                                 9
                             ]
                         }
                     },
-                    "summary": "Added the 'e[2:3]' slice literal in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                9,
-                                2
-                            ],
-                            "end": [
-                                9,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f[1:2:3]' slice literal in the main function of the 'main' module"
+                    "summary": "Added '3' in the main function"
                 }
             ]
         },
@@ -161,7 +281,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d19eab9ef64c9690bb40f960167fe7f379050ce1..7b7e60ce9893393670010e1b0c82c393d0bbc87f"
+    "shas": "4f60b48123030197c6618ae645a4374972ea4c36..cd7d3053acc66aa2f4d9f3971970b1d3291a7a59"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-replacement-test",
@@ -181,7 +301,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'z[2]' slice literal in the main function of the 'main' module"
+                    "summary": "Added the 'z[2]' slice literal in the main function"
                 },
                 {
                     "span": {
@@ -196,7 +316,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'y[1]' slice literal in the main function of the 'main' module"
+                    "summary": "Added the 'y[1]' slice literal in the main function"
                 },
                 {
                     "span": {
@@ -211,7 +331,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x[1]' slice literal in the main function of the 'main' module"
+                    "summary": "Added the 'x[1]' slice literal in the main function"
                 },
                 {
                     "span": {
@@ -226,7 +346,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a[1]' index expression in the main function of the 'main' module"
+                    "summary": "Deleted the 'a[1]' index expression in the main function"
                 },
                 {
                     "span": {
@@ -237,11 +357,11 @@
                             ],
                             "end": [
                                 5,
-                                6
+                                3
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b[b[:]]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -256,7 +376,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c[1]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted the 'c[1]' slice literal in the main function"
                 }
             ]
         },
@@ -285,7 +405,7 @@
         "  f[1:2:3]"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7b7e60ce9893393670010e1b0c82c393d0bbc87f..3cb474bb7624520b7d6f16188a5949810d92dd20"
+    "shas": "cd7d3053acc66aa2f4d9f3971970b1d3291a7a59..c84e151f812ae561b1912638e0585fe32d854242"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-delete-replacement-test",
@@ -305,7 +425,22 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a[1]' index expression in the main function of the 'main' module"
+                    "summary": "Added the 'a[1]' index expression in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                2
+                            ],
+                            "end": [
+                                5,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -322,59 +457,59 @@
                             },
                             {
                                 "start": [
-                                    5,
+                                    6,
                                     2
                                 ],
                                 "end": [
-                                    5,
+                                    6,
                                     3
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'z' identifier with the 'b' identifier in the b[b[:]] slice literal of the 'main' function"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                4,
-                                4
-                            ],
-                            "end": [
-                                4,
-                                5
-                            ]
-                        }
-                    },
-                    "summary": "Deleted '2' in the b[b[:]] slice literal of the 'main' function"
+                    "summary": "Replaced the 'z' identifier with the 'c' identifier in the c[1] slice literal of the 'main' function"
                 },
                 {
                     "span": {
                         "replace": [
                             {
                                 "start": [
-                                    5,
-                                    2
+                                    4,
+                                    4
                                 ],
                                 "end": [
-                                    5,
-                                    3
+                                    4,
+                                    5
                                 ]
                             },
                             {
                                 "start": [
                                     6,
-                                    2
+                                    4
                                 ],
                                 "end": [
                                     6,
-                                    3
+                                    5
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'y' identifier with the 'c' identifier in the c[1] slice literal of the 'main' function"
+                    "summary": "Replaced '2' with '1' in the c[1] slice literal of the 'main' function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                2
+                            ],
+                            "end": [
+                                5,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'y[1]' slice literal in the main function"
                 },
                 {
                     "span": {
@@ -389,7 +524,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x[1]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted the 'x[1]' slice literal in the main function"
                 }
             ]
         },
@@ -418,7 +553,7 @@
         "  f[1:2:3]"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3cb474bb7624520b7d6f16188a5949810d92dd20..2ca22a76ba48f867fd999d0f99608d38b55809fc"
+    "shas": "c84e151f812ae561b1912638e0585fe32d854242..08a032f27c171ad3d26321259c510b30cf268471"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-delete-insert-test",
@@ -438,7 +573,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a[1]' index expression in the main function of the 'main' module"
+                    "summary": "Deleted the 'a[1]' index expression in the main function"
                 },
                 {
                     "span": {
@@ -449,11 +584,11 @@
                             ],
                             "end": [
                                 5,
-                                6
+                                3
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b[b[:]]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -468,7 +603,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c[1]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted the 'c[1]' slice literal in the main function"
                 },
                 {
                     "span": {
@@ -479,41 +614,146 @@
                             ],
                             "end": [
                                 7,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'd' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                7,
+                                4
+                            ],
+                            "end": [
+                                7,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '1' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                7,
+                                6
+                            ],
+                            "end": [
+                                7,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '2' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                2
+                            ],
+                            "end": [
+                                8,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'e' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                5
+                            ],
+                            "end": [
+                                8,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '2' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                8,
+                                7
+                            ],
+                            "end": [
+                                8,
                                 8
                             ]
                         }
                     },
-                    "summary": "Deleted the 'd[1:2]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted '3' in the main function"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
-                                8,
+                                9,
                                 2
                             ],
                             "end": [
-                                8,
+                                9,
+                                3
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'f' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                9,
+                                4
+                            ],
+                            "end": [
+                                9,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '1' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                9,
+                                6
+                            ],
+                            "end": [
+                                9,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '2' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                9,
+                                8
+                            ],
+                            "end": [
+                                9,
                                 9
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e[2:3]' slice literal in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                9,
-                                2
-                            ],
-                            "end": [
-                                9,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f[1:2:3]' slice literal in the main function of the 'main' module"
+                    "summary": "Deleted '3' in the main function"
                 }
             ]
         },
@@ -541,7 +781,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2ca22a76ba48f867fd999d0f99608d38b55809fc..dd710f15cf06e30adfc658dabf70fbbd8b0958fa"
+    "shas": "08a032f27c171ad3d26321259c510b30cf268471..6f372cae9a7ae4a00c120150faa8316627b50f7d"
 }
 ,{
     "testCaseDescription": "go-indexing-expressions-teardown-test",
@@ -556,12 +796,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -583,5 +838,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "dd710f15cf06e30adfc658dabf70fbbd8b0958fa..668c02674516194c0623120c957d1be93af6cde5"
+    "shas": "6f372cae9a7ae4a00c120150faa8316627b50f7d..39c039e08c3764d56d26a74bbc7bb32704cc398c"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,12 +53,13 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "038d3fd0f1c08ca004a0a2d0c61ecc27b0535e67..b49dc2a86107a6125c6c6b5b27a10b97c349c951"
+    "shas": "d4d30589c4945d693f9b6b7e327ddbcd45e70321..35712f9936e6e990151f65bd8282f587c311283f"
 }
 ,{
     "testCaseDescription": "go-int-literals-insert-test",
     "expectedResult": {
-        "changes": {
+        "changes": {},
+        "errors": {
             "int-literals.go": [
                 {
                     "span": {
@@ -52,32 +68,16 @@
                                 5,
                                 1
                             ],
-                            "end": [
-                                5,
-                                9
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'a' var assignment in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                12
-                            ],
                             "end": [
                                 5,
                                 20
                             ]
                         }
                     },
-                    "summary": "Added the '2' var assignment in the main function of the 'main' module"
+                    "summary": "Added 'a = 1, b = 2, c = 3' at line 5, column 1 - line 5, column 20 in the main function"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "int-literals.go"
@@ -98,7 +98,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b49dc2a86107a6125c6c6b5b27a10b97c349c951..7922f4a2649ec54d9aa444582b20ef48b8a0c49b"
+    "shas": "35712f9936e6e990151f65bd8282f587c311283f..c4fbea18faece138b1ca16fac7c135aacab7e026"
 }
 ,{
     "testCaseDescription": "go-int-literals-replacement-test",
@@ -157,7 +157,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2' with '5' in the 5 var assignment of the 'main' function"
+                    "summary": "Replaced '2' with '5' in an assignment to 5, c of the 'main' function"
                 },
                 {
                     "span": {
@@ -184,7 +184,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '3' with '6' in the 5 var assignment of the 'main' function"
+                    "summary": "Replaced '3' with '6' in an assignment to 5, c of the 'main' function"
                 }
             ]
         },
@@ -208,7 +208,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7922f4a2649ec54d9aa444582b20ef48b8a0c49b..e978725a447db93523c51453ac03fe50b8f32e8f"
+    "shas": "c4fbea18faece138b1ca16fac7c135aacab7e026..5a4da82a60dae3adac65138408a1c9c13c9341ed"
 }
 ,{
     "testCaseDescription": "go-int-literals-delete-replacement-test",
@@ -267,7 +267,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '5' with '2' in the 2 var assignment of the 'main' function"
+                    "summary": "Replaced '5' with '2' in an assignment to 2, c of the 'main' function"
                 },
                 {
                     "span": {
@@ -294,7 +294,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '6' with '3' in the 2 var assignment of the 'main' function"
+                    "summary": "Replaced '6' with '3' in an assignment to 2, c of the 'main' function"
                 }
             ]
         },
@@ -318,12 +318,13 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e978725a447db93523c51453ac03fe50b8f32e8f..8801fe8fbe85f6c7fde621d02bb69ae1d8d2f117"
+    "shas": "5a4da82a60dae3adac65138408a1c9c13c9341ed..7afa4043deb1d962815d430c79d37af59f929d69"
 }
 ,{
     "testCaseDescription": "go-int-literals-delete-insert-test",
     "expectedResult": {
-        "changes": {
+        "changes": {},
+        "errors": {
             "int-literals.go": [
                 {
                     "span": {
@@ -332,32 +333,16 @@
                                 5,
                                 1
                             ],
-                            "end": [
-                                5,
-                                9
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'a' var assignment in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                12
-                            ],
                             "end": [
                                 5,
                                 20
                             ]
                         }
                     },
-                    "summary": "Deleted the '2' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted 'a = 1, b = 2, c = 3' at line 5, column 1 - line 5, column 20 in the main function"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "int-literals.go"
@@ -378,7 +363,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8801fe8fbe85f6c7fde621d02bb69ae1d8d2f117..508d9327fa16fb7a1a03998a5214526d9c6bebf0"
+    "shas": "7afa4043deb1d962815d430c79d37af59f929d69..9db47a4be9cce6edd5a54ffc93d311fb8ec7bd84"
 }
 ,{
     "testCaseDescription": "go-int-literals-teardown-test",
@@ -393,12 +378,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -420,5 +420,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "508d9327fa16fb7a1a03998a5214526d9c6bebf0..091bc58290f6343880a29ef209a9d87aa7a3fcc0"
+    "shas": "9db47a4be9cce6edd5a54ffc93d311fb8ec7bd84..65295513fb69f053f466c62e25b12d37872a7543"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "80f368e3e339a6f6cd13071fff11a504b589ebaa..fed0e7aa61d5c427a357795cbab25ac4992d6307"
+    "shas": "d27aeb5e58d624d463c84b7a506673945bee82fd..6457603d8983b1317a9b928ea207eb6edd64f594"
 }
 ,{
     "testCaseDescription": "go-interface-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i1' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'i1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i2' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'i2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'i3' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'i3' type declaration in the main function"
                 }
             ]
         },
@@ -117,7 +132,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fed0e7aa61d5c427a357795cbab25ac4992d6307..4c36f6466089c121fbcd9047274f757155b0462f"
+    "shas": "6457603d8983b1317a9b928ea207eb6edd64f594..56cfa1522cfdcdac970e3fafdd705c56945226cf"
 }
 ,{
     "testCaseDescription": "go-interface-types-replacement-test",
@@ -232,7 +247,7 @@
         "  SomeMethod(s string) error"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4c36f6466089c121fbcd9047274f757155b0462f..71c93c1227a15f14856489f78b757630be715422"
+    "shas": "56cfa1522cfdcdac970e3fafdd705c56945226cf..a0b32c300b7848b5de8c996337254fba410a49ff"
 }
 ,{
     "testCaseDescription": "go-interface-types-delete-replacement-test",
@@ -347,7 +362,7 @@
         "  SomeMethod(s string) error"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "71c93c1227a15f14856489f78b757630be715422..d28b95cd4d1b0ce38f2a6a41b9299929b5e547d3"
+    "shas": "a0b32c300b7848b5de8c996337254fba410a49ff..e7baf12e7fdd8b0ae0849f70632a5b7730771d40"
 }
 ,{
     "testCaseDescription": "go-interface-types-delete-insert-test",
@@ -367,7 +382,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i1' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'i1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -382,7 +397,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i2' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'i2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -397,7 +412,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'i3' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'i3' type declaration in the main function"
                 }
             ]
         },
@@ -426,7 +441,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d28b95cd4d1b0ce38f2a6a41b9299929b5e547d3..3833ebb48a526a3a7eef7b4f7d939cf60eaf88be"
+    "shas": "e7baf12e7fdd8b0ae0849f70632a5b7730771d40..b3a1c76dfcde365828f3aca43ca12cc93ba6fed7"
 }
 ,{
     "testCaseDescription": "go-interface-types-teardown-test",
@@ -441,12 +456,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -468,5 +498,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3833ebb48a526a3a7eef7b4f7d939cf60eaf88be..08a4feef4554fd83bb199f7d6aa2017f2d5dcf95"
+    "shas": "b3a1c76dfcde365828f3aca43ca12cc93ba6fed7..749bfb72d276ee57a9c014001d350bb1f642f2a9"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "27df5c61699f3ed1d465e409ed4793a9a141e7bd..5118722fef5fb98edf5863588a5d6f1a932b1776"
+    "shas": "43ac69d0304e8f5a93bb985e3f4e05d9dff5d2b6..d7bd23e7679d4f3143995c6304e123585877638e"
 }
 ,{
     "testCaseDescription": "go-label-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'insert_label' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'insert_label' identifier in the main function"
                 }
             ]
         },
@@ -83,7 +98,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5118722fef5fb98edf5863588a5d6f1a932b1776..86e5386c51e472b69c96dee0f11f13101ea549db"
+    "shas": "d7bd23e7679d4f3143995c6304e123585877638e..8114f172b2e02c45b8fd463e2091351fe761e226"
 }
 ,{
     "testCaseDescription": "go-label-statements-replacement-test",
@@ -115,7 +130,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'insert_label' identifier with the 'replacement_label' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'insert_label' identifier with the 'replacement_label' identifier in the main function"
                 }
             ]
         },
@@ -139,7 +154,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "86e5386c51e472b69c96dee0f11f13101ea549db..5a05fa05c7fc5750b9b13926bc8c051100f8dbbf"
+    "shas": "8114f172b2e02c45b8fd463e2091351fe761e226..e7b09a82b9ebb4ceefce68cfefe69428b5f0a87c"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-replacement-test",
@@ -171,7 +186,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'replacement_label' identifier with the 'insert_label' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'replacement_label' identifier with the 'insert_label' identifier in the main function"
                 }
             ]
         },
@@ -195,7 +210,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5a05fa05c7fc5750b9b13926bc8c051100f8dbbf..0a064cd984a675ea6f57a157f4e410711dcef167"
+    "shas": "e7b09a82b9ebb4ceefce68cfefe69428b5f0a87c..876c876dba02766deea4ec644d0006c41d975f2f"
 }
 ,{
     "testCaseDescription": "go-label-statements-delete-insert-test",
@@ -215,7 +230,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'insert_label' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'insert_label' identifier in the main function"
                 }
             ]
         },
@@ -240,7 +255,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0a064cd984a675ea6f57a157f4e410711dcef167..84dde822378492f82447d8959a9978ab56a05ce7"
+    "shas": "876c876dba02766deea4ec644d0006c41d975f2f..3616fca3cc1bfdda36ba9e5a381194c409872b33"
 }
 ,{
     "testCaseDescription": "go-label-statements-teardown-test",
@@ -255,12 +270,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -282,5 +312,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "84dde822378492f82447d8959a9978ab56a05ce7..a759987355f2393c92a9df39d4c9e56a2ea2ce19"
+    "shas": "3616fca3cc1bfdda36ba9e5a381194c409872b33..030876029c6aa56a60b06740ec65bec788ad8715"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6e579109cc2a3c535790233b54306a5473f1a55d..842453c29866c4f8c23dffae58363865fdd48a9a"
+    "shas": "b8e41392436d04ec37de7c7358f5c6f016fc7726..9fc95fb47a671ca191c3f9160fa69e82af7dcaaa"
 }
 ,{
     "testCaseDescription": "go-map-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's' var assignment in the main function"
                 }
             ]
         },
@@ -84,7 +99,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "842453c29866c4f8c23dffae58363865fdd48a9a..3386b91dd71edc5df18367f888ecc0e74380be0a"
+    "shas": "9fc95fb47a671ca191c3f9160fa69e82af7dcaaa..473f91f7465f2fc52a9fd4956332a44a981fe4cb"
 }
 ,{
     "testCaseDescription": "go-map-literals-replacement-test",
@@ -116,7 +131,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'string' identifier with the 'int' identifier in the map[string]int dictionary of the 'main' function"
+                    "summary": "Replaced the 'string' identifier with the 'int' identifier in the map[string]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -131,7 +146,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '\"foo\": \"bar\"' pair in the map[string]int dictionary of the 'main' function"
+                    "summary": "Added the '\"foo\": \"bar\"' pair in the map[string]int composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -173,7 +188,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '\"bye\": \"goodbye\"' pair in the map[string]int dictionary of the 'main' function"
+                    "summary": "Deleted the '\"bye\": \"goodbye\"' pair in the map[string]int composite_literal of the 'main' function"
                 }
             ]
         },
@@ -201,7 +216,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3386b91dd71edc5df18367f888ecc0e74380be0a..b39961ba674aa0fab4180fe2cf44a1bfe0f1eb7c"
+    "shas": "473f91f7465f2fc52a9fd4956332a44a981fe4cb..0ae10bfe6756cfc5348f7d735b0e9fd248e5497f"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-replacement-test",
@@ -233,7 +248,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the map[string]string dictionary of the 'main' function"
+                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the map[string]string composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -369,7 +384,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b39961ba674aa0fab4180fe2cf44a1bfe0f1eb7c..148e204c29ec76ed54356dcc2ce2798967ea1dd0"
+    "shas": "0ae10bfe6756cfc5348f7d735b0e9fd248e5497f..dba7db8f0794b59b17c9a97ba84030fda238568d"
 }
 ,{
     "testCaseDescription": "go-map-literals-delete-insert-test",
@@ -389,7 +404,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's' var assignment in the main function"
                 }
             ]
         },
@@ -415,7 +430,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "148e204c29ec76ed54356dcc2ce2798967ea1dd0..b42901f3f75330eff8ccf7342150ffc969e39861"
+    "shas": "dba7db8f0794b59b17c9a97ba84030fda238568d..d758ae59648d8fc240a1c58cc21f32703979e3cb"
 }
 ,{
     "testCaseDescription": "go-map-literals-teardown-test",
@@ -430,12 +445,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -457,5 +487,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b42901f3f75330eff8ccf7342150ffc969e39861..d8371152b551458e89b4e39819c41792bba80076"
+    "shas": "d758ae59648d8fc240a1c58cc21f32703979e3cb..0c8ae16482a04b19b4a23f3af01e4d9f314b712e"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "08a4feef4554fd83bb199f7d6aa2017f2d5dcf95..4490608b153d81227926e7fac6306bbbd15cd297"
+    "shas": "749bfb72d276ee57a9c014001d350bb1f642f2a9..4b873ee4062abb282e9203b75a1571d5a96f2ab6"
 }
 ,{
     "testCaseDescription": "go-map-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'm1' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'm1' type declaration in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4490608b153d81227926e7fac6306bbbd15cd297..429d94f8628a073b8c3cb6694c09df6a2bf5a50c"
+    "shas": "4b873ee4062abb282e9203b75a1571d5a96f2ab6..b8f771d391d6de1c7d0c65c2f97c6086b2651fea"
 }
 ,{
     "testCaseDescription": "go-map-types-replacement-test",
@@ -136,7 +151,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "429d94f8628a073b8c3cb6694c09df6a2bf5a50c..64b519e321b5bb0774efbbfd0de8701be8cfc68d"
+    "shas": "b8f771d391d6de1c7d0c65c2f97c6086b2651fea..48ae3c021f6ff0f1870fc91f55ced9d0c767084f"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-replacement-test",
@@ -191,7 +206,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "64b519e321b5bb0774efbbfd0de8701be8cfc68d..466082ac269bd4c15cd23acfabfcd6f667b3feb6"
+    "shas": "48ae3c021f6ff0f1870fc91f55ced9d0c767084f..941e1684bf0345854b50e36d415ca9ddc1bacd79"
 }
 ,{
     "testCaseDescription": "go-map-types-delete-insert-test",
@@ -211,7 +226,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'm1' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'm1' type declaration in the main function"
                 }
             ]
         },
@@ -234,7 +249,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "466082ac269bd4c15cd23acfabfcd6f667b3feb6..a6fdcf70dd35754327a61460deefe9aa8d544f94"
+    "shas": "941e1684bf0345854b50e36d415ca9ddc1bacd79..2bdb5f2aec9d251005b91d9e6fa47e9d0ab273ad"
 }
 ,{
     "testCaseDescription": "go-map-types-teardown-test",
@@ -249,12 +264,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -276,5 +306,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a6fdcf70dd35754327a61460deefe9aa8d544f94..d2b5df75d8f6fa05372019f64a86177f47d3e2f6"
+    "shas": "2bdb5f2aec9d251005b91d9e6fa47e9d0ab273ad..4d24e891d2eff92e45db37ab2270eef8294e9145"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2e4178577ebab07e2229a6846523de7a1a01d863..4236b968718153403eb7474c665ec2564c45d4af"
+    "shas": "a8adfaba3e02d1f9416a61ff929abbed0bc123d4..ae946e153675d03124e44ed3b708c539b9a137d7"
 }
 ,{
     "testCaseDescription": "go-method-declarations-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'Equals(…, …)' method in the main module"
+                    "summary": "Added the 'Equals(…, …)' method"
                 }
             ]
         },
@@ -80,7 +95,7 @@
         "+func (self Person) Equals(other Person) bool {}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4236b968718153403eb7474c665ec2564c45d4af..1be9a817b553812d204fbf84bdcdceeb09eda9aa"
+    "shas": "ae946e153675d03124e44ed3b708c539b9a137d7..f425e8a6f57e66d892e1f41ef0dbb8eead4b2df0"
 }
 ,{
     "testCaseDescription": "go-method-declarations-replacement-test",
@@ -112,7 +127,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Person' identifier with the 'Num' identifier in the 'Equals(…, …)' method of the 'main' module"
+                    "summary": "Replaced the 'Person' identifier with the 'Num' identifier in the 'Equals(…, …)' method"
                 },
                 {
                     "span": {
@@ -139,7 +154,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Person' identifier with the 'Num' identifier in the 'Equals(…, …)' method of the 'main' module"
+                    "summary": "Replaced the 'Person' identifier with the 'Num' identifier in the 'Equals(…, …)' method"
                 }
             ]
         },
@@ -161,7 +176,7 @@
         "+func (self Num) Equals(other Num) bool {}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1be9a817b553812d204fbf84bdcdceeb09eda9aa..09e86485c7afef0d482a0f495713487f6af20df9"
+    "shas": "f425e8a6f57e66d892e1f41ef0dbb8eead4b2df0..8a314273a9e0b9e328c88a98232a005930d054e9"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-replacement-test",
@@ -193,7 +208,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Num' identifier with the 'Person' identifier in the 'Equals(…, …)' method of the 'main' module"
+                    "summary": "Replaced the 'Num' identifier with the 'Person' identifier in the 'Equals(…, …)' method"
                 },
                 {
                     "span": {
@@ -220,7 +235,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Num' identifier with the 'Person' identifier in the 'Equals(…, …)' method of the 'main' module"
+                    "summary": "Replaced the 'Num' identifier with the 'Person' identifier in the 'Equals(…, …)' method"
                 }
             ]
         },
@@ -242,7 +257,7 @@
         "+func (self Person) Equals(other Person) bool {}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "09e86485c7afef0d482a0f495713487f6af20df9..4c2bf0fb4d489fa2924346c61f289cc66a591413"
+    "shas": "8a314273a9e0b9e328c88a98232a005930d054e9..65cf1134e9a92c0d5a1b4d6a160fcaf411f99806"
 }
 ,{
     "testCaseDescription": "go-method-declarations-delete-insert-test",
@@ -262,7 +277,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'Equals(…, …)' method in the main module"
+                    "summary": "Deleted the 'Equals(…, …)' method"
                 }
             ]
         },
@@ -284,7 +299,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4c2bf0fb4d489fa2924346c61f289cc66a591413..7e9cc3775968f27c92b41ed9f4c8494fbcd30edc"
+    "shas": "65cf1134e9a92c0d5a1b4d6a160fcaf411f99806..516ad90702a68100aa6a68fc772bc05ef9d21161"
 }
 ,{
     "testCaseDescription": "go-method-declarations-teardown-test",
@@ -299,12 +314,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                15
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -326,5 +356,5 @@
         "-"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7e9cc3775968f27c92b41ed9f4c8494fbcd30edc..7193c3cab8046a6b2b57792ecbef7f2ad5f318b7"
+    "shas": "516ad90702a68100aa6a68fc772bc05ef9d21161..407e4c1852d95bd8c9a3494899d65731e2bbb43f"
 }]

test/corpus/diff-summaries/go/modifying-struct-fields.json

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ab3e3926dc779249680c1d053599892d614e1cbf..7ece7fde5d7183a337db7501da3cfd85b9cf1ff2"
+    "shas": "f5a9b8a54a3841db93e420bf8eff96b4d2d6858a..94d93d2117a8e57a238a502919ff833d7cf671b9"
 }
 ,{
     "testCaseDescription": "go-modifying-struct-fields-insert-test",
@@ -52,13 +67,28 @@
                                 4,
                                 1
                             ],
+                            "end": [
+                                4,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'ctx' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                8
+                            ],
                             "end": [
                                 6,
                                 2
                             ]
                         }
                     },
-                    "summary": "Added the 'ctx' var assignment in the main function of the 'main' module"
+                    "summary": "Added the '&uploadContext{\n   Remote: remote\n}' operator in the main function"
                 }
             ]
         },
@@ -83,7 +113,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7ece7fde5d7183a337db7501da3cfd85b9cf1ff2..fe6d2e1a264c84287b55eaf223fd9c43c0de0b6a"
+    "shas": "94d93d2117a8e57a238a502919ff833d7cf671b9..a9aa97bd6ac93d93d8e62ca2a59b9ec861b684df"
 }
 ,{
     "testCaseDescription": "go-modifying-struct-fields-replacement-test",
@@ -115,7 +145,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'Remote: remote' pair with the 'trackedLocksMu: new(sync.Mutex)' pair in the ctx var assignment of the 'main' function"
+                    "summary": "Replaced the 'Remote: remote' pair with the 'trackedLocksMu: new(sync.Mutex)' pair in the main function"
                 }
             ]
         },
@@ -139,7 +169,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fe6d2e1a264c84287b55eaf223fd9c43c0de0b6a..9d128deb722f6b1cc8daec493627470571d6aa22"
+    "shas": "a9aa97bd6ac93d93d8e62ca2a59b9ec861b684df..d0a359246dac8c80adcb1b4e7bac351462363d18"
 }
 ,{
     "testCaseDescription": "go-modifying-struct-fields-delete-replacement-test",
@@ -171,7 +201,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'trackedLocksMu: new(sync.Mutex)' pair with the 'Remote: remote' pair in the ctx var assignment of the 'main' function"
+                    "summary": "Replaced the 'trackedLocksMu: new(sync.Mutex)' pair with the 'Remote: remote' pair in the main function"
                 }
             ]
         },
@@ -195,7 +225,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9d128deb722f6b1cc8daec493627470571d6aa22..aae84499c2f50275110bf5576621b7d40d40f5fc"
+    "shas": "d0a359246dac8c80adcb1b4e7bac351462363d18..261a10edc770e3f40cd33d61dc0d61d0510527a5"
 }
 ,{
     "testCaseDescription": "go-modifying-struct-fields-delete-insert-test",
@@ -209,13 +239,28 @@
                                 4,
                                 1
                             ],
+                            "end": [
+                                4,
+                                4
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'ctx' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                8
+                            ],
                             "end": [
                                 6,
                                 2
                             ]
                         }
                     },
-                    "summary": "Deleted the 'ctx' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the '&uploadContext{\n   Remote: remote\n}' operator in the main function"
                 }
             ]
         },
@@ -240,7 +285,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "aae84499c2f50275110bf5576621b7d40d40f5fc..785536c2045d588c9ac110cb6b5f084eba52ce59"
+    "shas": "261a10edc770e3f40cd33d61dc0d61d0510527a5..729241bd7988d5e569c4a3384c678328236ba019"
 }
 ,{
     "testCaseDescription": "go-modifying-struct-fields-teardown-test",
@@ -255,12 +300,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -282,5 +342,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "785536c2045d588c9ac110cb6b5f084eba52ce59..13e9de620f0e981a263aa8306692c8e3b7bae8a9"
+    "shas": "729241bd7988d5e569c4a3384c678328236ba019..b704517caf7ad227154e0582b74255cd4065e091"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                7,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -39,7 +54,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e8d08e2eedd6b2a25ec4649df0ad12534a6c3c09..adce0d5ed52ba8b1d7bca9e8a2bfb5364cda9502"
+    "shas": "57bf5ffc56480fbb108aa9d683b4dfd5324acbbf..86bd926b2066a8c508a3fbaea3aea1c44975dbaa"
 }
 ,{
     "testCaseDescription": "go-parameter-declarations-with-types-insert-test",
@@ -59,7 +74,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo' function in the main module"
+                    "summary": "Added the 'foo' function"
                 }
             ]
         },
@@ -82,7 +97,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "adce0d5ed52ba8b1d7bca9e8a2bfb5364cda9502..44490f03e295a0757ccab40c7b512e055e542679"
+    "shas": "86bd926b2066a8c508a3fbaea3aea1c44975dbaa..d06c9a9989b8b0b59b2ca2cdc1eae70936526a0b"
 }
 ,{
     "testCaseDescription": "go-parameter-declarations-with-types-replacement-test",
@@ -114,7 +129,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the foo function of the 'main' module"
+                    "summary": "Replaced the 'int' identifier with the 'string' identifier in the foo function"
                 },
                 {
                     "span": {
@@ -141,7 +156,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the foo function of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the foo function"
                 },
                 {
                     "span": {
@@ -168,7 +183,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'string' identifier with the 'uint64' identifier in the foo function of the 'main' module"
+                    "summary": "Replaced the 'string' identifier with the 'uint64' identifier in the foo function"
                 },
                 {
                     "span": {
@@ -195,7 +210,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the foo function of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the foo function"
                 }
             ]
         },
@@ -218,7 +233,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "44490f03e295a0757ccab40c7b512e055e542679..e9a034ba8648ede7074592effb77584769908921"
+    "shas": "d06c9a9989b8b0b59b2ca2cdc1eae70936526a0b..7f7499916d8951812d1af4dc3f9edea6512dd4ae"
 }
 ,{
     "testCaseDescription": "go-parameter-declarations-with-types-delete-replacement-test",
@@ -238,7 +253,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a int' parameter declaration in the foo function of the 'main' module"
+                    "summary": "Added the 'a int' parameter declaration in the foo function"
                 },
                 {
                     "span": {
@@ -265,7 +280,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x' identifier with the 'b' identifier in the foo function of the 'main' module"
+                    "summary": "Replaced the 'x' identifier with the 'b' identifier in the foo function"
                 },
                 {
                     "span": {
@@ -280,7 +295,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'y uint64' parameter declaration in the foo function of the 'main' module"
+                    "summary": "Deleted the 'y uint64' parameter declaration in the foo function"
                 }
             ]
         },
@@ -303,7 +318,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e9a034ba8648ede7074592effb77584769908921..a62c254b900279d25d32867f50b43f29cf80e00f"
+    "shas": "7f7499916d8951812d1af4dc3f9edea6512dd4ae..84be95e6cce29e23fe13ac460c34d9d3639945c1"
 }
 ,{
     "testCaseDescription": "go-parameter-declarations-with-types-delete-insert-test",
@@ -323,7 +338,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo' function in the main module"
+                    "summary": "Deleted the 'foo' function"
                 }
             ]
         },
@@ -346,7 +361,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a62c254b900279d25d32867f50b43f29cf80e00f..9bc7d216469b8d8a278b807dca1cace07b3cffdc"
+    "shas": "84be95e6cce29e23fe13ac460c34d9d3639945c1..a396a786548a4d67126f0631959c0c1b53b66b84"
 }
 ,{
     "testCaseDescription": "go-parameter-declarations-with-types-teardown-test",
@@ -361,12 +376,27 @@
                                 1
                             ],
                             "end": [
-                                7,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -389,5 +419,5 @@
         "-"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9bc7d216469b8d8a278b807dca1cace07b3cffdc..d294ce5018da872a8921d3401c507217daf06328"
+    "shas": "a396a786548a4d67126f0631959c0c1b53b66b84..840ffcc3fb49c5769944cce7b4fc8f444c2b1aed"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d2b5df75d8f6fa05372019f64a86177f47d3e2f6..9731904c92acb4d04b65d34e08b9d71071dcdc9a"
+    "shas": "4d24e891d2eff92e45db37ab2270eef8294e9145..116be4b3120f1f63486563e681291568543040a1"
 }
 ,{
     "testCaseDescription": "go-pointer-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'p1' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'p1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'p2' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'p2' type declaration in the main function"
                 }
             ]
         },
@@ -99,7 +114,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9731904c92acb4d04b65d34e08b9d71071dcdc9a..ed7d7ffc0969e8a9322c568c4b5691192fa53e29"
+    "shas": "116be4b3120f1f63486563e681291568543040a1..1d02b1285be95d48289fc2211acb0fa125211c7f"
 }
 ,{
     "testCaseDescription": "go-pointer-types-replacement-test",
@@ -184,7 +199,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ed7d7ffc0969e8a9322c568c4b5691192fa53e29..9c67261772de0af3f1d3a1daf03e9f2366d893c9"
+    "shas": "1d02b1285be95d48289fc2211acb0fa125211c7f..770917a4a293b42b5174083c47c9ff1fe396d74a"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-replacement-test",
@@ -269,7 +284,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9c67261772de0af3f1d3a1daf03e9f2366d893c9..144a9aa0c6060fe481a5fd96f5bcdecfa3e3a4f1"
+    "shas": "770917a4a293b42b5174083c47c9ff1fe396d74a..44240e8fb91d10af8d97d7680ae5e314f1b9488b"
 }
 ,{
     "testCaseDescription": "go-pointer-types-delete-insert-test",
@@ -289,7 +304,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'p1' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'p1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -304,7 +319,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'p2' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'p2' type declaration in the main function"
                 }
             ]
         },
@@ -330,7 +345,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "144a9aa0c6060fe481a5fd96f5bcdecfa3e3a4f1..4070351f018be548cadfc29137148e78bcab00d9"
+    "shas": "44240e8fb91d10af8d97d7680ae5e314f1b9488b..5d1dc64c31a4ecafee88706bb1cdda5eb1656f76"
 }
 ,{
     "testCaseDescription": "go-pointer-types-teardown-test",
@@ -345,12 +360,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -372,5 +402,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4070351f018be548cadfc29137148e78bcab00d9..ffe628ad363e676d5234caa95a87cf6b7f3626f8"
+    "shas": "5d1dc64c31a4ecafee88706bb1cdda5eb1656f76..8ae798e3c9773e3d5b6af35228d06445dd50426f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9b6482e7bca1a74c6ecdc400cf0ed146ebb6a29a..3b06e2854335bedd951acd5f610a193a8950ba8d"
+    "shas": "e86ae4b80ecf2b01260ea4afc56327253ab59646..0b24fa2e9250263fe1f145381ac2c399f2bc23a3"
 }
 ,{
     "testCaseDescription": "go-qualified-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'a' type declaration in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3b06e2854335bedd951acd5f610a193a8950ba8d..fa461b7018b844b35433dc120e6e9d5eb5ee403e"
+    "shas": "0b24fa2e9250263fe1f145381ac2c399f2bc23a3..126af8d1df2c5faeb2893ac84505890ebe324198"
 }
 ,{
     "testCaseDescription": "go-qualified-types-replacement-test",
@@ -163,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fa461b7018b844b35433dc120e6e9d5eb5ee403e..98c0500dc82c4fbe24656621178b4815b96fdfc9"
+    "shas": "126af8d1df2c5faeb2893ac84505890ebe324198..b27f53d7ebab5cff17b7faca0c11a5af4393a993"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-replacement-test",
@@ -245,7 +260,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "98c0500dc82c4fbe24656621178b4815b96fdfc9..b282ee0787fec70acb2eb0e3902092f4e9947f79"
+    "shas": "b27f53d7ebab5cff17b7faca0c11a5af4393a993..f349dcabe71c3355438e8c08830ed229a427dbce"
 }
 ,{
     "testCaseDescription": "go-qualified-types-delete-insert-test",
@@ -265,7 +280,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' type declaration in the main function"
                 }
             ]
         },
@@ -288,7 +303,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b282ee0787fec70acb2eb0e3902092f4e9947f79..846ee6590bfa7e86f523096b8a876a557732af95"
+    "shas": "f349dcabe71c3355438e8c08830ed229a427dbce..138ffc1319221b4f305f24212159aea75438ec8f"
 }
 ,{
     "testCaseDescription": "go-qualified-types-teardown-test",
@@ -303,12 +318,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -330,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "846ee6590bfa7e86f523096b8a876a557732af95..2a8d9f01f7c78b4014cc0cf0057b991673c39dd0"
+    "shas": "138ffc1319221b4f305f24212159aea75438ec8f..26a0f67120f1cf6fc8e13694d29195177fe1040e"
 }]

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

@@ -11,8 +11,8 @@
                                 1
                             ],
                             "end": [
-                                3,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
@@ -35,7 +35,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "39b5a7d4eaa477c3d1636e32ab2c5cf5c930372a..23dc2a672c4cc4345fe894e56e3d0db174dec0a9"
+    "shas": "663f0278d8c41aca54ae0d1849efc76213f9ba1f..1e54211c4612f5a3f6fddae7d3c3eae18327a9cd"
 }
 ,{
     "testCaseDescription": "go-rune-literals-insert-test",
@@ -55,7 +55,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' var assignment in the main module"
+                    "summary": "Added the 'a' var assignment"
                 },
                 {
                     "span": {
@@ -70,7 +70,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' var assignment in the main module"
+                    "summary": "Added the 'b' var assignment"
                 },
                 {
                     "span": {
@@ -85,7 +85,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c' var assignment in the main module"
+                    "summary": "Added the 'c' var assignment"
                 },
                 {
                     "span": {
@@ -100,7 +100,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'd' var assignment in the main module"
+                    "summary": "Added the 'd' var assignment"
                 },
                 {
                     "span": {
@@ -115,8 +115,12 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'e' var assignment in the main module"
-                },
+                    "summary": "Added the 'e' var assignment"
+                }
+            ]
+        },
+        "errors": {
+            "rune-literals.go": [
                 {
                     "span": {
                         "insert": {
@@ -124,62 +128,16 @@
                                 8,
                                 3
                             ],
-                            "end": [
-                                8,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                7
-                            ],
-                            "end": [
-                                8,
-                                9
-                            ]
-                        }
-                    },
-                    "summary": "Added the ''⌘' error in the main module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                9
-                            ],
-                            "end": [
-                                8,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'jjjj' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                13
-                            ],
                             "end": [
                                 9,
                                 1
                             ]
                         }
                     },
-                    "summary": "Added the ''\n' error in the main module"
+                    "summary": "Added 'f = '⌘jjjj'\n' at line 8, column 3 - line 9, column 1"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "rune-literals.go"
@@ -202,7 +160,7 @@
         "+)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "23dc2a672c4cc4345fe894e56e3d0db174dec0a9..7aed7c8739c2eac0863eacaf994d8eabdce7cb1d"
+    "shas": "1e54211c4612f5a3f6fddae7d3c3eae18327a9cd..7946dc95b2a2eaa4a44da409ed54a82a54ed188a"
 }
 ,{
     "testCaseDescription": "go-rune-literals-replacement-test",
@@ -234,7 +192,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''δ'' rune literal with the ''©'' rune literal in the a var assignment of the 'main' module"
+                    "summary": "Replaced the ''δ'' rune literal with the ''©'' rune literal in the a var assignment"
                 },
                 {
                     "span": {
@@ -261,7 +219,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the b var assignment of the 'main' module"
+                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the b var assignment"
                 },
                 {
                     "span": {
@@ -288,7 +246,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the c var assignment of the 'main' module"
+                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the c var assignment"
                 },
                 {
                     "span": {
@@ -315,7 +273,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the d var assignment of the 'main' module"
+                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the d var assignment"
                 },
                 {
                     "span": {
@@ -342,7 +300,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the e var assignment of the 'main' module"
+                    "summary": "Replaced the ''⌘'' rune literal with the ''©'' rune literal in the e var assignment"
                 },
                 {
                     "span": {
@@ -357,8 +315,12 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'f' var assignment in the main module"
-                },
+                    "summary": "Added the 'f' var assignment"
+                }
+            ]
+        },
+        "errors": {
+            "rune-literals.go": [
                 {
                     "span": {
                         "delete": {
@@ -366,62 +328,16 @@
                                 8,
                                 3
                             ],
-                            "end": [
-                                8,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                7
-                            ],
-                            "end": [
-                                8,
-                                9
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the ''⌘' error in the main module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                9
-                            ],
-                            "end": [
-                                8,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'jjjj' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                13
-                            ],
                             "end": [
                                 9,
                                 1
                             ]
                         }
                     },
-                    "summary": "Deleted the ''\n' error in the main module"
+                    "summary": "Deleted 'f = '⌘jjjj'\n' at line 8, column 3 - line 9, column 1"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "rune-literals.go"
@@ -449,7 +365,7 @@
         " )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7aed7c8739c2eac0863eacaf994d8eabdce7cb1d..ec461a8fd869ec7d76f4fd58bc588149153f716f"
+    "shas": "7946dc95b2a2eaa4a44da409ed54a82a54ed188a..9846819cac6a3814f8fc03011b6e0c38af042214"
 }
 ,{
     "testCaseDescription": "go-rune-literals-delete-replacement-test",
@@ -481,7 +397,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''©'' rune literal with the ''δ'' rune literal in the a var assignment of the 'main' module"
+                    "summary": "Replaced the ''©'' rune literal with the ''δ'' rune literal in the a var assignment"
                 },
                 {
                     "span": {
@@ -508,7 +424,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the b var assignment of the 'main' module"
+                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the b var assignment"
                 },
                 {
                     "span": {
@@ -535,7 +451,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the c var assignment of the 'main' module"
+                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the c var assignment"
                 },
                 {
                     "span": {
@@ -562,7 +478,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the d var assignment of the 'main' module"
+                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the d var assignment"
                 },
                 {
                     "span": {
@@ -589,67 +505,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the e var assignment of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                3
-                            ],
-                            "end": [
-                                8,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                7
-                            ],
-                            "end": [
-                                8,
-                                9
-                            ]
-                        }
-                    },
-                    "summary": "Added the ''⌘' error in the main module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                9
-                            ],
-                            "end": [
-                                8,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'jjjj' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                13
-                            ],
-                            "end": [
-                                9,
-                                1
-                            ]
-                        }
-                    },
-                    "summary": "Added the ''\n' error in the main module"
+                    "summary": "Replaced the ''©'' rune literal with the ''⌘'' rune literal in the e var assignment"
                 },
                 {
                     "span": {
@@ -664,11 +520,29 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'f' var assignment in the main module"
+                    "summary": "Deleted the 'f' var assignment"
                 }
             ]
         },
-        "errors": {}
+        "errors": {
+            "rune-literals.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                8,
+                                3
+                            ],
+                            "end": [
+                                9,
+                                1
+                            ]
+                        }
+                    },
+                    "summary": "Added 'f = '⌘jjjj'\n' at line 8, column 3 - line 9, column 1"
+                }
+            ]
+        }
     },
     "filePaths": [
         "rune-literals.go"
@@ -696,7 +570,7 @@
         " )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ec461a8fd869ec7d76f4fd58bc588149153f716f..9993f655e33779241cf9c1eac0effb677eab220e"
+    "shas": "9846819cac6a3814f8fc03011b6e0c38af042214..cc35d6332ea1c0dc789bfa7f461eba04824cf783"
 }
 ,{
     "testCaseDescription": "go-rune-literals-delete-insert-test",
@@ -716,7 +590,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' var assignment in the main module"
+                    "summary": "Deleted the 'a' var assignment"
                 },
                 {
                     "span": {
@@ -731,7 +605,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' var assignment in the main module"
+                    "summary": "Deleted the 'b' var assignment"
                 },
                 {
                     "span": {
@@ -746,7 +620,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c' var assignment in the main module"
+                    "summary": "Deleted the 'c' var assignment"
                 },
                 {
                     "span": {
@@ -761,7 +635,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'd' var assignment in the main module"
+                    "summary": "Deleted the 'd' var assignment"
                 },
                 {
                     "span": {
@@ -776,8 +650,12 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e' var assignment in the main module"
-                },
+                    "summary": "Deleted the 'e' var assignment"
+                }
+            ]
+        },
+        "errors": {
+            "rune-literals.go": [
                 {
                     "span": {
                         "delete": {
@@ -785,62 +663,16 @@
                                 8,
                                 3
                             ],
-                            "end": [
-                                8,
-                                4
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                7
-                            ],
-                            "end": [
-                                8,
-                                9
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the ''⌘' error in the main module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                9
-                            ],
-                            "end": [
-                                8,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'jjjj' identifier in the main module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                8,
-                                13
-                            ],
                             "end": [
                                 9,
                                 1
                             ]
                         }
                     },
-                    "summary": "Deleted the ''\n' error in the main module"
+                    "summary": "Deleted 'f = '⌘jjjj'\n' at line 8, column 3 - line 9, column 1"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "rune-literals.go"
@@ -863,7 +695,7 @@
         "+"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9993f655e33779241cf9c1eac0effb677eab220e..36a9483d64f31ef89f73f8aee014ca4a1dfc4d58"
+    "shas": "cc35d6332ea1c0dc789bfa7f461eba04824cf783..1cc444aa94d7784497f5d15ca15b1569b467732d"
 }
 ,{
     "testCaseDescription": "go-rune-literals-teardown-test",
@@ -878,8 +710,8 @@
                                 1
                             ],
                             "end": [
-                                3,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
@@ -902,5 +734,5 @@
         "-"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "36a9483d64f31ef89f73f8aee014ca4a1dfc4d58..a43f5210e8e5da594371eacab324e27889547ce0"
+    "shas": "1cc444aa94d7784497f5d15ca15b1569b467732d..fd41bb91afdd6087f0c3e6c54566857b7105df8c"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a5c82828c92a590f5a64d58dd4a626b294a2c565..931059c522f5de3c9c26c635a0d8309c5a15b163"
+    "shas": "cb913819d62f34c2cc72aa293b39fabca1a0f05c..16284699449cfa8d9ebef6df6c39765b1952a1f5"
 }
 ,{
     "testCaseDescription": "go-select-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added a select statement in the main function of the 'main' module"
+                    "summary": "Added a select statement in the main function"
                 }
             ]
         },
@@ -90,7 +105,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "931059c522f5de3c9c26c635a0d8309c5a15b163..783bd292c6edd57dbeecda21a7fa4779dd7df37e"
+    "shas": "16284699449cfa8d9ebef6df6c39765b1952a1f5..d72bb50ec9a41c5cad553f3a0d9dfb889749dee1"
 }
 ,{
     "testCaseDescription": "go-select-statements-replacement-test",
@@ -122,7 +137,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x' identifier with the 'a' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'x' identifier with the 'a' identifier in the main function"
                 },
                 {
                     "span": {
@@ -149,7 +164,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'y' identifier with the 'b' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'y' identifier with the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -207,7 +222,7 @@
         "     return"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "783bd292c6edd57dbeecda21a7fa4779dd7df37e..f41ff4cddf48a52a085d1342eb0f99089f143658"
+    "shas": "d72bb50ec9a41c5cad553f3a0d9dfb889749dee1..6556fe84b67435f6c768377975c181a125a5a9f1"
 }
 ,{
     "testCaseDescription": "go-select-statements-delete-replacement-test",
@@ -239,7 +254,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the main function"
                 },
                 {
                     "span": {
@@ -266,7 +281,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the main function"
                 },
                 {
                     "span": {
@@ -324,7 +339,7 @@
         "     return"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f41ff4cddf48a52a085d1342eb0f99089f143658..cccdfbcb5e7e96a105a3dc63051bd47d7f2a518e"
+    "shas": "6556fe84b67435f6c768377975c181a125a5a9f1..3882dca1074e6564bc01f79a1b44f2c0db17d3e2"
 }
 ,{
     "testCaseDescription": "go-select-statements-delete-insert-test",
@@ -344,7 +359,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted a select statement in the main function of the 'main' module"
+                    "summary": "Deleted a select statement in the main function"
                 }
             ]
         },
@@ -376,7 +391,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cccdfbcb5e7e96a105a3dc63051bd47d7f2a518e..016dfc524f2334477842e78c5c8e0d9a63760013"
+    "shas": "3882dca1074e6564bc01f79a1b44f2c0db17d3e2..51576f63dc98b44fbb1042065c9ab828a27dd5f7"
 }
 ,{
     "testCaseDescription": "go-select-statements-teardown-test",
@@ -391,12 +406,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -418,5 +448,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "016dfc524f2334477842e78c5c8e0d9a63760013..8ae829c0b1cf177164c31d8a3d6678bbc51d20c5"
+    "shas": "51576f63dc98b44fbb1042065c9ab828a27dd5f7..fa9acd974705290312a7cebdba09b18008dc6093"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "92abc0a7c86e4fde9374babdb2efcd398d27f6ac..d801e97024f83d9e1877e12a313446d798b56cc8"
+    "shas": "eca7c6083f4f3169ebc3bf726c3d936818a2d174..aeb74c519ca8d7d63e6d35cff856d277c571b6f7"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a[b][c]()' function call in the main function of the 'main' module"
+                    "summary": "Added the 'a[b][c]()' function call in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d801e97024f83d9e1877e12a313446d798b56cc8..ea2eeeacd1bd254d9b113e7743aca93de78e20c4"
+    "shas": "aeb74c519ca8d7d63e6d35cff856d277c571b6f7..a59ce1e7d20b1843f9b59495e1a6b3f7d8c096f4"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-replacement-test",
@@ -190,7 +205,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ea2eeeacd1bd254d9b113e7743aca93de78e20c4..5f3a65a2146a6f53f7898a59138cd7eff5ba13a7"
+    "shas": "a59ce1e7d20b1843f9b59495e1a6b3f7d8c096f4..9c0b77724a8c467d16ad46f5f184144b65216512"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-replacement-test",
@@ -299,7 +314,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5f3a65a2146a6f53f7898a59138cd7eff5ba13a7..c5794aa359e1f8866d3de42d8dc71b730f6cddec"
+    "shas": "9c0b77724a8c467d16ad46f5f184144b65216512..a2f408b126df5e135832ae9d566dab50031792ec"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-insert-test",
@@ -319,7 +334,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a[b][c]()' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'a[b][c]()' function call in the main function"
                 }
             ]
         },
@@ -342,7 +357,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c5794aa359e1f8866d3de42d8dc71b730f6cddec..166ba5c0c7069627f7f405f4b1b0e88c638f6cd8"
+    "shas": "a2f408b126df5e135832ae9d566dab50031792ec..7ee0dab9d8d593cbca3c6230313f3eaeda0ada55"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-teardown-test",
@@ -357,12 +372,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -384,5 +414,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "166ba5c0c7069627f7f405f4b1b0e88c638f6cd8..54cc2c98c56816e321a4fffb6927c2793f3cc794"
+    "shas": "7ee0dab9d8d593cbca3c6230313f3eaeda0ada55..0a55a88480be2cc766ee756b5b5f7bf45704376c"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "80bb1d299fa3720eb3cdcef8c428f696467572a8..ba6c9f47972e2a5d648603c09f723d009d6e8d18"
+    "shas": "1d4f678537c1a2636fd9eba370de9e81de874c72..9ff735e947d0cc8440903c7acee54ccd8de2cbc1"
 }
 ,{
     "testCaseDescription": "go-send-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo <- 5' send statement in the main function of the 'main' module"
+                    "summary": "Added the 'foo <- 5' send statement in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ba6c9f47972e2a5d648603c09f723d009d6e8d18..c42ab69df8aec76fe7bf0ca080bf1f79dd2b676e"
+    "shas": "9ff735e947d0cc8440903c7acee54ccd8de2cbc1..8fc0429afe1c5062f256e0423bf7f7dae8e0b1e2"
 }
 ,{
     "testCaseDescription": "go-send-statements-replacement-test",
@@ -113,7 +128,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'foo' identifier with the 'bar' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'foo' identifier with the 'bar' identifier in the main function"
                 },
                 {
                     "span": {
@@ -140,7 +155,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '5' with '6' in the main function of the 'main' module"
+                    "summary": "Replaced '5' with '6' in the main function"
                 }
             ]
         },
@@ -163,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c42ab69df8aec76fe7bf0ca080bf1f79dd2b676e..a3e71dbd1f3ef1035d929f31add8b1fa600d972d"
+    "shas": "8fc0429afe1c5062f256e0423bf7f7dae8e0b1e2..54cd41da0c7bb8d56aa5e7cd6f0903908c8e321b"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-replacement-test",
@@ -195,7 +210,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'bar' identifier with the 'foo' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'bar' identifier with the 'foo' identifier in the main function"
                 },
                 {
                     "span": {
@@ -222,7 +237,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '6' with '5' in the main function of the 'main' module"
+                    "summary": "Replaced '6' with '5' in the main function"
                 }
             ]
         },
@@ -245,7 +260,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a3e71dbd1f3ef1035d929f31add8b1fa600d972d..7c616dcf9e47d1a400931f274ccc02c3b73079bf"
+    "shas": "54cd41da0c7bb8d56aa5e7cd6f0903908c8e321b..3a2b37c02821a9daa3416c419f1efbad8ecb1ce4"
 }
 ,{
     "testCaseDescription": "go-send-statements-delete-insert-test",
@@ -265,7 +280,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo <- 5' send statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'foo <- 5' send statement in the main function"
                 }
             ]
         },
@@ -288,7 +303,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7c616dcf9e47d1a400931f274ccc02c3b73079bf..fa350bf0e3bd5e40724cf87b2fe792b32420ac11"
+    "shas": "3a2b37c02821a9daa3416c419f1efbad8ecb1ce4..4be86e6bc27ab2ed64363e832a3291202eecc707"
 }
 ,{
     "testCaseDescription": "go-send-statements-teardown-test",
@@ -303,12 +318,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -330,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fa350bf0e3bd5e40724cf87b2fe792b32420ac11..adb2401da7e74b66c885cf959788358c7ba5c3ee"
+    "shas": "4be86e6bc27ab2ed64363e832a3291202eecc707..bb4ba3185a52b92f422411ad6cae97a82e2b2657"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b534a2624a6f74eebed7bd6da21bc7df27018a96..a338438394d4abed73faf1a18db50b9ce7fd5d05"
+    "shas": "e3c2411f013b063d1c440d3a295be6485170c63d..3f76dd06eb1d09789402bf6941a8d177785db15d"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-insert-test",
@@ -54,18 +69,48 @@
                             ],
                             "end": [
                                 4,
-                                13
+                                2
                             ]
                         }
                     },
-                    "summary": "Added the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'a' identifier in the main function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
                                 4,
-                                1
+                                4
+                            ],
+                            "end": [
+                                4,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'b' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                9
+                            ],
+                            "end": [
+                                4,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added '1' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                12
                             ],
                             "end": [
                                 4,
@@ -73,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' var assignment in the main function of the 'main' module"
+                    "summary": "Added '2' in the main function"
                 }
             ]
         },
@@ -96,7 +141,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a338438394d4abed73faf1a18db50b9ce7fd5d05..1e403ac766aab96d8b2aaabca728c1ed81699dc5"
+    "shas": "3f76dd06eb1d09789402bf6941a8d177785db15d..187c1b52a8ed9334d34195fc341535c8d021c0d4"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-replacement-test",
@@ -128,34 +173,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the x var assignment of the 'main' function"
-                },
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    4,
-                                    9
-                                ],
-                                "end": [
-                                    4,
-                                    10
-                                ]
-                            },
-                            {
-                                "start": [
-                                    4,
-                                    9
-                                ],
-                                "end": [
-                                    4,
-                                    10
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced '1' with '3' in the x var assignment of the 'main' function"
+                    "summary": "Replaced the 'a' identifier with the 'x' identifier in the main function"
                 },
                 {
                     "span": {
@@ -182,7 +200,34 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the y var assignment of the 'main' function"
+                    "summary": "Replaced the 'b' identifier with the 'y' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    4,
+                                    9
+                                ],
+                                "end": [
+                                    4,
+                                    10
+                                ]
+                            },
+                            {
+                                "start": [
+                                    4,
+                                    9
+                                ],
+                                "end": [
+                                    4,
+                                    10
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced '1' with '3' in the main function"
                 },
                 {
                     "span": {
@@ -209,7 +254,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '2' with '4' in the y var assignment of the 'main' function"
+                    "summary": "Replaced '2' with '4' in the main function"
                 }
             ]
         },
@@ -232,7 +277,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1e403ac766aab96d8b2aaabca728c1ed81699dc5..e31233f516ea4df97b36bffc70f140f6af79caa3"
+    "shas": "187c1b52a8ed9334d34195fc341535c8d021c0d4..cb1ef5208e3c762f6d149a56bea8c42e448e8ef0"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-replacement-test",
@@ -264,34 +309,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x' identifier with the 'a' identifier in the a var assignment of the 'main' function"
-                },
-                {
-                    "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    4,
-                                    9
-                                ],
-                                "end": [
-                                    4,
-                                    10
-                                ]
-                            },
-                            {
-                                "start": [
-                                    4,
-                                    9
-                                ],
-                                "end": [
-                                    4,
-                                    10
-                                ]
-                            }
-                        ]
-                    },
-                    "summary": "Replaced '3' with '1' in the a var assignment of the 'main' function"
+                    "summary": "Replaced the 'x' identifier with the 'a' identifier in the main function"
                 },
                 {
                     "span": {
@@ -318,7 +336,34 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'y' identifier with the 'b' identifier in the b var assignment of the 'main' function"
+                    "summary": "Replaced the 'y' identifier with the 'b' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "replace": [
+                            {
+                                "start": [
+                                    4,
+                                    9
+                                ],
+                                "end": [
+                                    4,
+                                    10
+                                ]
+                            },
+                            {
+                                "start": [
+                                    4,
+                                    9
+                                ],
+                                "end": [
+                                    4,
+                                    10
+                                ]
+                            }
+                        ]
+                    },
+                    "summary": "Replaced '3' with '1' in the main function"
                 },
                 {
                     "span": {
@@ -345,7 +390,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '4' with '2' in the b var assignment of the 'main' function"
+                    "summary": "Replaced '4' with '2' in the main function"
                 }
             ]
         },
@@ -368,7 +413,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e31233f516ea4df97b36bffc70f140f6af79caa3..fe209f5ee06cef0653f60cd08571fd635a66b457"
+    "shas": "cb1ef5208e3c762f6d149a56bea8c42e448e8ef0..d7c2a9a102abb7226275c4d464907a4154b782c3"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-delete-insert-test",
@@ -384,18 +429,48 @@
                             ],
                             "end": [
                                 4,
-                                13
+                                2
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' identifier in the main function"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
                                 4,
-                                1
+                                4
+                            ],
+                            "end": [
+                                4,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'b' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                9
+                            ],
+                            "end": [
+                                4,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '1' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                12
                             ],
                             "end": [
                                 4,
@@ -403,7 +478,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the main function"
                 }
             ]
         },
@@ -426,7 +501,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fe209f5ee06cef0653f60cd08571fd635a66b457..c57c2196ef90d21ae6ecd07593b7e224ce45f1f2"
+    "shas": "d7c2a9a102abb7226275c4d464907a4154b782c3..716f05adcb3b0c9c3fcd7166f770fe32c639d348"
 }
 ,{
     "testCaseDescription": "go-short-var-declarations-teardown-test",
@@ -441,12 +516,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -468,5 +558,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c57c2196ef90d21ae6ecd07593b7e224ce45f1f2..47074688bbb73b3e4bf4fe48f221e411e5a9dcae"
+    "shas": "716f05adcb3b0c9c3fcd7166f770fe32c639d348..d5f8f49ab00e91cf9cf8a71dd94c14b3fa29aad8"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,28 +53,13 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f4187df470bc7a1989964a210ecab051ffbf6ee6..ecb901a6762362605dadbdffaf473d73e6b94df5"
+    "shas": "6de9ab15bd1a30f31bd2fdd3fefaef8985e7de52..7fefb122c064688a8968f969eac26609be94d94f"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-insert-test",
     "expectedResult": {
         "changes": {
             "single-import-declarations.go": [
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                4,
-                                1
-                            ],
-                            "end": [
-                                4,
-                                7
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'import' identifier in the main function of the 'main' module"
-                },
                 {
                     "span": {
                         "insert": {
@@ -73,22 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the \"net/http\" string in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                1
-                            ],
-                            "end": [
-                                5,
-                                7
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'import' identifier in the main function of the 'main' module"
+                    "summary": "Added the \"net/http\" string in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the \"some/dsl\" string in the main function of the 'main' module"
+                    "summary": "Added the \"some/dsl\" string in the main function"
                 },
                 {
                     "span": {
@@ -118,7 +103,41 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'import' identifier in the main function of the 'main' module"
+                    "summary": "Added the 'import' identifier in the main function"
+                }
+            ]
+        },
+        "errors": {
+            "single-import-declarations.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added 'import' at line 4, column 1 - line 4, column 7 in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added 'import .' at line 5, column 1 - line 5, column 9 in the main function"
                 },
                 {
                     "span": {
@@ -127,32 +146,16 @@
                                 6,
                                 8
                             ],
-                            "end": [
-                                6,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'alias' identifier in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                6,
-                                14
-                            ],
                             "end": [
                                 6,
                                 28
                             ]
                         }
                     },
-                    "summary": "Added the \"some/package\" string in the main function of the 'main' module"
+                    "summary": "Added 'alias \"some/package\"' at line 6, column 8 - line 6, column 28 in the main function"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "single-import-declarations.go"
@@ -173,7 +176,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ecb901a6762362605dadbdffaf473d73e6b94df5..c0a1539d6ec6fcae30b6d51910d103da40611255"
+    "shas": "7fefb122c064688a8968f969eac26609be94d94f..6dae7ceccb9cb8e85281d1a4c1d8c5d8c661255c"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-replacement-test",
@@ -205,7 +208,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"net/http\" string with the \"foo/bar\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"net/http\" string with the \"foo/bar\" string in the main function"
                 },
                 {
                     "span": {
@@ -232,7 +235,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"some/dsl\" string with the \"types/dsl\" string in the main function"
                 },
                 {
                     "span": {
@@ -259,7 +262,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"some/package\" string with the \"awesome/packages\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"some/package\" string with the \"awesome/packages\" string in the main function"
                 }
             ]
         },
@@ -286,7 +289,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c0a1539d6ec6fcae30b6d51910d103da40611255..9969e0e7578020fd9e352796aaed70ff7c363470"
+    "shas": "6dae7ceccb9cb8e85281d1a4c1d8c5d8c661255c..ae5e4f4a6a921e1170a9b85ae3b090f15172be85"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-replacement-test",
@@ -318,7 +321,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"foo/bar\" string with the \"net/http\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"foo/bar\" string with the \"net/http\" string in the main function"
                 },
                 {
                     "span": {
@@ -345,7 +348,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"types/dsl\" string with the \"some/dsl\" string in the main function"
                 },
                 {
                     "span": {
@@ -372,7 +375,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"awesome/packages\" string with the \"some/package\" string in the main function of the 'main' module"
+                    "summary": "Replaced the \"awesome/packages\" string with the \"some/package\" string in the main function"
                 }
             ]
         },
@@ -399,28 +402,13 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9969e0e7578020fd9e352796aaed70ff7c363470..c27faf90add827958f33afdb42e202228554d956"
+    "shas": "ae5e4f4a6a921e1170a9b85ae3b090f15172be85..be9944b647c93dcdb02ce3d892d04a35c1bd7f52"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-delete-insert-test",
     "expectedResult": {
         "changes": {
             "single-import-declarations.go": [
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                4,
-                                1
-                            ],
-                            "end": [
-                                4,
-                                7
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'import' identifier in the main function of the 'main' module"
-                },
                 {
                     "span": {
                         "delete": {
@@ -434,22 +422,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the \"net/http\" string in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                1
-                            ],
-                            "end": [
-                                5,
-                                7
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'import' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the \"net/http\" string in the main function"
                 },
                 {
                     "span": {
@@ -464,7 +437,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the \"some/dsl\" string in the main function of the 'main' module"
+                    "summary": "Deleted the \"some/dsl\" string in the main function"
                 },
                 {
                     "span": {
@@ -479,7 +452,41 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'import' identifier in the main function of the 'main' module"
+                    "summary": "Deleted the 'import' identifier in the main function"
+                }
+            ]
+        },
+        "errors": {
+            "single-import-declarations.go": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'import' at line 4, column 1 - line 4, column 7 in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'import .' at line 5, column 1 - line 5, column 9 in the main function"
                 },
                 {
                     "span": {
@@ -488,32 +495,16 @@
                                 6,
                                 8
                             ],
-                            "end": [
-                                6,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'alias' identifier in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                6,
-                                14
-                            ],
                             "end": [
                                 6,
                                 28
                             ]
                         }
                     },
-                    "summary": "Deleted the \"some/package\" string in the main function of the 'main' module"
+                    "summary": "Deleted 'alias \"some/package\"' at line 6, column 8 - line 6, column 28 in the main function"
                 }
             ]
-        },
-        "errors": {}
+        }
     },
     "filePaths": [
         "single-import-declarations.go"
@@ -534,7 +525,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c27faf90add827958f33afdb42e202228554d956..eb482cb703294d1f5cd117ad9c0a350463a0eb28"
+    "shas": "be9944b647c93dcdb02ce3d892d04a35c1bd7f52..d091a3255b8271e218572299738095d3efe19115"
 }
 ,{
     "testCaseDescription": "go-single-import-declarations-teardown-test",
@@ -549,12 +540,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -576,5 +582,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "eb482cb703294d1f5cd117ad9c0a350463a0eb28..2c47fd719e136db59fa2b3ccfab4572fe4c1be2c"
+    "shas": "d091a3255b8271e218572299738095d3efe19115..126db53cee9459e0927b80ed1af574cc273f948e"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,28 +53,13 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e5224329c24b2e2d564a10269e63b36c492d7bf5..3312d6a7e5ab88bd23a6abafd432862a90f72e77"
+    "shas": "7ebca2c2e26873ec2ec3d92c6922446eb95bb61f..cfc5ed7d21deace3c8eabd9d394e916da7e41a46"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-insert-test",
     "expectedResult": {
         "changes": {
             "single-line-function-declarations.go": [
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                4,
-                                6
-                            ],
-                            "end": [
-                                4,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f1()' function call in the main function of the 'main' module"
-                },
                 {
                     "span": {
                         "insert": {
@@ -73,22 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a()' function call in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f2()' function call in the main function of the 'main' module"
+                    "summary": "Added the 'a()' function call in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a()' function call in the main function of the 'main' module"
+                    "summary": "Added the 'a()' function call in the main function"
                 },
                 {
                     "span": {
@@ -118,22 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b()' function call in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                6,
-                                6
-                            ],
-                            "end": [
-                                6,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f3()' function call in the main function of the 'main' module"
+                    "summary": "Added the 'b()' function call in the main function"
                 },
                 {
                     "span": {
@@ -148,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a()' function call in the main function of the 'main' module"
+                    "summary": "Added the 'a()' function call in the main function"
                 },
                 {
                     "span": {
@@ -163,11 +133,59 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b()' function call in the main function of the 'main' module"
+                    "summary": "Added the 'b()' function call in the main function"
                 }
             ]
         },
-        "errors": {}
+        "errors": {
+            "single-line-function-declarations.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added 'func f1()' at line 4, column 1 - line 4, column 10 in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added 'func f2()' at line 5, column 1 - line 5, column 10 in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                6,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added 'func f3()' at line 6, column 1 - line 6, column 10 in the main function"
+                }
+            ]
+        }
     },
     "filePaths": [
         "single-line-function-declarations.go"
@@ -188,7 +206,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3312d6a7e5ab88bd23a6abafd432862a90f72e77..3b4e43cd88706feb3352b0d5cb5b3a31cc71995f"
+    "shas": "cfc5ed7d21deace3c8eabd9d394e916da7e41a46..978bbef12122d7954da3d7f7dfa67cfea28a84f9"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-replacement-test",
@@ -222,36 +240,6 @@
                     },
                     "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the g1() function call of the 'main' function"
                 },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'g2()' function call in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f2()' function call in the main function of the 'main' module"
-                },
                 {
                     "span": {
                         "replace": [
@@ -281,7 +269,40 @@
                 }
             ]
         },
-        "errors": {}
+        "errors": {
+            "single-line-function-declarations.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added 'func g2()' at line 5, column 1 - line 5, column 10 in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'func f2()' at line 5, column 1 - line 5, column 10 in the main function"
+                }
+            ]
+        }
     },
     "filePaths": [
         "single-line-function-declarations.go"
@@ -304,7 +325,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3b4e43cd88706feb3352b0d5cb5b3a31cc71995f..e5af3487fd74f8e7848f798682e4e440cae6b7c6"
+    "shas": "978bbef12122d7954da3d7f7dfa67cfea28a84f9..2896a28ff80236db618c50ceb2b9d9469a4ea425"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-replacement-test",
@@ -338,36 +359,6 @@
                     },
                     "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the f1() function call of the 'main' function"
                 },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f2()' function call in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'g2()' function call in the main function of the 'main' module"
-                },
                 {
                     "span": {
                         "replace": [
@@ -397,7 +388,40 @@
                 }
             ]
         },
-        "errors": {}
+        "errors": {
+            "single-line-function-declarations.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added 'func f2()' at line 5, column 1 - line 5, column 10 in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'func g2()' at line 5, column 1 - line 5, column 10 in the main function"
+                }
+            ]
+        }
     },
     "filePaths": [
         "single-line-function-declarations.go"
@@ -420,28 +444,13 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e5af3487fd74f8e7848f798682e4e440cae6b7c6..bac460f21956d6e7fe9ab2ef377e0815765c16b7"
+    "shas": "2896a28ff80236db618c50ceb2b9d9469a4ea425..94b20a0aaf7aef755357df422b0f96413e3532f9"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-delete-insert-test",
     "expectedResult": {
         "changes": {
             "single-line-function-declarations.go": [
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                4,
-                                6
-                            ],
-                            "end": [
-                                4,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f1()' function call in the main function of the 'main' module"
-                },
                 {
                     "span": {
                         "delete": {
@@ -455,22 +464,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a()' function call in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f2()' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'a()' function call in the main function"
                 },
                 {
                     "span": {
@@ -485,7 +479,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a()' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'a()' function call in the main function"
                 },
                 {
                     "span": {
@@ -500,22 +494,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b()' function call in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                6,
-                                6
-                            ],
-                            "end": [
-                                6,
-                                10
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f3()' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'b()' function call in the main function"
                 },
                 {
                     "span": {
@@ -530,7 +509,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a()' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'a()' function call in the main function"
                 },
                 {
                     "span": {
@@ -545,11 +524,59 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b()' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'b()' function call in the main function"
                 }
             ]
         },
-        "errors": {}
+        "errors": {
+            "single-line-function-declarations.go": [
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                1
+                            ],
+                            "end": [
+                                4,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'func f1()' at line 4, column 1 - line 4, column 10 in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'func f2()' at line 5, column 1 - line 5, column 10 in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                6,
+                                1
+                            ],
+                            "end": [
+                                6,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'func f3()' at line 6, column 1 - line 6, column 10 in the main function"
+                }
+            ]
+        }
     },
     "filePaths": [
         "single-line-function-declarations.go"
@@ -570,7 +597,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bac460f21956d6e7fe9ab2ef377e0815765c16b7..ced62ce15d64d383929a5e60c092f3fccef6beb2"
+    "shas": "94b20a0aaf7aef755357df422b0f96413e3532f9..911d3b87f28310cf84bd22c59757753c61dca6c4"
 }
 ,{
     "testCaseDescription": "go-single-line-function-declarations-teardown-test",
@@ -585,12 +612,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -612,5 +654,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ced62ce15d64d383929a5e60c092f3fccef6beb2..6eefcab8de06ce411a43f0fe718199942aa7d74b"
+    "shas": "911d3b87f28310cf84bd22c59757753c61dca6c4..aa75d831de9909c8ed71c01ca49d0b4ef4e4b7e8"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7f89178b8db506e68863bdca31d6ed7b5ef34432..9cbed93dd18fb5a433067f07af286fc91e37d580"
+    "shas": "8db0bd957201afac84d98da63dd95cb8e725c256..0b90f2526d52190d9afeab0e9f7f22fe14c94394"
 }
 ,{
     "testCaseDescription": "go-slice-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's1' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's1' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's2' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's2' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's3' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's3' var assignment in the main function"
                 }
             ]
         },
@@ -116,7 +131,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9cbed93dd18fb5a433067f07af286fc91e37d580..2d2bda48aedbb35ebadaacf82ace9b0df85a4f4a"
+    "shas": "0b90f2526d52190d9afeab0e9f7f22fe14c94394..d2ab6b2a6bc827f778accd158152671516e7148b"
 }
 ,{
     "testCaseDescription": "go-slice-literals-replacement-test",
@@ -148,7 +163,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the '{}' literal with the \"sup\" string in the []string{\"sup\"} slice literal of the 'main' function"
+                    "summary": "Replaced the '{}' literal with the \"sup\" string in the []string\"sup\" composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -175,7 +190,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hi\" string with the \"hello\" string in the []string{\"hello\"} slice literal of the 'main' function"
+                    "summary": "Replaced the \"hi\" string with the \"hello\" string in the []string\"hello\" composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -202,7 +217,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hi\" string with the \"bar\" string in the []string{\n\"bar\",\n \"baz\",\n} slice literal of the 'main' function"
+                    "summary": "Replaced the \"hi\" string with the \"bar\" string in the []string\"bar\", \"baz\" composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -229,7 +244,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hello\" string with the \"baz\" string in the []string{\n\"bar\",\n \"baz\",\n} slice literal of the 'main' function"
+                    "summary": "Replaced the \"hello\" string with the \"baz\" string in the []string\"bar\", \"baz\" composite_literal of the 'main' function"
                 }
             ]
         },
@@ -260,7 +275,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2d2bda48aedbb35ebadaacf82ace9b0df85a4f4a..7fbf589cc2afd7e04cfe40ea0a43f595d29c315f"
+    "shas": "d2ab6b2a6bc827f778accd158152671516e7148b..1df5ade839691a6de61d73b255d3c09de62f6bba"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-replacement-test",
@@ -292,7 +307,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"sup\" string with the '{}' literal in the []string{} slice literal of the 'main' function"
+                    "summary": "Replaced the \"sup\" string with the '{}' literal in the []string{} composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -319,7 +334,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"hello\" string with the \"hi\" string in the []string{\"hi\"} slice literal of the 'main' function"
+                    "summary": "Replaced the \"hello\" string with the \"hi\" string in the []string\"hi\" composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -346,7 +361,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"bar\" string with the \"hi\" string in the []string{\n\"hi\",\n \"hello\",\n} slice literal of the 'main' function"
+                    "summary": "Replaced the \"bar\" string with the \"hi\" string in the []string\"hi\", \"hello\" composite_literal of the 'main' function"
                 },
                 {
                     "span": {
@@ -373,7 +388,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"baz\" string with the \"hello\" string in the []string{\n\"hi\",\n \"hello\",\n} slice literal of the 'main' function"
+                    "summary": "Replaced the \"baz\" string with the \"hello\" string in the []string\"hi\", \"hello\" composite_literal of the 'main' function"
                 }
             ]
         },
@@ -404,7 +419,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7fbf589cc2afd7e04cfe40ea0a43f595d29c315f..82f42fdce01229819499fe0259f515475b325643"
+    "shas": "1df5ade839691a6de61d73b255d3c09de62f6bba..d772b054e12dc6500aa60b00277272b757caa6ac"
 }
 ,{
     "testCaseDescription": "go-slice-literals-delete-insert-test",
@@ -424,7 +439,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's1' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's1' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -439,7 +454,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's2' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's2' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -454,7 +469,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's3' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's3' var assignment in the main function"
                 }
             ]
         },
@@ -482,7 +497,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "82f42fdce01229819499fe0259f515475b325643..e2beb2e207d48d0916488297474e7ebc528a9ebb"
+    "shas": "d772b054e12dc6500aa60b00277272b757caa6ac..fb7e33bba45e0fce349cadac8b7fb638c9446dff"
 }
 ,{
     "testCaseDescription": "go-slice-literals-teardown-test",
@@ -497,12 +512,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -524,5 +554,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e2beb2e207d48d0916488297474e7ebc528a9ebb..ce81a7d517fc9a2808b223f5e2ec2b77fd6fad64"
+    "shas": "fb7e33bba45e0fce349cadac8b7fb638c9446dff..576026694b333d8935d7a3e88a32dbd0ed0b3fa4"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "50b59edcf73e7686cbfc6db242bf00346aebcf11..d6310fb2cb6a3013e2b74fbb86ad3747cbc8c3b0"
+    "shas": "242b339cd8dd07d6f1232ff7f96ee2eb324516d9..5b4731f5adac70903edeb633e9e21dd24b5786e4"
 }
 ,{
     "testCaseDescription": "go-slice-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c' type declaration in the main function"
                 }
             ]
         },
@@ -97,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d6310fb2cb6a3013e2b74fbb86ad3747cbc8c3b0..28aecb53c4b8319c2ccc461e4dcda828d54e2519"
+    "shas": "5b4731f5adac70903edeb633e9e21dd24b5786e4..c9b289da486a64d171721252d096cfe151f30a18"
 }
 ,{
     "testCaseDescription": "go-slice-types-replacement-test",
@@ -187,7 +202,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "28aecb53c4b8319c2ccc461e4dcda828d54e2519..7c99446920a5d7a179e4ad80f488390954ac9926"
+    "shas": "c9b289da486a64d171721252d096cfe151f30a18..fe1225e665ec5b7b147bf09bd6692c8092e4e4e2"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-replacement-test",
@@ -277,7 +292,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7c99446920a5d7a179e4ad80f488390954ac9926..b3d602bfbf09eaebab6252dbafa11cf16eea486a"
+    "shas": "fe1225e665ec5b7b147bf09bd6692c8092e4e4e2..270d41af2f2a6046963eceed150f5d08ea1c986f"
 }
 ,{
     "testCaseDescription": "go-slice-types-delete-insert-test",
@@ -297,7 +312,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -312,7 +327,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c' type declaration in the main function"
                 }
             ]
         },
@@ -336,7 +351,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b3d602bfbf09eaebab6252dbafa11cf16eea486a..c56ff2e3361eee55cbbe9c7f88a4b98bc660603b"
+    "shas": "270d41af2f2a6046963eceed150f5d08ea1c986f..d16cbfb0816b433e10a58e6ba96499e390853933"
 }
 ,{
     "testCaseDescription": "go-slice-types-teardown-test",
@@ -351,12 +366,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -378,5 +408,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c56ff2e3361eee55cbbe9c7f88a4b98bc660603b..e7ced9b59ed0acd00138211528dda1ac5c7c084a"
+    "shas": "d16cbfb0816b433e10a58e6ba96499e390853933..57665a31ef098c76a33d7fb8dc14586054888e70"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1ed63b35351e352f6ae6a546bb49920585747c54..c56cc611221c01bb9287c12f7a140673e10ab90d"
+    "shas": "d39cc6bcd81255864bc210bd0ab92a71c0a80cc2..16d9a34f668dbafe6dbdfac745ffc44545f4bd9e"
 }
 ,{
     "testCaseDescription": "go-string-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'a' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'b' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'b' var assignment in the main function"
                 }
             ]
         },
@@ -99,7 +114,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c56cc611221c01bb9287c12f7a140673e10ab90d..5c98f182bc937bb033e29f8fba6b4815154c9ddf"
+    "shas": "16d9a34f668dbafe6dbdfac745ffc44545f4bd9e..5619d5dc5d1278e4363419d4f9c02a729726fc39"
 }
 ,{
     "testCaseDescription": "go-string-literals-replacement-test",
@@ -184,7 +199,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5c98f182bc937bb033e29f8fba6b4815154c9ddf..625fbd81d426bac45985add4c251aef9b07bdb9a"
+    "shas": "5619d5dc5d1278e4363419d4f9c02a729726fc39..c4aa7c20e6d9a2950d7db2be45b980ddd7e99ce8"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-replacement-test",
@@ -269,7 +284,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "625fbd81d426bac45985add4c251aef9b07bdb9a..fb189b28aeac87b0e47f67f9cd4fcff3f5025568"
+    "shas": "c4aa7c20e6d9a2950d7db2be45b980ddd7e99ce8..e4a86bf76b1bf8a7419a94a59780b272876d53c1"
 }
 ,{
     "testCaseDescription": "go-string-literals-delete-insert-test",
@@ -289,7 +304,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -304,7 +319,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'b' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'b' var assignment in the main function"
                 }
             ]
         },
@@ -330,7 +345,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fb189b28aeac87b0e47f67f9cd4fcff3f5025568..6b98b0bc60654ce90e6f87db94145bc968e516b6"
+    "shas": "e4a86bf76b1bf8a7419a94a59780b272876d53c1..40eb9809170e085cc42ac58d979fca5b61d14679"
 }
 ,{
     "testCaseDescription": "go-string-literals-teardown-test",
@@ -345,12 +360,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -372,5 +402,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6b98b0bc60654ce90e6f87db94145bc968e516b6..7f89178b8db506e68863bdca31d6ed7b5ef34432"
+    "shas": "40eb9809170e085cc42ac58d979fca5b61d14679..8db0bd957201afac84d98da63dd95cb8e725c256"
 }]

test/corpus/diff-summaries/go/struct-field-declarations.json

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "965eb67a3019ef8aea91e5f5a3975bd6c27ddbd5..9ee5a9f77efee88839be792650cb42006c9944db"
+    "shas": "65bbc171b8f70b289f47abe480d261056b5ea251..2d2f04046fa3f3d412aa2637b4291e67833048c7"
 }
 ,{
     "testCaseDescription": "go-struct-field-declarations-insert-test",
@@ -83,7 +98,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9ee5a9f77efee88839be792650cb42006c9944db..dc61e6a712517a5a39433d0e53b63273a01d6fbb"
+    "shas": "2d2f04046fa3f3d412aa2637b4291e67833048c7..fff65061ac778ebd7eea2950833f8a0a715ef39f"
 }
 ,{
     "testCaseDescription": "go-struct-field-declarations-replacement-test",
@@ -110,12 +125,12 @@
                                 ],
                                 "end": [
                                     5,
-                                    11
+                                    4
                                 ]
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g int' field declaration with the 'h, i int' field declaration in the struct {\n  h, i int\n} struct type of the 'main' function"
+                    "summary": "Replaced the 'g int' field declaration with the 'h' identifier in the struct {\n  h, i int\n} struct type of the 'main' function"
                 }
             ]
         },
@@ -139,7 +154,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "dc61e6a712517a5a39433d0e53b63273a01d6fbb..50cb546cb19607f9c8a093b477ac5d44274dff8d"
+    "shas": "fff65061ac778ebd7eea2950833f8a0a715ef39f..68b3cf1b72905aa30e13bcc35e0c6f644e90898a"
 }
 ,{
     "testCaseDescription": "go-struct-field-declarations-delete-replacement-test",
@@ -156,7 +171,7 @@
                                 ],
                                 "end": [
                                     5,
-                                    11
+                                    4
                                 ]
                             },
                             {
@@ -171,7 +186,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'h, i int' field declaration with the 'g int' field declaration in the struct {\n  g int\n} struct type of the 'main' function"
+                    "summary": "Replaced the 'h' identifier with the 'g int' field declaration in the struct {\n  g int\n} struct type of the 'main' function"
                 }
             ]
         },
@@ -195,7 +210,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "50cb546cb19607f9c8a093b477ac5d44274dff8d..9c7b8ddb39b33db0564ba9e22a6e6802e14ad008"
+    "shas": "68b3cf1b72905aa30e13bcc35e0c6f644e90898a..278c27a97dbee140d6467c09af4c6c835c6eca6e"
 }
 ,{
     "testCaseDescription": "go-struct-field-declarations-delete-insert-test",
@@ -240,7 +255,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9c7b8ddb39b33db0564ba9e22a6e6802e14ad008..38cf3544fbd1e1cfb3b4aa39964fce74939ef046"
+    "shas": "278c27a97dbee140d6467c09af4c6c835c6eca6e..e8d2d6f98417cadd0f0706b362a004e24387f31a"
 }
 ,{
     "testCaseDescription": "go-struct-field-declarations-teardown-test",
@@ -255,12 +270,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -282,5 +312,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "38cf3544fbd1e1cfb3b4aa39964fce74939ef046..d6bf5b852da48acbbdc8d627de9e645d28d7f38d"
+    "shas": "e8d2d6f98417cadd0f0706b362a004e24387f31a..67d576bfc545aeab08b6970a41866b4643831ec5"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d8371152b551458e89b4e39819c41792bba80076..96eafb3baf0354f59b4e4ead7603dcb9a8c610c9"
+    "shas": "0c8ae16482a04b19b4a23f3af01e4d9f314b712e..1f15b0d1afbb74572f14840fe6bf05c90fc968d8"
 }
 ,{
     "testCaseDescription": "go-struct-literals-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's1' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's1' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's2' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's2' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's3' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 's3' var assignment in the main function"
                 }
             ]
         },
@@ -116,7 +131,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "96eafb3baf0354f59b4e4ead7603dcb9a8c610c9..787d8b0d4326b990ca39ecfa787d21dacfce56ea"
+    "shas": "1f15b0d1afbb74572f14840fe6bf05c90fc968d8..4494c26fb9999b04a2c61cf39c32d1d24e8d5f8d"
 }
 ,{
     "testCaseDescription": "go-struct-literals-replacement-test",
@@ -286,7 +301,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "787d8b0d4326b990ca39ecfa787d21dacfce56ea..b1e1747bfe7b356b150181c65accb131af2adc1a"
+    "shas": "4494c26fb9999b04a2c61cf39c32d1d24e8d5f8d..206d1a39d3694158ecdad426673ec76d48e374af"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-replacement-test",
@@ -456,7 +471,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b1e1747bfe7b356b150181c65accb131af2adc1a..9062d2928c093b9470596646a5802e7375970a2e"
+    "shas": "206d1a39d3694158ecdad426673ec76d48e374af..021bb0b55e32d2b017f2b4b29dddcd790cea242d"
 }
 ,{
     "testCaseDescription": "go-struct-literals-delete-insert-test",
@@ -476,7 +491,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's1' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's1' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -491,7 +506,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's2' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's2' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -506,7 +521,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's3' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 's3' var assignment in the main function"
                 }
             ]
         },
@@ -534,7 +549,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9062d2928c093b9470596646a5802e7375970a2e..e3dccb9f0e80e1d4dd95ad8f77fc1f3d70da1c56"
+    "shas": "021bb0b55e32d2b017f2b4b29dddcd790cea242d..dc132533bd95c31a8f5e9bb4b9a62e2feb4c10f6"
 }
 ,{
     "testCaseDescription": "go-struct-literals-teardown-test",
@@ -549,12 +564,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -576,5 +606,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e3dccb9f0e80e1d4dd95ad8f77fc1f3d70da1c56..80bb1d299fa3720eb3cdcef8c428f696467572a8"
+    "shas": "dc132533bd95c31a8f5e9bb4b9a62e2feb4c10f6..1d4f678537c1a2636fd9eba370de9e81de874c72"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e7ced9b59ed0acd00138211528dda1ac5c7c084a..b52397c136bdd9b41868a929f0d416ee1c6abf97"
+    "shas": "57665a31ef098c76a33d7fb8dc14586054888e70..3660aaf9358df40375f73cb4bfb377a1382b7d3e"
 }
 ,{
     "testCaseDescription": "go-struct-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's1' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 's1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's2' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 's2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's3' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 's3' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 's4' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 's4' type declaration in the main function"
                 }
             ]
         },
@@ -134,7 +149,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b52397c136bdd9b41868a929f0d416ee1c6abf97..3ec9ffbcf213c0e967d076756419ac146619b5cd"
+    "shas": "3660aaf9358df40375f73cb4bfb377a1382b7d3e..396230fe3c660ac63e571cbce1e3432349fb42c7"
 }
 ,{
     "testCaseDescription": "go-struct-types-replacement-test",
@@ -280,7 +295,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3ec9ffbcf213c0e967d076756419ac146619b5cd..895c808dc6465df7bf6059e4e773bb901b678834"
+    "shas": "396230fe3c660ac63e571cbce1e3432349fb42c7..44f4a72ca5904799754ac659baa3fd1191c5ae35"
 }
 ,{
     "testCaseDescription": "go-struct-types-delete-replacement-test",
@@ -426,7 +441,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "895c808dc6465df7bf6059e4e773bb901b678834..8794ab0649ceafe5f2b499a7313b43a94ece3a30"
+    "shas": "44f4a72ca5904799754ac659baa3fd1191c5ae35..3e3f6aef1912a00d1f54c15a2c9603db93e32783"
 }
 ,{
     "testCaseDescription": "go-struct-types-delete-insert-test",
@@ -446,7 +461,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's1' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 's1' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -461,7 +476,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's2' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 's2' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -476,7 +491,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's3' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 's3' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -491,7 +506,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 's4' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 's4' type declaration in the main function"
                 }
             ]
         },
@@ -522,7 +537,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8794ab0649ceafe5f2b499a7313b43a94ece3a30..604abe90628f68bfb8810ae9d7e6ea0d76547972"
+    "shas": "3e3f6aef1912a00d1f54c15a2c9603db93e32783..a77aaacc58bfdd55c6797f8f3d1fff0b15a8f1d5"
 }
 ,{
     "testCaseDescription": "go-struct-types-teardown-test",
@@ -537,12 +552,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -564,5 +594,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "604abe90628f68bfb8810ae9d7e6ea0d76547972..80f368e3e339a6f6cd13071fff11a504b589ebaa"
+    "shas": "a77aaacc58bfdd55c6797f8f3d1fff0b15a8f1d5..d27aeb5e58d624d463c84b7a506673945bee82fd"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6e1ebffb2ad214b1c4a7ab7a8efed9b6a25e8470..c86fa331f18f6196397e3ac03e3751626b49f22a"
+    "shas": "08c2e3dcd4ce51ddc9fd673ef182af5f0748761d..57eb15a262867634bb0669a59e07b4703d24240b"
 }
 ,{
     "testCaseDescription": "go-switch-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added a switch statement in the main function of the 'main' module"
+                    "summary": "Added a switch statement in the main function"
                 }
             ]
         },
@@ -84,7 +99,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c86fa331f18f6196397e3ac03e3751626b49f22a..fafd2357a4acfa84a9f5b4e59953c2e5ee9bd666"
+    "shas": "57eb15a262867634bb0669a59e07b4703d24240b..727028399225f191e4201a1172376ad9bf6cd0a2"
 }
 ,{
     "testCaseDescription": "go-switch-statements-replacement-test",
@@ -279,7 +294,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fafd2357a4acfa84a9f5b4e59953c2e5ee9bd666..59e626e9c3a21904b5361949d71bcaa64083a9e8"
+    "shas": "727028399225f191e4201a1172376ad9bf6cd0a2..880af6e91564040c1fc0334c6dd9f8a62a6d8cea"
 }
 ,{
     "testCaseDescription": "go-switch-statements-delete-replacement-test",
@@ -474,7 +489,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "59e626e9c3a21904b5361949d71bcaa64083a9e8..977098a7b050b573c879012ec716ae25e7009039"
+    "shas": "880af6e91564040c1fc0334c6dd9f8a62a6d8cea..687a060667a15c960b679bd47bad476720b066d2"
 }
 ,{
     "testCaseDescription": "go-switch-statements-delete-insert-test",
@@ -494,7 +509,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted a switch statement in the main function of the 'main' module"
+                    "summary": "Deleted a switch statement in the main function"
                 }
             ]
         },
@@ -520,7 +535,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "977098a7b050b573c879012ec716ae25e7009039..810ba951cb71bf751f77c956ce2666316d21149f"
+    "shas": "687a060667a15c960b679bd47bad476720b066d2..6e7cf473bef3db760568c7999a2e8c832b5e9ab2"
 }
 ,{
     "testCaseDescription": "go-switch-statements-teardown-test",
@@ -535,12 +550,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -562,5 +592,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "810ba951cb71bf751f77c956ce2666316d21149f..4c5c96874eeb7170044dd451dcc92cb8f852ec31"
+    "shas": "6e7cf473bef3db760568c7999a2e8c832b5e9ab2..259a41893cf92e7d6ded7e6b963dfc276e4dd3a2"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "668c02674516194c0623120c957d1be93af6cde5..a41667e052309ce89c4f555ccef62ea1f8765762"
+    "shas": "39c039e08c3764d56d26a74bbc7bb32704cc398c..bf275213eb7f0252ea00d4c4d512d7c1ad3a841c"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x.(z.Person)' type assertion statement in the main function of the 'main' module"
+                    "summary": "Added the 'x.(z.Person)' type assertion statement in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a41667e052309ce89c4f555ccef62ea1f8765762..41c4503413f54d4de3eecfe0dda21cec03dd0bf4"
+    "shas": "bf275213eb7f0252ea00d4c4d512d7c1ad3a841c..90dd626922974beae3ac02734b6a9040c20f8844"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-replacement-test",
@@ -113,7 +128,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x' identifier with the 'b' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'x' identifier with the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -140,7 +155,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'z.Person' qualified identifier with the 'c.Dog' qualified identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'z.Person' qualified identifier with the 'c.Dog' qualified identifier in the main function"
                 }
             ]
         },
@@ -163,7 +178,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "41c4503413f54d4de3eecfe0dda21cec03dd0bf4..7da6d7ad5b540a8e4d65b29ee231d9243b59245e"
+    "shas": "90dd626922974beae3ac02734b6a9040c20f8844..8c6d06fdf10722bafb109c5c8b03922b16b2e4b2"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-replacement-test",
@@ -195,7 +210,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'x' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'x' identifier in the main function"
                 },
                 {
                     "span": {
@@ -222,7 +237,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c.Dog' qualified identifier with the 'z.Person' qualified identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'c.Dog' qualified identifier with the 'z.Person' qualified identifier in the main function"
                 }
             ]
         },
@@ -245,7 +260,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7da6d7ad5b540a8e4d65b29ee231d9243b59245e..961545675dd701b933d6dd097dbec5c972f857a5"
+    "shas": "8c6d06fdf10722bafb109c5c8b03922b16b2e4b2..428e63d779c812b38a047f0ce6a7c94681735c64"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-insert-test",
@@ -265,7 +280,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x.(z.Person)' type assertion statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'x.(z.Person)' type assertion statement in the main function"
                 }
             ]
         },
@@ -288,7 +303,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "961545675dd701b933d6dd097dbec5c972f857a5..bc66239ed573f0367fd6330bd280f89c82fa4f0a"
+    "shas": "428e63d779c812b38a047f0ce6a7c94681735c64..3c31becef538d5dc5a68400e14ceff9b10ccca37"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-teardown-test",
@@ -303,12 +318,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -330,5 +360,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bc66239ed573f0367fd6330bd280f89c82fa4f0a..8cdc2760c296eb120ea2b2e67102c869542473e8"
+    "shas": "3c31becef538d5dc5a68400e14ceff9b10ccca37..7b340405bd9a9ab47d50717b924a791be7df4e4c"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8cdc2760c296eb120ea2b2e67102c869542473e8..060d556effe82691e9785813855a9ecac4c3d447"
+    "shas": "7b340405bd9a9ab47d50717b924a791be7df4e4c..e06123f66775f44daf42dbea18390891dd4df1d2"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '[]a.b(c.d)' type conversion expression in the main function of the 'main' module"
+                    "summary": "Added the '[]a.b(c.d)' type conversion expression in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '([]a.b)(c.d)' type conversion expression in the main function of the 'main' module"
+                    "summary": "Added the '([]a.b)(c.d)' type conversion expression in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'e[f](g)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'e[f](g)' function call in the main function"
                 },
                 {
                     "span": {
@@ -103,7 +118,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'e[f](g)' function call in the main function of the 'main' module"
+                    "summary": "Added the 'e[f](g)' function call in the main function"
                 }
             ]
         },
@@ -129,7 +144,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "060d556effe82691e9785813855a9ecac4c3d447..dba7ae9fc8a9a4600aa19a679d5bc6590832a890"
+    "shas": "e06123f66775f44daf42dbea18390891dd4df1d2..1079e1f0a50bda389b619cbc8c9ca9197315a2b9"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-replacement-test",
@@ -161,7 +176,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a.b' qualified identifier with the 'x.y' qualified identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'a.b' qualified identifier with the 'x.y' qualified identifier in the main function"
                 },
                 {
                     "span": {
@@ -242,7 +257,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a.b' qualified identifier with the 'f.g' qualified identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'a.b' qualified identifier with the 'f.g' qualified identifier in the main function"
                 },
                 {
                     "span": {
@@ -487,7 +502,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "dba7ae9fc8a9a4600aa19a679d5bc6590832a890..a5265cf460047217db17509db12cb7f501c39614"
+    "shas": "1079e1f0a50bda389b619cbc8c9ca9197315a2b9..f43697697c714dec9e9f0a7ca910b0fe61b3a6a1"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-delete-replacement-test",
@@ -519,7 +534,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'x.y' qualified identifier with the 'a.b' qualified identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'x.y' qualified identifier with the 'a.b' qualified identifier in the main function"
                 },
                 {
                     "span": {
@@ -600,7 +615,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f.g' qualified identifier with the 'a.b' qualified identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'f.g' qualified identifier with the 'a.b' qualified identifier in the main function"
                 },
                 {
                     "span": {
@@ -845,7 +860,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a5265cf460047217db17509db12cb7f501c39614..9bafa4b73c30416434a72d73bcf0c361015e479e"
+    "shas": "f43697697c714dec9e9f0a7ca910b0fe61b3a6a1..d23c4aa30ec95311b310f9091a49d55bb5a36ee6"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-delete-insert-test",
@@ -865,7 +880,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '[]a.b(c.d)' type conversion expression in the main function of the 'main' module"
+                    "summary": "Deleted the '[]a.b(c.d)' type conversion expression in the main function"
                 },
                 {
                     "span": {
@@ -880,7 +895,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '([]a.b)(c.d)' type conversion expression in the main function of the 'main' module"
+                    "summary": "Deleted the '([]a.b)(c.d)' type conversion expression in the main function"
                 },
                 {
                     "span": {
@@ -895,7 +910,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e[f](g)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'e[f](g)' function call in the main function"
                 },
                 {
                     "span": {
@@ -910,7 +925,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e[f](g)' function call in the main function of the 'main' module"
+                    "summary": "Deleted the 'e[f](g)' function call in the main function"
                 }
             ]
         },
@@ -936,7 +951,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9bafa4b73c30416434a72d73bcf0c361015e479e..cc6f207a8227743f511bd5cfa2c09ea9890641e3"
+    "shas": "d23c4aa30ec95311b310f9091a49d55bb5a36ee6..b26659150b0b7be7f597f4b0458b11040dfe685a"
 }
 ,{
     "testCaseDescription": "go-type-conversion-expressions-teardown-test",
@@ -951,12 +966,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -978,5 +1008,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cc6f207a8227743f511bd5cfa2c09ea9890641e3..bee7c2fa1efb34386277ca0b38c74178200faf54"
+    "shas": "b26659150b0b7be7f597f4b0458b11040dfe685a..62e181eaec5ef85a5d7816331750f05ed4be5ed3"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7193c3cab8046a6b2b57792ecbef7f2ad5f318b7..997e04ad887b3f63f5916a484d39b82b21e0a21e"
+    "shas": "407e4c1852d95bd8c9a3494899d65731e2bbb43f..25728b3aea7540b288bdba7aa562fb20ba2019ba"
 }
 ,{
     "testCaseDescription": "go-type-declarations-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -88,7 +103,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'c' type declaration in the main function of the 'main' module"
+                    "summary": "Added the 'c' type declaration in the main function"
                 }
             ]
         },
@@ -115,7 +130,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "997e04ad887b3f63f5916a484d39b82b21e0a21e..226a0ad42c1df879c6765ffd98a880b49f4286f1"
+    "shas": "25728b3aea7540b288bdba7aa562fb20ba2019ba..c398853e91bfceb57339f50c32e2076c8edc3f10"
 }
 ,{
     "testCaseDescription": "go-type-declarations-replacement-test",
@@ -311,7 +326,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "226a0ad42c1df879c6765ffd98a880b49f4286f1..b5068ea221a9731fae1c7d524ca4dd9821bc7b3d"
+    "shas": "c398853e91bfceb57339f50c32e2076c8edc3f10..15b226c3776ba2ca08c06e3d61ee6ccfc4ccd4ef"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-replacement-test",
@@ -507,7 +522,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b5068ea221a9731fae1c7d524ca4dd9821bc7b3d..5e5e473cd63105a7795c6570d5d73e7bbd1280ea"
+    "shas": "15b226c3776ba2ca08c06e3d61ee6ccfc4ccd4ef..7bebec4a6a031168e3daaaf0be17c5bdb981c2ff"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-insert-test",
@@ -527,7 +542,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -542,7 +557,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'a' type declaration in the main function"
                 },
                 {
                     "span": {
@@ -557,7 +572,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'c' type declaration in the main function of the 'main' module"
+                    "summary": "Deleted the 'c' type declaration in the main function"
                 }
             ]
         },
@@ -584,7 +599,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5e5e473cd63105a7795c6570d5d73e7bbd1280ea..0ea75c3e64c69c71df42e9afad3038188c8fa020"
+    "shas": "7bebec4a6a031168e3daaaf0be17c5bdb981c2ff..882eb3c2516e2c1dd64e1ced273a98c461e247c9"
 }
 ,{
     "testCaseDescription": "go-type-declarations-teardown-test",
@@ -599,12 +614,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -626,5 +656,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0ea75c3e64c69c71df42e9afad3038188c8fa020..cbaa77e08635ce41d412574590df4152cae3e4bc"
+    "shas": "882eb3c2516e2c1dd64e1ced273a98c461e247c9..8b23ffed2230fe0c2e75c1a02c179c9ff1726d8f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4c5c96874eeb7170044dd451dcc92cb8f852ec31..da66ddde911a1d26b2d8d388027db09d8cfaccaf"
+    "shas": "259a41893cf92e7d6ded7e6b963dfc276e4dd3a2..8dce6e38a34b47bc8ab779bdea2e6a3f2eb32eeb"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'e' switch statement in the main function of the 'main' module"
+                    "summary": "Added the 'e' switch statement in the main function"
                 }
             ]
         },
@@ -86,7 +101,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "da66ddde911a1d26b2d8d388027db09d8cfaccaf..c2416cc9d2b6aa03bb39c797332c3a2dbbb3aadf"
+    "shas": "8dce6e38a34b47bc8ab779bdea2e6a3f2eb32eeb..fe7af65017235cb0aa5b1cf9596dc880467a830b"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-replacement-test",
@@ -143,7 +158,7 @@
         "   case *Dog:"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c2416cc9d2b6aa03bb39c797332c3a2dbbb3aadf..8f2aea4bcb8da8f7c64a86bc338497b0e7fc69c5"
+    "shas": "fe7af65017235cb0aa5b1cf9596dc880467a830b..5550ebeea097dfc8b61407ac282806a1eb239051"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-replacement-test",
@@ -200,7 +215,7 @@
         "   case *Dog:"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8f2aea4bcb8da8f7c64a86bc338497b0e7fc69c5..a7781525b33688effa3e79836f8902782f74c427"
+    "shas": "5550ebeea097dfc8b61407ac282806a1eb239051..4c882301284f37700ebed2cb52f4bfdc407c1fce"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-delete-insert-test",
@@ -220,7 +235,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'e' switch statement in the main function of the 'main' module"
+                    "summary": "Deleted the 'e' switch statement in the main function"
                 }
             ]
         },
@@ -248,7 +263,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a7781525b33688effa3e79836f8902782f74c427..5bd6c81f2a297de8cdf8f186d8b834e893c1f78f"
+    "shas": "4c882301284f37700ebed2cb52f4bfdc407c1fce..6a8743c7c0edf3f07d48d3f7c2e2c04583c4bd04"
 }
 ,{
     "testCaseDescription": "go-type-switch-statements-teardown-test",
@@ -263,12 +278,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -290,5 +320,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "5bd6c81f2a297de8cdf8f186d8b834e893c1f78f..a5c82828c92a590f5a64d58dd4a626b294a2c565"
+    "shas": "6a8743c7c0edf3f07d48d3f7c2e2c04583c4bd04..cb913819d62f34c2cc72aa293b39fabca1a0f05c"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "bee7c2fa1efb34386277ca0b38c74178200faf54..ff56fcf05a07472f07956bf2d2b259658ae68b0b"
+    "shas": "62e181eaec5ef85a5d7816331750f05ed4be5ed3..ad7c2d4b1b3af4d629262b596d4d76591b0f2939"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '!<-a' operator in the main function of the 'main' module"
+                    "summary": "Added the '!<-a' operator in the main function"
                 },
                 {
                     "span": {
@@ -73,7 +88,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '*foo()' operator in the main function of the 'main' module"
+                    "summary": "Added the '*foo()' operator in the main function"
                 }
             ]
         },
@@ -97,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ff56fcf05a07472f07956bf2d2b259658ae68b0b..1a5ce5871077dfe3c63a9af84f81b078f35d8c70"
+    "shas": "ad7c2d4b1b3af4d629262b596d4d76591b0f2939..857884599a5b10f98e339f72e7e0ef5dff6ea432"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-replacement-test",
@@ -129,7 +144,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -181,7 +196,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1a5ce5871077dfe3c63a9af84f81b078f35d8c70..8650a686e3cce038628c50e77b00a5ff7943bfd8"
+    "shas": "857884599a5b10f98e339f72e7e0ef5dff6ea432..dacb9cd739035ebe3919a96f7f90cd75e48b832e"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-replacement-test",
@@ -213,7 +228,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the main function"
                 },
                 {
                     "span": {
@@ -265,7 +280,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8650a686e3cce038628c50e77b00a5ff7943bfd8..91bf29df3a0efe16134c69b6a8af7c63a7a62541"
+    "shas": "dacb9cd739035ebe3919a96f7f90cd75e48b832e..5ef7adc637975b15415197ba4e8ce354e69789fd"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-insert-test",
@@ -285,7 +300,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '!<-a' operator in the main function of the 'main' module"
+                    "summary": "Deleted the '!<-a' operator in the main function"
                 },
                 {
                     "span": {
@@ -300,7 +315,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '*foo()' operator in the main function of the 'main' module"
+                    "summary": "Deleted the '*foo()' operator in the main function"
                 }
             ]
         },
@@ -324,7 +339,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "91bf29df3a0efe16134c69b6a8af7c63a7a62541..b338ed0baff81143d1d5d24cd717b936335955b7"
+    "shas": "5ef7adc637975b15415197ba4e8ce354e69789fd..30d627648cb775a76037cf8a7ab0f03c8588727b"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-teardown-test",
@@ -339,12 +354,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -366,5 +396,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b338ed0baff81143d1d5d24cd717b936335955b7..bd47547e797a6e76a34e259077fc32181d6667f5"
+    "shas": "30d627648cb775a76037cf8a7ab0f03c8588727b..6ea06aa1e8431651d63087d1f623f409947a25f1"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "beaafb3d07a00910a1446a55ba991cc61f22aa65..f23f1b776ac8b43fcb4ffbd5ff576564a0e407f8"
+    "shas": "ba8c45bc969c0974d427789ea9cf408475593b4f..7d82093dc2c65d42e401f7a495fbe70a7cd7ed19"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-insert-test",
@@ -54,11 +69,11 @@
                             ],
                             "end": [
                                 4,
-                                9
+                                13
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' variable in the main function of the 'main' module"
+                    "summary": "Added the 'zero' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -69,26 +84,11 @@
                             ],
                             "end": [
                                 5,
-                                8
+                                20
                             ]
                         }
                     },
-                    "summary": "Added the 'one' variable in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                10
-                            ],
-                            "end": [
-                                5,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'two' variable in the main function of the 'main' module"
+                    "summary": "Added the 'one, two' var assignment in the main function"
                 }
             ]
         },
@@ -112,7 +112,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f23f1b776ac8b43fcb4ffbd5ff576564a0e407f8..ab684a45678699db4bf01cc3613b936f7b785c22"
+    "shas": "7d82093dc2c65d42e401f7a495fbe70a7cd7ed19..419274e5020690ffdfc80fa234fcead2517443e0"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-replacement-test",
@@ -144,7 +144,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a var assignment of the 'main' function"
                 },
                 {
                     "span": {
@@ -171,7 +171,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the b, c var assignment of the 'main' function"
                 },
                 {
                     "span": {
@@ -198,7 +198,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the b, c var assignment of the 'main' function"
                 }
             ]
         },
@@ -223,7 +223,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ab684a45678699db4bf01cc3613b936f7b785c22..a6ef8521dd858d3ada22ca793179985b651835c1"
+    "shas": "419274e5020690ffdfc80fa234fcead2517443e0..882172cbcf5efc650425926516515d7ad0104fad"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-replacement-test",
@@ -255,7 +255,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero var assignment of the 'main' function"
                 },
                 {
                     "span": {
@@ -282,7 +282,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the one, two var assignment of the 'main' function"
                 },
                 {
                     "span": {
@@ -309,7 +309,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the one, two var assignment of the 'main' function"
                 }
             ]
         },
@@ -334,7 +334,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a6ef8521dd858d3ada22ca793179985b651835c1..8ad019fda61a53d0fbc5438d5cd29ad3c8182152"
+    "shas": "882172cbcf5efc650425926516515d7ad0104fad..d9003bce5e60e442e3c65bd64ce31f514f56d5be"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-delete-insert-test",
@@ -350,11 +350,11 @@
                             ],
                             "end": [
                                 4,
-                                9
+                                13
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' variable in the main function of the 'main' module"
+                    "summary": "Deleted the 'zero' var assignment in the main function"
                 },
                 {
                     "span": {
@@ -365,26 +365,11 @@
                             ],
                             "end": [
                                 5,
-                                8
+                                20
                             ]
                         }
                     },
-                    "summary": "Deleted the 'one' variable in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                10
-                            ],
-                            "end": [
-                                5,
-                                13
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'two' variable in the main function of the 'main' module"
+                    "summary": "Deleted the 'one, two' var assignment in the main function"
                 }
             ]
         },
@@ -408,7 +393,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8ad019fda61a53d0fbc5438d5cd29ad3c8182152..d7aa7780028d8b79dcd30f425239703123a19c15"
+    "shas": "d9003bce5e60e442e3c65bd64ce31f514f56d5be..83bedace90d82120d06cc87c9e2993bafcd75174"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-no-expressions-teardown-test",
@@ -423,12 +408,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -450,5 +450,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d7aa7780028d8b79dcd30f425239703123a19c15..e75c5ac355ded95806073c70e83be9e9b3634163"
+    "shas": "83bedace90d82120d06cc87c9e2993bafcd75174..3dba2a559a0cc46933a2663e7b9cdcd4a92808d9"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "166ab1d1dfa2b18943f9d328cc47a34b4e4288fa..c72c09d81f43fbcbe4836588ced1f3a4fb63731f"
+    "shas": "e314d296ac8ddd2fee51a4cf45b812637d285244..3a54778e8643fed461c68e500e8eb6aa0ee72ab1"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-insert-test",
@@ -52,13 +67,43 @@
                                 4,
                                 5
                             ],
+                            "end": [
+                                4,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'zero' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                10
+                            ],
+                            "end": [
+                                4,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'int' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                16
+                            ],
                             "end": [
                                 4,
                                 17
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Added '0' in the main function"
                 },
                 {
                     "span": {
@@ -69,18 +114,63 @@
                             ],
                             "end": [
                                 5,
-                                27
+                                8
                             ]
                         }
                     },
-                    "summary": "Added the 'one' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'one' identifier in the main function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
                                 5,
-                                5
+                                10
+                            ],
+                            "end": [
+                                5,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'two' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                14
+                            ],
+                            "end": [
+                                5,
+                                20
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'uint64' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                23
+                            ],
+                            "end": [
+                                5,
+                                24
+                            ]
+                        }
+                    },
+                    "summary": "Added '1' in the main function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                26
                             ],
                             "end": [
                                 5,
@@ -88,7 +178,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Added '2' in the main function"
                 }
             ]
         },
@@ -112,7 +202,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "c72c09d81f43fbcbe4836588ced1f3a4fb63731f..46f18357b783f8a73ac8112e238e667ff4bc1378"
+    "shas": "3a54778e8643fed461c68e500e8eb6aa0ee72ab1..23e6404f39f85f4a31a72cb893ea7145518ca0c6"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-replacement-test",
@@ -144,7 +234,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the a var assignment of the 'main' function"
+                    "summary": "Replaced the 'zero' identifier with the 'a' identifier in the main function"
                 },
                 {
                     "span": {
@@ -171,7 +261,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the b var assignment of the 'main' function"
+                    "summary": "Replaced the 'one' identifier with the 'b' identifier in the main function"
                 },
                 {
                     "span": {
@@ -198,7 +288,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the c var assignment of the 'main' function"
+                    "summary": "Replaced the 'two' identifier with the 'c' identifier in the main function"
                 }
             ]
         },
@@ -223,7 +313,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "46f18357b783f8a73ac8112e238e667ff4bc1378..e7e4dfb126d1a6b2fb2bf72dd548beda84ffbfb4"
+    "shas": "23e6404f39f85f4a31a72cb893ea7145518ca0c6..c239ed4dccd2c65ccb5a7293327ebba940ad92b6"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-replacement-test",
@@ -255,7 +345,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the zero var assignment of the 'main' function"
+                    "summary": "Replaced the 'a' identifier with the 'zero' identifier in the main function"
                 },
                 {
                     "span": {
@@ -282,7 +372,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the one var assignment of the 'main' function"
+                    "summary": "Replaced the 'b' identifier with the 'one' identifier in the main function"
                 },
                 {
                     "span": {
@@ -309,7 +399,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the two var assignment of the 'main' function"
+                    "summary": "Replaced the 'c' identifier with the 'two' identifier in the main function"
                 }
             ]
         },
@@ -334,7 +424,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e7e4dfb126d1a6b2fb2bf72dd548beda84ffbfb4..82cfefb733a9091542c79228bb43a5cbcc284228"
+    "shas": "c239ed4dccd2c65ccb5a7293327ebba940ad92b6..f1c07b4aa5c85609e85929fcd6a42fe1270cb9d8"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-delete-insert-test",
@@ -348,13 +438,43 @@
                                 4,
                                 5
                             ],
+                            "end": [
+                                4,
+                                9
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'zero' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                10
+                            ],
+                            "end": [
+                                4,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'int' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                16
+                            ],
                             "end": [
                                 4,
                                 17
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '0' in the main function"
                 },
                 {
                     "span": {
@@ -365,18 +485,63 @@
                             ],
                             "end": [
                                 5,
-                                27
+                                8
                             ]
                         }
                     },
-                    "summary": "Deleted the 'one' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'one' identifier in the main function"
                 },
                 {
                     "span": {
                         "delete": {
                             "start": [
                                 5,
-                                5
+                                10
+                            ],
+                            "end": [
+                                5,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'two' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                14
+                            ],
+                            "end": [
+                                5,
+                                20
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'uint64' identifier in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                23
+                            ],
+                            "end": [
+                                5,
+                                24
+                            ]
+                        }
+                    },
+                    "summary": "Deleted '1' in the main function"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                26
                             ],
                             "end": [
                                 5,
@@ -384,7 +549,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the main function"
                 }
             ]
         },
@@ -408,7 +573,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "82cfefb733a9091542c79228bb43a5cbcc284228..9d2bb849a481840629ed6bcb2a17afc5e8e49a50"
+    "shas": "f1c07b4aa5c85609e85929fcd6a42fe1270cb9d8..8712527e7cc3056ebb8d176db32429befc4976a8"
 }
 ,{
     "testCaseDescription": "go-var-declarations-with-types-teardown-test",
@@ -423,12 +588,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -450,5 +630,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "9d2bb849a481840629ed6bcb2a17afc5e8e49a50..beaafb3d07a00910a1446a55ba991cc61f22aa65"
+    "shas": "8712527e7cc3056ebb8d176db32429befc4976a8..ba8c45bc969c0974d427789ea9cf408475593b4f"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "d7c7c21bb12a3b1d9bc3d7ac212a3bdada677d71..a5335e2199db7d1bb83520b275684bccb917d0ec"
+    "shas": "9c509bdfabb537255c810cd09cf45b53bf65628f..6241b8182026cf5a9a5ebb20894a2066ad61d7fa"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-insert-test",
@@ -58,7 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Added the 'zero' var assignment in the main function"
                 }
             ]
         },
@@ -81,7 +96,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "a5335e2199db7d1bb83520b275684bccb917d0ec..433d75dc1cf7583ffafeaddfe1742fe6c5024680"
+    "shas": "6241b8182026cf5a9a5ebb20894a2066ad61d7fa..4381dbdfbfc360ed15534ae1563ca7f307ba6fa3"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-replacement-test",
@@ -113,7 +128,22 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one var assignment of the 'main' function"
+                    "summary": "Replaced the 'zero' identifier with the 'one' identifier in the one, two var assignment of the 'main' function"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                4,
+                                10
+                            ],
+                            "end": [
+                                4,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'two' identifier in the one, two var assignment of the 'main' function"
                 },
                 {
                     "span": {
@@ -140,14 +170,14 @@
                             }
                         ]
                     },
-                    "summary": "Replaced '0' with '1' in the one var assignment of the 'main' function"
+                    "summary": "Replaced '0' with '1' in the one, two var assignment of the 'main' function"
                 },
                 {
                     "span": {
                         "insert": {
                             "start": [
                                 4,
-                                5
+                                19
                             ],
                             "end": [
                                 4,
@@ -155,7 +185,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Added '2' in the one, two var assignment of the 'main' function"
                 }
             ]
         },
@@ -178,7 +208,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "433d75dc1cf7583ffafeaddfe1742fe6c5024680..ff82d77c3bc0e5e12d28e5f0f9c19ff110e613f9"
+    "shas": "4381dbdfbfc360ed15534ae1563ca7f307ba6fa3..9e0bc36d4a23fcf88bbe39573c3060fb6c63a244"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-replacement-test",
@@ -212,6 +242,21 @@
                     },
                     "summary": "Replaced the 'one' identifier with the 'zero' identifier in the zero var assignment of the 'main' function"
                 },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                4,
+                                10
+                            ],
+                            "end": [
+                                4,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'two' identifier in the zero var assignment of the 'main' function"
+                },
                 {
                     "span": {
                         "replace": [
@@ -244,7 +289,7 @@
                         "delete": {
                             "start": [
                                 4,
-                                5
+                                19
                             ],
                             "end": [
                                 4,
@@ -252,7 +297,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'two' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted '2' in the zero var assignment of the 'main' function"
                 }
             ]
         },
@@ -275,7 +320,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ff82d77c3bc0e5e12d28e5f0f9c19ff110e613f9..8eea9984326d8bd0bda50b717d44cab9f6ff80cc"
+    "shas": "9e0bc36d4a23fcf88bbe39573c3060fb6c63a244..4d38dbeeb84c79bab4cd292803c2a9d6a8d2174a"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-delete-insert-test",
@@ -295,7 +340,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'zero' var assignment in the main function of the 'main' module"
+                    "summary": "Deleted the 'zero' var assignment in the main function"
                 }
             ]
         },
@@ -318,7 +363,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8eea9984326d8bd0bda50b717d44cab9f6ff80cc..87768b01d903d82a18843fe351755f1eaae28448"
+    "shas": "4d38dbeeb84c79bab4cd292803c2a9d6a8d2174a..b53811b73269e4466e33c70b3ce6619faee5a414"
 }
 ,{
     "testCaseDescription": "go-var-declarations-without-types-teardown-test",
@@ -333,12 +378,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -360,5 +420,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "87768b01d903d82a18843fe351755f1eaae28448..166ab1d1dfa2b18943f9d328cc47a34b4e4288fa"
+    "shas": "b53811b73269e4466e33c70b3ce6619faee5a414..e314d296ac8ddd2fee51a4cf45b812637d285244"
 }]

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

@@ -11,12 +11,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Added the 'main' module"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'main' function"
                 }
             ]
         },
@@ -38,7 +53,7 @@
         "+}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "6eefcab8de06ce411a43f0fe718199942aa7d74b..cbc15452a6708013f0559031ebb0190234de7422"
+    "shas": "aa75d831de9909c8ed71c01ca49d0b4ef4e4b7e8..9db615e38de5c59ee4b97268aabc270c799757eb"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-insert-test",
@@ -58,67 +73,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the '{}' block in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                8
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f2' identifier in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                9
-                            ],
-                            "end": [
-                                5,
-                                15
-                            ]
-                        }
-                    },
-                    "summary": "Added the '...int' parameter declaration in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                5,
-                                17
-                            ],
-                            "end": [
-                                5,
-                                19
-                            ]
-                        }
-                    },
-                    "summary": "Added the '{}' block in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                6,
-                                1
-                            ],
-                            "end": [
-                                6,
-                                23
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'f3' function in the main function of the 'main' module"
+                    "summary": "Added the '{}' expression statements in the main function"
                 }
             ]
         },
@@ -137,7 +92,22 @@
                             ]
                         }
                     },
-                    "summary": "Added '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"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                1
+                            ]
+                        }
+                    },
+                    "summary": "Added 'func f2(...int) {}\nfunc f3(a, ...bool) {}\n' at line 5, column 1 - line 7, column 1 in the main function"
                 }
             ]
         }
@@ -161,7 +131,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cbc15452a6708013f0559031ebb0190234de7422..b5a661d6c9c6eda94de5c3e4bf688ce16f57692a"
+    "shas": "9db615e38de5c59ee4b97268aabc270c799757eb..e6d1f6dee30000099d39ae30f4e31285dcd8a0a0"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-replacement-test",
@@ -193,7 +163,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'f1' identifier with the 'g1' identifier in the main function"
                 },
                 {
                     "span": {
@@ -220,7 +190,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'f2' identifier with the 'g2' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'f2' identifier with the 'g2' identifier in the main function"
                 },
                 {
                     "span": {
@@ -274,7 +244,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b5a661d6c9c6eda94de5c3e4bf688ce16f57692a..49205166c96eb0c07161f0e204911499761b30bc"
+    "shas": "e6d1f6dee30000099d39ae30f4e31285dcd8a0a0..4f6a3884d5c4e05ef0cdb21e07836f3d7d353e2d"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-replacement-test",
@@ -306,7 +276,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'g1' identifier with the 'f1' identifier in the main function"
                 },
                 {
                     "span": {
@@ -333,7 +303,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'g2' identifier with the 'f2' identifier in the main function of the 'main' module"
+                    "summary": "Replaced the 'g2' identifier with the 'f2' identifier in the main function"
                 },
                 {
                     "span": {
@@ -387,7 +357,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "49205166c96eb0c07161f0e204911499761b30bc..400b767878ef457aa783e1fe6d9448a474322df9"
+    "shas": "4f6a3884d5c4e05ef0cdb21e07836f3d7d353e2d..90853de5caa0e260fa11b902eaa7475ebdf99232"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-delete-insert-test",
@@ -407,67 +377,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the '{}' block in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                6
-                            ],
-                            "end": [
-                                5,
-                                8
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f2' identifier in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                9
-                            ],
-                            "end": [
-                                5,
-                                15
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the '...int' parameter declaration in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                5,
-                                17
-                            ],
-                            "end": [
-                                5,
-                                19
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the '{}' block in the main function of the 'main' module"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                6,
-                                1
-                            ],
-                            "end": [
-                                6,
-                                23
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the 'f3' function in the main function of the 'main' module"
+                    "summary": "Deleted the '{}' expression statements in the main function"
                 }
             ]
         },
@@ -486,7 +396,22 @@
                             ]
                         }
                     },
-                    "summary": "Deleted '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"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                7,
+                                1
+                            ]
+                        }
+                    },
+                    "summary": "Deleted 'func f2(...int) {}\nfunc f3(a, ...bool) {}\n' at line 5, column 1 - line 7, column 1 in the main function"
                 }
             ]
         }
@@ -510,7 +435,7 @@
         " }"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "400b767878ef457aa783e1fe6d9448a474322df9..cdcea7ca79996d80a7294a25aaafc60468b769ae"
+    "shas": "90853de5caa0e260fa11b902eaa7475ebdf99232..c5a13455d55bc14c5ff37ddbd752df78ca9cb4b2"
 }
 ,{
     "testCaseDescription": "go-variadic-function-declarations-teardown-test",
@@ -525,12 +450,27 @@
                                 1
                             ],
                             "end": [
-                                6,
-                                1
+                                1,
+                                13
                             ]
                         }
                     },
                     "summary": "Deleted the 'main' module"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                2
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'main' function"
                 }
             ]
         },
@@ -552,5 +492,5 @@
         "-}"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cdcea7ca79996d80a7294a25aaafc60468b769ae..2e4178577ebab07e2229a6846523de7a1a01d863"
+    "shas": "c5a13455d55bc14c5ff37ddbd752df78ca9cb4b2..a8adfaba3e02d1f9416a61ff929abbed0bc123d4"
 }]

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

@@ -34,7 +34,7 @@
         "+function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "07a785cb4f0cfa49a60fdfbbce7d8ecbfd2a820b..1ecbe6a443a701cf2b90740825d337914c3b01b8"
+    "shas": "5bd86096402e987462d865b5963d5e68f31ef22d..ba054a01632544846e183487e942b55c700841d4"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1ecbe6a443a701cf2b90740825d337914c3b01b8..1e649afd16b0e9145c760bd152b90dbf2eeb1c79"
+    "shas": "ba054a01632544846e183487e942b55c700841d4..4e386f088a9b83fb0712ede76f926ec4ab503bcc"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-insert-test",
@@ -196,7 +196,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1e649afd16b0e9145c760bd152b90dbf2eeb1c79..7fb344d8f58ce3935df46d0dc70e9f8f1896908f"
+    "shas": "4e386f088a9b83fb0712ede76f926ec4ab503bcc..37cd59e66cfa065774478f33d8c62adefe5459db"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-test",
@@ -303,7 +303,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7fb344d8f58ce3935df46d0dc70e9f8f1896908f..6d835d52398bfc6715ef4c40d2706dd8c11cb83a"
+    "shas": "37cd59e66cfa065774478f33d8c62adefe5459db..14d01e8232e8ab4ef9923517701cea5a39d9a06e"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-replacement-test",
@@ -374,7 +374,7 @@
         "+function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6d835d52398bfc6715ef4c40d2706dd8c11cb83a..fa0cd2354feb5199209c9aa13525567951185c88"
+    "shas": "14d01e8232e8ab4ef9923517701cea5a39d9a06e..62def272c237a2ea3061d38022bca1545f62425f"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-test",
@@ -413,7 +413,7 @@
         " function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fa0cd2354feb5199209c9aa13525567951185c88..a93d062ea69a6600b3f795d769e2557042925d66"
+    "shas": "62def272c237a2ea3061d38022bca1545f62425f..9c2e4c2c0015178634b7747dbc99adffc733ad14"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-rest-test",
@@ -451,5 +451,5 @@
         "-function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a93d062ea69a6600b3f795d769e2557042925d66..80946fe6667b3843c0bd704136ac929ca5f2e3e0"
+    "shas": "9c2e4c2c0015178634b7747dbc99adffc733ad14..c18d7bf565cc21b4eab97bee06b8182d71f79310"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index e69de29..4a26ae8 100644",
+        "index e69de29b..4a26ae86 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -0,0 +1 @@",
         "+function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2a5f85a471c9c83f2e835139afa5eb7bfecd546a..a2527ab39dbaa7651e66e24f3d143d11060841f6"
+    "shas": "c18d7bf565cc21b4eab97bee06b8182d71f79310..8872d92c96b47e465013ae1cd75ddd7bb7ab0f78"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index 4a26ae8..c31dd4b 100644",
+        "index 4a26ae86..c31dd4b7 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a2527ab39dbaa7651e66e24f3d143d11060841f6..4b3321e8a707ad91af6735319257f7f68fb593b7"
+    "shas": "8872d92c96b47e465013ae1cd75ddd7bb7ab0f78..c76f6c6269c776c99d92fd30687cfa77e62ea746"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index c31dd4b..6b1efa4 100644",
+        "index c31dd4b7..6b1efa42 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4b3321e8a707ad91af6735319257f7f68fb593b7..a01626612654464812b9cedaad745f686edc8138"
+    "shas": "c76f6c6269c776c99d92fd30687cfa77e62ea746..332ec447157ee23778ae3857a5a01f9e10ece1cc"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index 6b1efa4..c31dd4b 100644",
+        "index 6b1efa42..c31dd4b7 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a01626612654464812b9cedaad745f686edc8138..d640dfcedbbda8708bb8c679b2b96460e63e8e53"
+    "shas": "332ec447157ee23778ae3857a5a01f9e10ece1cc..795ada7689a6f349ad93621970b5f5ec5332ac86"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index c31dd4b..b8e05c0 100644",
+        "index c31dd4b7..b8e05c0e 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+function() { return 'hello'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d640dfcedbbda8708bb8c679b2b96460e63e8e53..f1436a17d64c050a7d6aa15fe0876ce3fc4176f0"
+    "shas": "795ada7689a6f349ad93621970b5f5ec5332ac86..83f67f1b48452e4d9b163a320152ae9dc8ef403a"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index b8e05c0..ce1ef83 100644",
+        "index b8e05c0e..ce1ef833 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " function() { return 'hello'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f1436a17d64c050a7d6aa15fe0876ce3fc4176f0..1bd2372f874ec3588d5510b5c7fa50c378b5e665"
+    "shas": "83f67f1b48452e4d9b163a320152ae9dc8ef403a..3a2d2bcd317d7b045070c4d90d694fc69c5b1f38"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/anonymous-parameterless-function.js b/anonymous-parameterless-function.js",
-        "index ce1ef83..e69de29 100644",
+        "index ce1ef833..e69de29b 100644",
         "--- a/anonymous-parameterless-function.js",
         "+++ b/anonymous-parameterless-function.js",
         "@@ -1 +0,0 @@",
         "-function() { return 'hello'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1bd2372f874ec3588d5510b5c7fa50c378b5e665..e66b1b20abc596d2b560eaa80f1749c79816f9ff"
+    "shas": "3a2d2bcd317d7b045070c4d90d694fc69c5b1f38..aab57fb5b99b7d08c03849736ffa873c26495bec"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index e69de29..3335582 100644",
+        "index e69de29b..33355825 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -0,0 +1 @@",
         "+[ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "654a538b26c9b4c8637e6c2e4cd497c93e690310..cbf013688399920af101ea056e9fba5ecba0601d"
+    "shas": "89b3d4cd2ef38999c223c69de3011646b1f43c24..82c5ec73355d6296c1bc8e6fbcd9606635930f42"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index 3335582..cf37d7c 100644",
+        "index 33355825..cf37d7c1 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " [ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cbf013688399920af101ea056e9fba5ecba0601d..87e3b9ed3c5f26c596ad2b5da90359174c84f53c"
+    "shas": "82c5ec73355d6296c1bc8e6fbcd9606635930f42..2c0dab888be8bb07c850408ff7f3c918c9b2f679"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-insert-test",
@@ -120,7 +120,7 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index cf37d7c..c2cb17f 100644",
+        "index cf37d7c1..c2cb17fa 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -1,3 +1,3 @@",
@@ -130,7 +130,7 @@
         " [ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "87e3b9ed3c5f26c596ad2b5da90359174c84f53c..ea49177e8ff82b772f7347682975cb1fa5e7b012"
+    "shas": "2c0dab888be8bb07c850408ff7f3c918c9b2f679..2836ffcd06212158191d83c6d23a76b86cd06aa6"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-test",
@@ -161,7 +161,7 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index c2cb17f..cf37d7c 100644",
+        "index c2cb17fa..cf37d7c1 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -1,3 +1,3 @@",
@@ -171,7 +171,7 @@
         " [ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ea49177e8ff82b772f7347682975cb1fa5e7b012..1e28fd793a6ab61ed59b28d8ee56b55be7ad79ec"
+    "shas": "2836ffcd06212158191d83c6d23a76b86cd06aa6..6c43843105004658edd13b116c23d3feffc3efb7"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-replacement-test",
@@ -232,7 +232,7 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index cf37d7c..a4d92b8 100644",
+        "index cf37d7c1..a4d92b81 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -1,3 +1,2 @@",
@@ -242,7 +242,7 @@
         "+[ \"item1\", \"item2\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1e28fd793a6ab61ed59b28d8ee56b55be7ad79ec..fdc62b5a013932e082ba61a576b8fb54cd1d0791"
+    "shas": "6c43843105004658edd13b116c23d3feffc3efb7..379a870647ba9da2b5faf25da3bd60c6d3983e47"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-test",
@@ -273,7 +273,7 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index a4d92b8..7f2f50e 100644",
+        "index a4d92b81..7f2f50e6 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -1,2 +1 @@",
@@ -281,7 +281,7 @@
         " [ \"item1\", \"item2\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fdc62b5a013932e082ba61a576b8fb54cd1d0791..9e91959fe3d3ec022474f242a8456b900fdfd8d2"
+    "shas": "379a870647ba9da2b5faf25da3bd60c6d3983e47..ca784abe43a28e84e087f70495667e2d0cc5ed77"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-rest-test",
@@ -312,12 +312,12 @@
     ],
     "patch": [
         "diff --git a/array.js b/array.js",
-        "index 7f2f50e..e69de29 100644",
+        "index 7f2f50e6..e69de29b 100644",
         "--- a/array.js",
         "+++ b/array.js",
         "@@ -1 +0,0 @@",
         "-[ \"item1\", \"item2\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9e91959fe3d3ec022474f242a8456b900fdfd8d2..0bdf412036a9a6aea51108a20404c37541fffcfb"
+    "shas": "ca784abe43a28e84e087f70495667e2d0cc5ed77..6a98861e426cf72452392e143d875b8ccd968a2c"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index e69de29..9ef167c 100644",
+        "index e69de29b..9ef167c0 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -0,0 +1 @@",
         "+(f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d700dc51fee7a3dd557906dcdf46d426285d7955..edda3c60ac532d534d84539648fa827ff18a6c59"
+    "shas": "9adc811773ddcc66050c739b5bc900c4c2daff55..043afc3820510a580d284b7c25a6095675ee1e78"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index 9ef167c..92dea6f 100644",
+        "index 9ef167c0..92dea6fa 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " (f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "edda3c60ac532d534d84539648fa827ff18a6c59..63fd87f8cafc4a46f2927f9825cc20e5f116a093"
+    "shas": "043afc3820510a580d284b7c25a6095675ee1e78..89e7ef95b30ed04038a529833bc78568279e96c4"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index 92dea6f..8f5bb51 100644",
+        "index 92dea6fa..8f5bb516 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " (f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "63fd87f8cafc4a46f2927f9825cc20e5f116a093..29b18be738dde19aa61343c5f4e54bf83f4b30ea"
+    "shas": "89e7ef95b30ed04038a529833bc78568279e96c4..0ca5ab429492655b4558f5ea07ee43e589cd38d9"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index 8f5bb51..92dea6f 100644",
+        "index 8f5bb516..92dea6fa 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " (f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "29b18be738dde19aa61343c5f4e54bf83f4b30ea..d92f900ef9873f273da632ea9c54adcd7acc7961"
+    "shas": "0ca5ab429492655b4558f5ea07ee43e589cd38d9..5fa58fce48a4fc866783eafd9c774329518a8333"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index 92dea6f..acab9a9 100644",
+        "index 92dea6fa..acab9a9c 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+(f, g) => { return g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d92f900ef9873f273da632ea9c54adcd7acc7961..243f2be7291992566bd0ab2c2caef9e7ac13e02d"
+    "shas": "5fa58fce48a4fc866783eafd9c774329518a8333..145bae33733e38aa912562a0ad1cacc5a595de17"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index acab9a9..ef1be25 100644",
+        "index acab9a9c..ef1be25b 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " (f, g) => { return g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "243f2be7291992566bd0ab2c2caef9e7ac13e02d..3128237c6d11459cf7d3e9add902e7be8d38710b"
+    "shas": "145bae33733e38aa912562a0ad1cacc5a595de17..437683161ec5a4d3efcdefde38c4f733402197b5"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/arrow-function.js b/arrow-function.js",
-        "index ef1be25..e69de29 100644",
+        "index ef1be25b..e69de29b 100644",
         "--- a/arrow-function.js",
         "+++ b/arrow-function.js",
         "@@ -1 +0,0 @@",
         "-(f, g) => { return g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3128237c6d11459cf7d3e9add902e7be8d38710b..5cab8720cde055f6d78f5c5deaf8980b89a434e1"
+    "shas": "437683161ec5a4d3efcdefde38c4f733402197b5..a50f5d25657afa02329debd2a87b7ffbb8f2b76d"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index e69de29..6882fe5 100644",
+        "index e69de29b..6882fe5e 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -0,0 +1 @@",
         "+x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "10c888c0caabf36cb211a96640afbe435dfad3fb..6a5eb86577a86881fdd53c3db17dd589617b887e"
+    "shas": "b8e96cb516ef4cd80a86e0b6a00f5d4e542141dd..aa1627d9ad30ddc96644440396be830160280595"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index 6882fe5..fb4cba4 100644",
+        "index 6882fe5e..fb4cba44 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6a5eb86577a86881fdd53c3db17dd589617b887e..79ca8610276bd0cc32d257702e20ec268187f1b6"
+    "shas": "aa1627d9ad30ddc96644440396be830160280595..ed0eb692d90f44c893700d15456f02b82c5adb89"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index fb4cba4..42e16c6 100644",
+        "index fb4cba44..42e16c61 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "79ca8610276bd0cc32d257702e20ec268187f1b6..c3da25392def8e82aaf0179cdd8cc51849d805c8"
+    "shas": "ed0eb692d90f44c893700d15456f02b82c5adb89..9c07d74d31da21c5ed0bb307a9b11a96e2da6f60"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index 42e16c6..fb4cba4 100644",
+        "index 42e16c61..fb4cba44 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c3da25392def8e82aaf0179cdd8cc51849d805c8..be4979757f9464e59b4b7fb7dbdce17f4f362029"
+    "shas": "9c07d74d31da21c5ed0bb307a9b11a96e2da6f60..bb29b11c0519aee4b1469d0510963e5d9f846e97"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index fb4cba4..11fe15d 100644",
+        "index fb4cba44..11fe15d7 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "be4979757f9464e59b4b7fb7dbdce17f4f362029..592d4d9a24fe20282bbaa1cf66bbe20959d47ae5"
+    "shas": "bb29b11c0519aee4b1469d0510963e5d9f846e97..daadf6daec7e50a39f21429277fb77556dfc202a"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index 11fe15d..198b8f8 100644",
+        "index 11fe15d7..198b8f89 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "592d4d9a24fe20282bbaa1cf66bbe20959d47ae5..f0b77709f5be6c1d671a943d73b8fbb12344762e"
+    "shas": "daadf6daec7e50a39f21429277fb77556dfc202a..f86e9f7675d8d6ad3fb9f6a2703e475b6eb24a8e"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/assignment.js b/assignment.js",
-        "index 198b8f8..e69de29 100644",
+        "index 198b8f89..e69de29b 100644",
         "--- a/assignment.js",
         "+++ b/assignment.js",
         "@@ -1 +0,0 @@",
         "-x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f0b77709f5be6c1d671a943d73b8fbb12344762e..83f3153b76f49e077237997c965dc6f3c3a159bc"
+    "shas": "f86e9f7675d8d6ad3fb9f6a2703e475b6eb24a8e..8971dc3263a4d4060368d23937d32f6df7c06d16"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index e69de29..021cf6a 100644",
+        "index e69de29b..021cf6ad 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -0,0 +1 @@",
         "+i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5edf134e2ccb0fa1cd27b2e07b4279575f1a5f0d..e2e6f5b9a61fa806befb17711cf3ae52dd20f725"
+    "shas": "e94c1e8feb32d2d104b927720bdde792ff068d76..e453aac09a219d4a9bbfc8eb2198ca734ae00e5f"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index 021cf6a..3e0b6c1 100644",
+        "index 021cf6ad..3e0b6c17 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e2e6f5b9a61fa806befb17711cf3ae52dd20f725..de455af0e3ab990d8f20a4555d4bf28324551ed0"
+    "shas": "e453aac09a219d4a9bbfc8eb2198ca734ae00e5f..babfc0072ddedb22fe570ce2954f9a6799436609"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index 3e0b6c1..18853d1 100644",
+        "index 3e0b6c17..18853d16 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "de455af0e3ab990d8f20a4555d4bf28324551ed0..59f5fd5cc14501c063c3ec3b9563503a4f22537b"
+    "shas": "babfc0072ddedb22fe570ce2954f9a6799436609..eafaa544de1815bbd0cc673d54267631871a450e"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index 18853d1..3e0b6c1 100644",
+        "index 18853d16..3e0b6c17 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "59f5fd5cc14501c063c3ec3b9563503a4f22537b..24328d0f069d5e61a5926bedf6e0a074361d7477"
+    "shas": "eafaa544de1815bbd0cc673d54267631871a450e..2b2bac368020ecb0f7c9b891c520a5dfc3ed91a0"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index 3e0b6c1..ee7d8de 100644",
+        "index 3e0b6c17..ee7d8dec 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+i >> k;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "24328d0f069d5e61a5926bedf6e0a074361d7477..083807f60ce4fd39ee7612cb97e2dc2351a09203"
+    "shas": "2b2bac368020ecb0f7c9b891c520a5dfc3ed91a0..30f79b75cc8c70e6ecfdfeeab06764bb85eb333f"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index ee7d8de..2800c8c 100644",
+        "index ee7d8dec..2800c8c8 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " i >> k;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "083807f60ce4fd39ee7612cb97e2dc2351a09203..1bceab9d521db6e74ccfca50dae11d9ac030a4bc"
+    "shas": "30f79b75cc8c70e6ecfdfeeab06764bb85eb333f..c1bb98a01fedb6e04efbe757fea478986c343761"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/bitwise-operator.js b/bitwise-operator.js",
-        "index 2800c8c..e69de29 100644",
+        "index 2800c8c8..e69de29b 100644",
         "--- a/bitwise-operator.js",
         "+++ b/bitwise-operator.js",
         "@@ -1 +0,0 @@",
         "-i >> k;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1bceab9d521db6e74ccfca50dae11d9ac030a4bc..4e47562dd59646a6c6c55ab138660495394bc5c9"
+    "shas": "c1bb98a01fedb6e04efbe757fea478986c343761..46ec065b158574c8c24c03f95bd0b21ae4388b86"
 }]

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

@@ -34,7 +34,7 @@
         "+i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dcb8509973be89c9c4f7239f90bc27b29abe6886..7278cbb3e1324846d217ed8b5d96d30b1d23c9e1"
+    "shas": "68249c6faa764e8f289c3ae7afb4c98267e953d8..3cc5dca41d21643bc3f747a52b88c31e6563d6ed"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7278cbb3e1324846d217ed8b5d96d30b1d23c9e1..dcbb69024b9472b7573c1284b9f2a9ba3c0bf241"
+    "shas": "3cc5dca41d21643bc3f747a52b88c31e6563d6ed..48f0f67eaa06dba7fc3c8f381f380b23e171cd43"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dcbb69024b9472b7573c1284b9f2a9ba3c0bf241..1d4a46d71e3418079b81f3b494ead0ddec0770ef"
+    "shas": "48f0f67eaa06dba7fc3c8f381f380b23e171cd43..253a952891f8ab38a872a1544b27d7372b223bcb"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-test",
@@ -195,7 +195,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1d4a46d71e3418079b81f3b494ead0ddec0770ef..59bf7426522f2e5a40fd2fbd5e9adc595c4a6f26"
+    "shas": "253a952891f8ab38a872a1544b27d7372b223bcb..6cfd731b9477f9b2c190e140a112ecf6854b4bef"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "59bf7426522f2e5a40fd2fbd5e9adc595c4a6f26..2aff614351987457ce3a0ce900610cf622e1765e"
+    "shas": "6cfd731b9477f9b2c190e140a112ecf6854b4bef..c7af49d44705dcf8ee38e13159ddc09eea64f683"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-test",
@@ -305,7 +305,7 @@
         " i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2aff614351987457ce3a0ce900610cf622e1765e..df4a601cd0eea4d8db63a7f7097753ae9fbd9f4b"
+    "shas": "c7af49d44705dcf8ee38e13159ddc09eea64f683..47df410d73472fbeb7cf2ebef0d6f21096395e51"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "df4a601cd0eea4d8db63a7f7097753ae9fbd9f4b..1d234a84ee270c0d6a329fcdcbc065e50bed813b"
+    "shas": "47df410d73472fbeb7cf2ebef0d6f21096395e51..e94c1e8feb32d2d104b927720bdde792ff068d76"
 }]

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

@@ -34,7 +34,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0e81c586bea55e0eeb46e3422b25ccba96c7d9ea..d86036d38621253021f5fde6256a16a5d58ffd49"
+    "shas": "7b8267eabe246347b009d08c9100f36a568a81a6..28130e2a01e50fed72c5d18d6ccd586431a83bfc"
 }
 ,{
     "testCaseDescription": "javascript-break-insert-test",
@@ -88,7 +88,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d86036d38621253021f5fde6256a16a5d58ffd49..c2a0cadf8477ba2c7525fba7c37923afd994ad15"
+    "shas": "28130e2a01e50fed72c5d18d6ccd586431a83bfc..317d999d5da052390013abf0f427fd789c566257"
 }
 ,{
     "testCaseDescription": "javascript-break-replacement-test",
@@ -142,7 +142,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c2a0cadf8477ba2c7525fba7c37923afd994ad15..3bcd48f5d5894250de6349c4ca5272b3ae92fa6d"
+    "shas": "317d999d5da052390013abf0f427fd789c566257..9fe6a556575e0705efd0de4d67f1868e143e16d0"
 }
 ,{
     "testCaseDescription": "javascript-break-delete-replacement-test",
@@ -196,7 +196,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3bcd48f5d5894250de6349c4ca5272b3ae92fa6d..bbabc7d7ad65f9ab05f74f83c6e5777a3eeb4be2"
+    "shas": "9fe6a556575e0705efd0de4d67f1868e143e16d0..7ecb84d91df841eddd510ab0c991ae5ca71b69f6"
 }
 ,{
     "testCaseDescription": "javascript-break-delete-insert-test",
@@ -250,7 +250,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "bbabc7d7ad65f9ab05f74f83c6e5777a3eeb4be2..016996f57081dda9f5b4ebdd801853944017b617"
+    "shas": "7ecb84d91df841eddd510ab0c991ae5ca71b69f6..2d0483e720373f442c34a5f9c1a097c6a318a7d8"
 }
 ,{
     "testCaseDescription": "javascript-break-teardown-test",
@@ -288,5 +288,5 @@
         "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "016996f57081dda9f5b4ebdd801853944017b617..7b31459c5a9378f4fe26f4e3e6d5c1fd3b6aee23"
+    "shas": "2d0483e720373f442c34a5f9c1a097c6a318a7d8..d0acf2e1ee4c3ff99054d1cd40885f62e64b87be"
 }]

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

@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'this.map(…)' method call"
+                    "summary": "Added the 'this.map(…)' function call"
                 }
             ]
         },
@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index e69de29..ce9ee1e 100644",
+        "index e69de29b..ce9ee1ed 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -0,0 +1 @@",
         "+this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1512ae1cef2a096ce2723ce98334e4ce0e4bc82b..2a014ee8fd6ea4f8ce5b6bae0ca35a4fa6462deb"
+    "shas": "e97f568708cabfc40035c206b04bf5b6abf6e5bd..f14828a645c440584da5db2b188a4155d63843e0"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-insert-test",
@@ -54,7 +54,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'this.reduce(…)' method call"
+                    "summary": "Added the 'this.reduce(…)' function call"
                 },
                 {
                     "span": {
@@ -69,7 +69,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'this.map(…)' method call"
+                    "summary": "Added the 'this.map(…)' function call"
                 }
             ]
         },
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index ce9ee1e..acba744 100644",
+        "index ce9ee1ed..acba744a 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2a014ee8fd6ea4f8ce5b6bae0ca35a4fa6462deb..6a6e1ae99abc9cae5f8ac31aac43836380944603"
+    "shas": "f14828a645c440584da5db2b188a4155d63843e0..861d17aed5329b7a49e2f97ae261307fe9b4431e"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-insert-test",
@@ -121,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'reduce' identifier with the 'map' identifier in the this.map(…) method call"
+                    "summary": "Replaced the 'reduce' identifier with the 'map' identifier in the this.map(…) function call"
                 },
                 {
                     "span": {
@@ -148,7 +148,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the this.map(…) method call"
+                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the this.map(…) function call"
                 },
                 {
                     "span": {
@@ -175,7 +175,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the this.map(…) method call"
+                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the this.map(…) function call"
                 }
             ]
         },
@@ -186,7 +186,7 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index acba744..7390534 100644",
+        "index acba744a..73905343 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -1,3 +1,3 @@",
@@ -196,7 +196,7 @@
         " this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6a6e1ae99abc9cae5f8ac31aac43836380944603..c86429cb689c74e2ce3988c8bc257a365734cbe3"
+    "shas": "861d17aed5329b7a49e2f97ae261307fe9b4431e..e2193800198a04799244dc9f70907be929bdc41f"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-test",
@@ -228,7 +228,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'map' identifier with the 'reduce' identifier in the this.reduce(…) method call"
+                    "summary": "Replaced the 'map' identifier with the 'reduce' identifier in the this.reduce(…) function call"
                 },
                 {
                     "span": {
@@ -255,7 +255,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the this.reduce(…) method call"
+                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the this.reduce(…) function call"
                 },
                 {
                     "span": {
@@ -282,7 +282,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the this.reduce(…) method call"
+                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the this.reduce(…) function call"
                 }
             ]
         },
@@ -293,7 +293,7 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index 7390534..acba744 100644",
+        "index 73905343..acba744a 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -1,3 +1,3 @@",
@@ -303,7 +303,7 @@
         " this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c86429cb689c74e2ce3988c8bc257a365734cbe3..c4df0b8afdd73cae6d89a9098ae38d9c3085dbb8"
+    "shas": "e2193800198a04799244dc9f70907be929bdc41f..53dec994d0dc3b7c7bcc9249cab85a543ef25200"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-replacement-test",
@@ -323,7 +323,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'this.reduce(…)' method call"
+                    "summary": "Deleted the 'this.reduce(…)' function call"
                 },
                 {
                     "span": {
@@ -338,7 +338,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'this.map(…)' method call"
+                    "summary": "Deleted the 'this.map(…)' function call"
                 },
                 {
                     "span": {
@@ -353,7 +353,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'this.reduce(…)' method call"
+                    "summary": "Added the 'this.reduce(…)' function call"
                 }
             ]
         },
@@ -364,7 +364,7 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index acba744..c4db432 100644",
+        "index acba744a..c4db4326 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -1,3 +1,2 @@",
@@ -374,7 +374,7 @@
         "+this.reduce(function (a) { return b.a; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c4df0b8afdd73cae6d89a9098ae38d9c3085dbb8..8b7dbbb0ca20e47dfed24fb3eb3a790721d2e9d0"
+    "shas": "53dec994d0dc3b7c7bcc9249cab85a543ef25200..294233550240c3b5f5b279f688cc1f0dd2416ceb"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-test",
@@ -394,7 +394,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'this.map(…)' method call"
+                    "summary": "Deleted the 'this.map(…)' function call"
                 }
             ]
         },
@@ -405,7 +405,7 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index c4db432..e593419 100644",
+        "index c4db4326..e5934198 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -1,2 +1 @@",
@@ -413,7 +413,7 @@
         " this.reduce(function (a) { return b.a; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8b7dbbb0ca20e47dfed24fb3eb3a790721d2e9d0..e2c2e86db834a0ab3c6006c6385e90d780851357"
+    "shas": "294233550240c3b5f5b279f688cc1f0dd2416ceb..bc7658e860c11b717d322c7c38b7b5be70af8169"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-rest-test",
@@ -433,7 +433,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'this.reduce(…)' method call"
+                    "summary": "Deleted the 'this.reduce(…)' function call"
                 }
             ]
         },
@@ -444,12 +444,12 @@
     ],
     "patch": [
         "diff --git a/chained-callbacks.js b/chained-callbacks.js",
-        "index e593419..e69de29 100644",
+        "index e5934198..e69de29b 100644",
         "--- a/chained-callbacks.js",
         "+++ b/chained-callbacks.js",
         "@@ -1 +0,0 @@",
         "-this.reduce(function (a) { return b.a; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e2c2e86db834a0ab3c6006c6385e90d780851357..5ef42771e35b5af39f3befe137fedf40f174a5c7"
+    "shas": "bc7658e860c11b717d322c7c38b7b5be70af8169..65ec4b91fc50d92244f898493564425dc91dec99"
 }]

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

@@ -34,7 +34,7 @@
         "+return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b4a1b602905b005b1bfe48d8f78faebd8c9cf016..e4dd7ea96606956464809e9a3bcfdb81f318c39b"
+    "shas": "c0d1f59dbc88b8a161e9dfa867107276f10b2898..b8c22790764e8661eb7f8d764e9b0af1b93cdd89"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-insert-test",
@@ -89,7 +89,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e4dd7ea96606956464809e9a3bcfdb81f318c39b..6365577e012aa898ba1d2cc77d10eec1fb9a016d"
+    "shas": "b8c22790764e8661eb7f8d764e9b0af1b93cdd89..63a6ea11f36663237346e70a138fd62524b9aef6"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-insert-test",
@@ -121,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'otherDefer' identifier with the 'newDefer' identifier in the returned.promise().done(…) method call"
+                    "summary": "Replaced the 'otherDefer' identifier with the 'newDefer' identifier in the returned.promise().done(…) function call"
                 },
                 {
                     "span": {
@@ -148,7 +148,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'otherDefer' identifier with the 'newDefer' identifier in the returned.promise().done(…).fail(…) method call"
+                    "summary": "Replaced the 'otherDefer' identifier with the 'newDefer' identifier in the returned.promise().done(…).fail(…) function call"
                 }
             ]
         },
@@ -169,7 +169,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6365577e012aa898ba1d2cc77d10eec1fb9a016d..8ab9cd6c506847581b2fc7f04124803cd344b3ff"
+    "shas": "63a6ea11f36663237346e70a138fd62524b9aef6..1bbcdcf73d6865d9695b99b229ac793f118439a4"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-test",
@@ -201,7 +201,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'newDefer' identifier with the 'otherDefer' identifier in the returned.promise().done(…) method call"
+                    "summary": "Replaced the 'newDefer' identifier with the 'otherDefer' identifier in the returned.promise().done(…) function call"
                 },
                 {
                     "span": {
@@ -228,7 +228,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'newDefer' identifier with the 'otherDefer' identifier in the returned.promise().done(…).fail(…) method call"
+                    "summary": "Replaced the 'newDefer' identifier with the 'otherDefer' identifier in the returned.promise().done(…).fail(…) function call"
                 }
             ]
         },
@@ -249,7 +249,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8ab9cd6c506847581b2fc7f04124803cd344b3ff..d535074522aa956a8ea7e8d943227d9d78775725"
+    "shas": "1bbcdcf73d6865d9695b99b229ac793f118439a4..6b89d7a2b0d652938ed2c5f638d5091c6d8555d2"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d535074522aa956a8ea7e8d943227d9d78775725..b3f90f50ba0ea4d42e78ba37c176a4d69282fcd7"
+    "shas": "6b89d7a2b0d652938ed2c5f638d5091c6d8555d2..99c802ed801ddf5a24e177c5a08fc18f2658c6ce"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-test",
@@ -359,7 +359,7 @@
         " return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b3f90f50ba0ea4d42e78ba37c176a4d69282fcd7..6dd90e85a905d3c205cd42bcbedaa3d50110d426"
+    "shas": "99c802ed801ddf5a24e177c5a08fc18f2658c6ce..6b0b1796a40ecd246a53b69ffa84e15966547ff9"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-rest-test",
@@ -397,5 +397,5 @@
         "-return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6dd90e85a905d3c205cd42bcbedaa3d50110d426..7b26c97829302e6f2c2fc76d9a1e5dc25caf58d9"
+    "shas": "6b0b1796a40ecd246a53b69ffa84e15966547ff9..e97f568708cabfc40035c206b04bf5b6abf6e5bd"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index e69de29..8f6ae64 100644",
+        "index e69de29b..8f6ae64d 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -0,0 +1 @@",
         "+class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f6dfeb42af9db740677fd60341ea39da711f7c81..f071d25d12bb0086a285449efbe5cfaeeed8e436"
+    "shas": "d9d6e19c015a3f2dbb9d04d3867b13889dd798ac..05fc0916c3ad9408a0e1b0fd90bb83d43628e892"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index 8f6ae64..b509437 100644",
+        "index 8f6ae64d..b509437f 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f071d25d12bb0086a285449efbe5cfaeeed8e436..ba736a07888eb4991323c035f2bf78fe1650ea56"
+    "shas": "05fc0916c3ad9408a0e1b0fd90bb83d43628e892..4204d9bb3c5c1cfab6dc2b6af925b0666d015cb0"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-insert-test",
@@ -192,7 +192,7 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index b509437..c4f5c91 100644",
+        "index b509437f..c4f5c91c 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -1,3 +1,3 @@",
@@ -202,7 +202,7 @@
         " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ba736a07888eb4991323c035f2bf78fe1650ea56..c99d7b8dc9cff808ef1e6010caa4573ad1694d9b"
+    "shas": "4204d9bb3c5c1cfab6dc2b6af925b0666d015cb0..18b9de02fda94811dad14657d61160c8943b6576"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-test",
@@ -305,7 +305,7 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index c4f5c91..b509437 100644",
+        "index c4f5c91c..b509437f 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -1,3 +1,3 @@",
@@ -315,7 +315,7 @@
         " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c99d7b8dc9cff808ef1e6010caa4573ad1694d9b..75a0caa880f62a0706ff723f555a9ec1f0c53c29"
+    "shas": "18b9de02fda94811dad14657d61160c8943b6576..c4c35843b5c7aa3d018d196d8fb86f2495b7881c"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-replacement-test",
@@ -376,7 +376,7 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index b509437..b1ef404 100644",
+        "index b509437f..b1ef404f 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -1,3 +1,2 @@",
@@ -386,7 +386,7 @@
         "+class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "75a0caa880f62a0706ff723f555a9ec1f0c53c29..4231a3b306d145aa37ceb879ef6f8da6221e54b8"
+    "shas": "c4c35843b5c7aa3d018d196d8fb86f2495b7881c..af0a7a4e55d3b67109f4455766d91410a6113c76"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-test",
@@ -417,7 +417,7 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index b1ef404..2c17f72 100644",
+        "index b1ef404f..2c17f72f 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -1,2 +1 @@",
@@ -425,7 +425,7 @@
         " class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4231a3b306d145aa37ceb879ef6f8da6221e54b8..d5627235989da4028cfcb15c4b1ee2bdc544fd31"
+    "shas": "af0a7a4e55d3b67109f4455766d91410a6113c76..417e7b1dc2606c4235a0fecf05b8d1c3c170f661"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-rest-test",
@@ -456,12 +456,12 @@
     ],
     "patch": [
         "diff --git a/class.js b/class.js",
-        "index 2c17f72..e69de29 100644",
+        "index 2c17f72f..e69de29b 100644",
         "--- a/class.js",
         "+++ b/class.js",
         "@@ -1 +0,0 @@",
         "-class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d5627235989da4028cfcb15c4b1ee2bdc544fd31..654a538b26c9b4c8637e6c2e4cd497c93e690310"
+    "shas": "417e7b1dc2606c4235a0fecf05b8d1c3c170f661..89b3d4cd2ef38999c223c69de3011646b1f43c24"
 }]

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

@@ -42,14 +42,14 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index e69de29..cff019f 100644",
+        "index e69de29b..cff019f3 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -0,0 +1 @@",
         "+a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ec86aaba01801d01aca70fd31403642be1e2d438..b0a5f928a8a4594bb176a56275c43ccab6e2e2a0"
+    "shas": "a51b44e93b10645f205b119e37a93f384ee4d64c..ac141d1975c9e286bd16621b4b3ae94bb090d770"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-insert-test",
@@ -110,7 +110,7 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index cff019f..93ece10 100644",
+        "index cff019f3..93ece10f 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -1 +1,3 @@",
@@ -119,7 +119,7 @@
         " a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b0a5f928a8a4594bb176a56275c43ccab6e2e2a0..315b46ccdb9a45c374b4ed1cc51a062d74c13a78"
+    "shas": "ac141d1975c9e286bd16621b4b3ae94bb090d770..78f0ad9203b9d8f4a9265f3187898608a6b7b22a"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-insert-test",
@@ -180,7 +180,7 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index 93ece10..f738c2d 100644",
+        "index 93ece10f..f738c2db 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -190,7 +190,7 @@
         " a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "315b46ccdb9a45c374b4ed1cc51a062d74c13a78..30cf69eb0cc5543fe53be82f29cd0e0371e30cd1"
+    "shas": "78f0ad9203b9d8f4a9265f3187898608a6b7b22a..ef480cfe1b76305d27d2601402153b0c1db0a8c6"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-test",
@@ -251,7 +251,7 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index f738c2d..93ece10 100644",
+        "index f738c2db..93ece10f 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -261,7 +261,7 @@
         " a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "30cf69eb0cc5543fe53be82f29cd0e0371e30cd1..a454c132f64a253a51cbf1a1455e74fca9343c23"
+    "shas": "ef480cfe1b76305d27d2601402153b0c1db0a8c6..7040e05f7443780ecfd99ae3c2a6bf0f62a9c9c3"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-replacement-test",
@@ -337,7 +337,7 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index 93ece10..297e28d 100644",
+        "index 93ece10f..297e28dd 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -1,3 +1,2 @@",
@@ -347,7 +347,7 @@
         "+c = {d: (3, 4 + 5, 6)};"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a454c132f64a253a51cbf1a1455e74fca9343c23..db24ea61ad00e73c91b0a4b616f333a5eac48f29"
+    "shas": "7040e05f7443780ecfd99ae3c2a6bf0f62a9c9c3..1733573e2a24dd8395474b1fbe2ffbf73a129dcb"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-test",
@@ -393,7 +393,7 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index 297e28d..421bc7f 100644",
+        "index 297e28dd..421bc7fe 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -1,2 +1 @@",
@@ -401,7 +401,7 @@
         " c = {d: (3, 4 + 5, 6)};"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "db24ea61ad00e73c91b0a4b616f333a5eac48f29..4ec8128c2ab11f7bf00c002d0fec6c8601b14c16"
+    "shas": "1733573e2a24dd8395474b1fbe2ffbf73a129dcb..94c3384b441a218b1720ef3c6934e69c172d938d"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-rest-test",
@@ -432,12 +432,12 @@
     ],
     "patch": [
         "diff --git a/comma-operator.js b/comma-operator.js",
-        "index 421bc7f..e69de29 100644",
+        "index 421bc7fe..e69de29b 100644",
         "--- a/comma-operator.js",
         "+++ b/comma-operator.js",
         "@@ -1 +0,0 @@",
         "-c = {d: (3, 4 + 5, 6)};"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4ec8128c2ab11f7bf00c002d0fec6c8601b14c16..0ccf8092231ebc8ac92cc60fe614f1681bc03a89"
+    "shas": "94c3384b441a218b1720ef3c6934e69c172d938d..4e62b822a53dcb5dd4c87ffe6ce9db53015fdc68"
 }]

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

@@ -9,14 +9,14 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index e69de29..a5821d2 100644",
+        "index e69de29b..a5821d24 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -0,0 +1 @@",
         "+// This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "81bc4513ad3979452e9e95586a5fbc9ca66eeadc..522a93132b55605393a0f7a5421f3d1f7b0d4a8c"
+    "shas": "56b3ef654938c8fc1c02e365cb518f170511a823..9330732da3f60c8e6437c4d11d79aed78a791b04"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-insert-test",
@@ -29,7 +29,7 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index a5821d2..761aa7a 100644",
+        "index a5821d24..761aa7a3 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -1 +1,5 @@",
@@ -40,7 +40,7 @@
         " // This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "522a93132b55605393a0f7a5421f3d1f7b0d4a8c..f0aa09e8712b14d61160b16073cac5fbd0276038"
+    "shas": "9330732da3f60c8e6437c4d11d79aed78a791b04..c08e371085c5af8d5e11d734ba46ffbbc4d8edbf"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-insert-test",
@@ -53,7 +53,7 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index 761aa7a..3b33406 100644",
+        "index 761aa7a3..3b33406a 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -1,5 +1,3 @@",
@@ -65,7 +65,7 @@
         " // This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f0aa09e8712b14d61160b16073cac5fbd0276038..9402b254de81dabcddcbd6d7308911822b6f0f59"
+    "shas": "c08e371085c5af8d5e11d734ba46ffbbc4d8edbf..2f680ffad4edd7e2631d6b2a03d73a6f9ed66813"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-test",
@@ -78,7 +78,7 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index 3b33406..761aa7a 100644",
+        "index 3b33406a..761aa7a3 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -1,3 +1,5 @@",
@@ -90,7 +90,7 @@
         " // This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9402b254de81dabcddcbd6d7308911822b6f0f59..ba788116c40403584cd03df9976350810a9b1162"
+    "shas": "2f680ffad4edd7e2631d6b2a03d73a6f9ed66813..95bdc17204a7e6522cbf0dd0e985cd35865c6f7d"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-replacement-test",
@@ -103,7 +103,7 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index 761aa7a..c2a8148 100644",
+        "index 761aa7a3..c2a8148a 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -1,5 +1,4 @@",
@@ -115,7 +115,7 @@
         "-// This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ba788116c40403584cd03df9976350810a9b1162..05a2041be1630b8a7309163d4b863cd8966adbe0"
+    "shas": "95bdc17204a7e6522cbf0dd0e985cd35865c6f7d..22fae60a84e7c276dac1afcb316a72a7ae530c37"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-test",
@@ -128,7 +128,7 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index c2a8148..7c74dcd 100644",
+        "index c2a8148a..7c74dcdf 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -1,4 +1,3 @@",
@@ -138,7 +138,7 @@
         " */"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "05a2041be1630b8a7309163d4b863cd8966adbe0..28ae9fb48ab99b60a709d3168a82f53017fa27a0"
+    "shas": "22fae60a84e7c276dac1afcb316a72a7ae530c37..6273138826febf9dd2611fcb51bb643606b284be"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-rest-test",
@@ -151,7 +151,7 @@
     ],
     "patch": [
         "diff --git a/comment.js b/comment.js",
-        "index 7c74dcd..e69de29 100644",
+        "index 7c74dcdf..e69de29b 100644",
         "--- a/comment.js",
         "+++ b/comment.js",
         "@@ -1,3 +0,0 @@",
@@ -160,5 +160,5 @@
         "-*/"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "28ae9fb48ab99b60a709d3168a82f53017fa27a0..8f7edd21ecef61769b82fb5a60a881f31ce30a01"
+    "shas": "6273138826febf9dd2611fcb51bb643606b284be..20109cf62d65353fadfe9965edbf1f9e875db9c4"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index e69de29..9d723b9 100644",
+        "index e69de29b..9d723b91 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -0,0 +1 @@",
         "+new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b1ed87edc6bf561edc524058ab781a95970a3258..692f777ed1db0b3284bd2728f6c651425e20ab34"
+    "shas": "bc8f6203c7c5033d706c0155313d250aff41b6ce..3caf8ac9c67ede5f4ca73fa8f4ce3fd50f5b4760"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index 9d723b9..2c91b11 100644",
+        "index 9d723b91..2c91b115 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "692f777ed1db0b3284bd2728f6c651425e20ab34..e4d96364ed5caab5be836020193ea527a6cd6e55"
+    "shas": "3caf8ac9c67ede5f4ca73fa8f4ce3fd50f5b4760..2e8198e081b41db8e2acbf111fe27f6ad6485cb5"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-insert-test",
@@ -121,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"three\" string with the \"two\" string in the module.Klass(1, \"two\") method call"
+                    "summary": "Replaced the \"three\" string with the \"two\" string in the module.Klass(1, \"two\") function call"
                 }
             ]
         },
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index 2c91b11..892f542 100644",
+        "index 2c91b115..892f5425 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e4d96364ed5caab5be836020193ea527a6cd6e55..c5f5c7389717f787423d9698a3e0593a965ffbd5"
+    "shas": "2e8198e081b41db8e2acbf111fe27f6ad6485cb5..8b2e189f8eadc258f196519389b45657f5067553"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-test",
@@ -174,7 +174,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the \"two\" string with the \"three\" string in the module.Klass(1, \"three\") method call"
+                    "summary": "Replaced the \"two\" string with the \"three\" string in the module.Klass(1, \"three\") function call"
                 }
             ]
         },
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index 892f542..2c91b11 100644",
+        "index 892f5425..2c91b115 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c5f5c7389717f787423d9698a3e0593a965ffbd5..d17799b023d4e85c6e1d97220121da96a1323970"
+    "shas": "8b2e189f8eadc258f196519389b45657f5067553..27f7005c773c3ace00b6f45987dfd72b9afa8144"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index 2c91b11..cd77b98 100644",
+        "index 2c91b115..cd77b985 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+new module.Klass(1, \"three\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d17799b023d4e85c6e1d97220121da96a1323970..ddc3d491ed287b5aee714bedf5c2de5ba46770ce"
+    "shas": "27f7005c773c3ace00b6f45987dfd72b9afa8144..c9a6ceeda21a46940f061c9a31e10160cfafa5bf"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index cd77b98..75f6a29 100644",
+        "index cd77b985..75f6a29e 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " new module.Klass(1, \"three\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ddc3d491ed287b5aee714bedf5c2de5ba46770ce..e0a37e9237220e1382c4502fdfbbb4cc10cf04e0"
+    "shas": "c9a6ceeda21a46940f061c9a31e10160cfafa5bf..d4e43daedb1bb2589ec006729907f9ed22855eb4"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/constructor-call.js b/constructor-call.js",
-        "index 75f6a29..e69de29 100644",
+        "index 75f6a29e..e69de29b 100644",
         "--- a/constructor-call.js",
         "+++ b/constructor-call.js",
         "@@ -1 +0,0 @@",
         "-new module.Klass(1, \"three\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e0a37e9237220e1382c4502fdfbbb4cc10cf04e0..41ab7cb7dc378bf229f7a08f1a03c0676483f435"
+    "shas": "d4e43daedb1bb2589ec006729907f9ed22855eb4..6c2a6d2038e58ffec3265d64973449c3c258d5ad"
 }]

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

@@ -34,7 +34,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7b31459c5a9378f4fe26f4e3e6d5c1fd3b6aee23..6f1f37c267e2d029c289f0fbcf27091ba3d1dec0"
+    "shas": "d0acf2e1ee4c3ff99054d1cd40885f62e64b87be..e462b8742bc8299068fb433b43f25f19052e7ded"
 }
 ,{
     "testCaseDescription": "javascript-continue-insert-test",
@@ -88,7 +88,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6f1f37c267e2d029c289f0fbcf27091ba3d1dec0..b23c299b2611ac212c2f335a44e9ffcfbe821ed4"
+    "shas": "e462b8742bc8299068fb433b43f25f19052e7ded..53af971a479c713135ccf4d7e465f939604bbb6d"
 }
 ,{
     "testCaseDescription": "javascript-continue-replacement-test",
@@ -142,7 +142,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b23c299b2611ac212c2f335a44e9ffcfbe821ed4..59f5084383702801c670c2d9738a4d78c93a0b0a"
+    "shas": "53af971a479c713135ccf4d7e465f939604bbb6d..6bb94227de7471638516c4c9f9dde95c4b09f9b1"
 }
 ,{
     "testCaseDescription": "javascript-continue-delete-replacement-test",
@@ -196,7 +196,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "59f5084383702801c670c2d9738a4d78c93a0b0a..ac045f406aaa05c9c85d6a20e527e2e62e99ce2c"
+    "shas": "6bb94227de7471638516c4c9f9dde95c4b09f9b1..de9c6f44f672d452e72d7071ec536ee6de076efd"
 }
 ,{
     "testCaseDescription": "javascript-continue-delete-insert-test",
@@ -250,7 +250,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ac045f406aaa05c9c85d6a20e527e2e62e99ce2c..0c96f2e07ccf5ac404d4301a1a1e5ca9aa19b0b3"
+    "shas": "de9c6f44f672d452e72d7071ec536ee6de076efd..49f94303b4c1ce4ec4b1d17b5dae99264c690b82"
 }
 ,{
     "testCaseDescription": "javascript-continue-teardown-test",
@@ -288,5 +288,5 @@
         "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0c96f2e07ccf5ac404d4301a1a1e5ca9aa19b0b3..b4a1b602905b005b1bfe48d8f78faebd8c9cf016"
+    "shas": "49f94303b4c1ce4ec4b1d17b5dae99264c690b82..5e76eb9bd80785120da1d03a39846954694b0a87"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index e69de29..c83346d 100644",
+        "index e69de29b..c83346db 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -0,0 +1 @@",
         "+delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b5645de0a9c0002d8f44d302c200dd88ff113f52..d1aaae4cff971b6bd6647c77427eab5789728dea"
+    "shas": "40c56c88e1737aa2249e65bf6883ae636953376f..ee79dec332e4b19b503a3ffb045b1a62a316b947"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index c83346d..7c8b990 100644",
+        "index c83346db..7c8b9908 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d1aaae4cff971b6bd6647c77427eab5789728dea..6444b777c04540c4e0229617aaadcf274dbe092f"
+    "shas": "ee79dec332e4b19b503a3ffb045b1a62a316b947..a6f1cfe9edeaf12c99653aeaf65488509b500b4b"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index 7c8b990..f506e36 100644",
+        "index 7c8b9908..f506e360 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6444b777c04540c4e0229617aaadcf274dbe092f..ce69f237ff3cf767d8814435ffa957dadfeafa37"
+    "shas": "a6f1cfe9edeaf12c99653aeaf65488509b500b4b..bc0464b08e597fe9799ba5c4dcd8790cee637929"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index f506e36..7c8b990 100644",
+        "index f506e360..7c8b9908 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ce69f237ff3cf767d8814435ffa957dadfeafa37..71f7d6db03225cbfcc31f2bbd6ab589e9183c55c"
+    "shas": "bc0464b08e597fe9799ba5c4dcd8790cee637929..c001371459eed13c17e2fde3051831a6186b887e"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index 7c8b990..2dfe079 100644",
+        "index 7c8b9908..2dfe0799 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+delete thing.prop"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "71f7d6db03225cbfcc31f2bbd6ab589e9183c55c..629c83e185f6ed3c97976cc604dfb3c5f455c11b"
+    "shas": "c001371459eed13c17e2fde3051831a6186b887e..aeacfbd49b5813111cb6d41d23e1eb0333940a73"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index 2dfe079..9d68dfb 100644",
+        "index 2dfe0799..9d68dfb8 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " delete thing.prop"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "629c83e185f6ed3c97976cc604dfb3c5f455c11b..cf1e4c5bef7af55d4866d7be93a24a523edbbf4f"
+    "shas": "aeacfbd49b5813111cb6d41d23e1eb0333940a73..8f89b423be7695216881a3cf0d40c047dc6b820a"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/delete-operator.js b/delete-operator.js",
-        "index 9d68dfb..e69de29 100644",
+        "index 9d68dfb8..e69de29b 100644",
         "--- a/delete-operator.js",
         "+++ b/delete-operator.js",
         "@@ -1 +0,0 @@",
         "-delete thing.prop"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cf1e4c5bef7af55d4866d7be93a24a523edbbf4f..56f88d5286e94da2b11b7f6d0a35aa836d4f5921"
+    "shas": "8f89b423be7695216881a3cf0d40c047dc6b820a..f90555ef6eea69038b7aa16bd074797419738b0a"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index e69de29..d1ec804 100644",
+        "index e69de29b..d1ec804b 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -0,0 +1 @@",
         "+do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cd322134775da8db98f5a151ec8e2f5d9eddd3cf..2b58702fac7ff187b0f41a31b6fae16718c0ec4c"
+    "shas": "34742f99e05bf8c6402929d23886b55c725e282e..88a8018f9d3b342ec0120c29471a321f87c39aa2"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index d1ec804..d9a410d 100644",
+        "index d1ec804b..d9a410d6 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2b58702fac7ff187b0f41a31b6fae16718c0ec4c..fa2041b0ae98229dc1322fda8ebaa2d98dd4b1f7"
+    "shas": "88a8018f9d3b342ec0120c29471a321f87c39aa2..3879977790b874bb57ec4dc4597ba61abda7cf8d"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-insert-test",
@@ -121,7 +121,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'replacement' identifier with the 'insert' identifier in the console.log(insert) method call"
+                    "summary": "Replaced the 'replacement' identifier with the 'insert' identifier in the console.log(insert) function call"
                 },
                 {
                     "span": {
@@ -159,7 +159,7 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index d9a410d..4197835 100644",
+        "index d9a410d6..41978359 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -169,7 +169,7 @@
         " do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fa2041b0ae98229dc1322fda8ebaa2d98dd4b1f7..c7d0a76295cd609ed29a5c857ff2d885eefb3610"
+    "shas": "3879977790b874bb57ec4dc4597ba61abda7cf8d..df9f4f04301d1eb7046b6fba2afa513beab2da76"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-test",
@@ -201,7 +201,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'insert' identifier with the 'replacement' identifier in the console.log(replacement) method call"
+                    "summary": "Replaced the 'insert' identifier with the 'replacement' identifier in the console.log(replacement) function call"
                 },
                 {
                     "span": {
@@ -239,7 +239,7 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index 4197835..d9a410d 100644",
+        "index 41978359..d9a410d6 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -249,7 +249,7 @@
         " do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c7d0a76295cd609ed29a5c857ff2d885eefb3610..8887ecec6e5dc8852e1f29ffe74c0b79c304e04e"
+    "shas": "df9f4f04301d1eb7046b6fba2afa513beab2da76..9654bc71a1492e901989b1f1421874a6e352f1eb"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-replacement-test",
@@ -310,7 +310,7 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index d9a410d..c5291b4 100644",
+        "index d9a410d6..c5291b47 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -1,3 +1,2 @@",
@@ -320,7 +320,7 @@
         "+do { console.log(replacement); } while (false);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8887ecec6e5dc8852e1f29ffe74c0b79c304e04e..888367feff9a28c449258cd99afd8ac90e069f76"
+    "shas": "9654bc71a1492e901989b1f1421874a6e352f1eb..bcdddc4a78f2fa673c18e3a78d64f1692078e313"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-test",
@@ -351,7 +351,7 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index c5291b4..6085cb1 100644",
+        "index c5291b47..6085cb11 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -1,2 +1 @@",
@@ -359,7 +359,7 @@
         " do { console.log(replacement); } while (false);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "888367feff9a28c449258cd99afd8ac90e069f76..622706434ac7e362f28c08d79f7d8302ec086757"
+    "shas": "bcdddc4a78f2fa673c18e3a78d64f1692078e313..60aa16e0f11e94a8ca873354d308e62837210476"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-rest-test",
@@ -390,12 +390,12 @@
     ],
     "patch": [
         "diff --git a/do-while-statement.js b/do-while-statement.js",
-        "index 6085cb1..e69de29 100644",
+        "index 6085cb11..e69de29b 100644",
         "--- a/do-while-statement.js",
         "+++ b/do-while-statement.js",
         "@@ -1 +0,0 @@",
         "-do { console.log(replacement); } while (false);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "622706434ac7e362f28c08d79f7d8302ec086757..2795ba48a13af4b2c6f240761fd880dc6cd10c2b"
+    "shas": "60aa16e0f11e94a8ca873354d308e62837210476..cfb33c769bbc24766b17e262f1c1eb05b0face8f"
 }]

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

@@ -177,7 +177,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index e69de29..dcd9320 100644",
+        "index e69de29b..dcd9320b 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -0,0 +1,11 @@",
@@ -194,7 +194,7 @@
         "+export { import1 as name1, import2 as name2, nameN } from 'bar';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0eb14098d9cfc48fe7ffb44e37c71cb6cb58c878..5e2e89a442ac0f099046b72d57acaa03dc011ed9"
+    "shas": "b56108ab09b88f198a0ec68e4f7a87ad1b2c06b6..37689b6855efcf22edc9a397b6116b5141ab642b"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-insert-test",
@@ -540,7 +540,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index dcd9320..c8b53ff 100644",
+        "index dcd9320b..c8b53ff3 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -1,3 +1,25 @@",
@@ -571,7 +571,7 @@
         " export let name1, name2, nameN;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5e2e89a442ac0f099046b72d57acaa03dc011ed9..9e81bf04d8f7a930fb0a612fc5230af600c7c5d2"
+    "shas": "37689b6855efcf22edc9a397b6116b5141ab642b..a587e998ca80b72452fa08e9dc0a82842607673b"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-insert-test",
@@ -1304,7 +1304,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index c8b53ff..ad3f21a 100644",
+        "index c8b53ff3..ad3f21a7 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -1,14 +1,14 @@",
@@ -1335,7 +1335,7 @@
         " export let name1, name2, nameN;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9e81bf04d8f7a930fb0a612fc5230af600c7c5d2..d1bc421a42e531d555179f1135e64e9f19d57095"
+    "shas": "a587e998ca80b72452fa08e9dc0a82842607673b..4032a29478ba2412695dbcc4b7bb948eb09b1f8f"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-test",
@@ -1759,7 +1759,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index ad3f21a..c8b53ff 100644",
+        "index ad3f21a7..c8b53ff3 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -1,14 +1,14 @@",
@@ -1790,7 +1790,7 @@
         " export let name1, name2, nameN;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d1bc421a42e531d555179f1135e64e9f19d57095..61d845cfdc6aaaba0c4fa01fb8ca41f79556ac37"
+    "shas": "4032a29478ba2412695dbcc4b7bb948eb09b1f8f..4cacea87233cddf0243da69dc293f7c8e6c7a574"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-replacement-test",
@@ -2301,7 +2301,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index c8b53ff..281c672 100644",
+        "index c8b53ff3..281c6726 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -1,25 +1,3 @@",
@@ -2347,7 +2347,7 @@
         "+export { import6 as name6, import7 as name7, nameB } from 'fizz';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "61d845cfdc6aaaba0c4fa01fb8ca41f79556ac37..06bbce70f8962416f84a41ea00019bfb28b73bf9"
+    "shas": "4cacea87233cddf0243da69dc293f7c8e6c7a574..cdd6691ff292adf83a7de1c4cc4994521b56e9c6"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-test",
@@ -2528,7 +2528,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index 281c672..e105ba7 100644",
+        "index 281c6726..e105ba78 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -1,14 +1,3 @@",
@@ -2548,7 +2548,7 @@
         " export let name3, name4, nameT;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "06bbce70f8962416f84a41ea00019bfb28b73bf9..d1daa5ccf312ddb7b243f8adf15955fac3df1d63"
+    "shas": "cdd6691ff292adf83a7de1c4cc4994521b56e9c6..bc81d61fb61d4658531fb10edde19e87253de887"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-rest-test",
@@ -2729,7 +2729,7 @@
     ],
     "patch": [
         "diff --git a/export.js b/export.js",
-        "index e105ba7..e69de29 100644",
+        "index e105ba78..e69de29b 100644",
         "--- a/export.js",
         "+++ b/export.js",
         "@@ -1,11 +0,0 @@",
@@ -2746,5 +2746,5 @@
         "-export { import6 as name6, import7 as name7, nameB } from 'fizz';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d1daa5ccf312ddb7b243f8adf15955fac3df1d63..925b73e9fde76236d0b037d687edcc925a5cef9a"
+    "shas": "bc81d61fb61d4658531fb10edde19e87253de887..7b8267eabe246347b009d08c9100f36a568a81a6"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index e69de29..8a63946 100644",
+        "index e69de29b..8a639462 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -0,0 +1 @@",
         "+false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a56c14e19dec2910d36460e4fca6496da46f6240..6b1a30d6be2d43907c3a1faf581db6c9fe6cc88a"
+    "shas": "d7a5c35ea0a826299a22c96d0b992f92bc85bb91..c0b7401ea04f1b37426f7bc4773e77fdf8c0f3c1"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index 8a63946..86574b1 100644",
+        "index 8a639462..86574b16 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6b1a30d6be2d43907c3a1faf581db6c9fe6cc88a..122e0fae24e99d4f534bb461d9d5fa2900c70e55"
+    "shas": "c0b7401ea04f1b37426f7bc4773e77fdf8c0f3c1..2e31f217aa32ada1925fb2ec1cc0411d0edcd1b0"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-insert-test",
@@ -135,7 +135,7 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index 86574b1..7bae7c5 100644",
+        "index 86574b16..7bae7c53 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -1,3 +1,3 @@",
@@ -145,7 +145,7 @@
         " false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "122e0fae24e99d4f534bb461d9d5fa2900c70e55..6d5ec0ada3f32284c9922934304c708333da7e1f"
+    "shas": "2e31f217aa32ada1925fb2ec1cc0411d0edcd1b0..53d6e0873afb002215a77619b6e3f4604bc27453"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-test",
@@ -191,7 +191,7 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index 7bae7c5..86574b1 100644",
+        "index 7bae7c53..86574b16 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -1,3 +1,3 @@",
@@ -201,7 +201,7 @@
         " false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6d5ec0ada3f32284c9922934304c708333da7e1f..7291f772ca242bae0a92ab87c1ab6ec2be28d4c1"
+    "shas": "53d6e0873afb002215a77619b6e3f4604bc27453..c2ef01b79b9b22e6e6f49923770ba63b149870a8"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-replacement-test",
@@ -262,7 +262,7 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index 86574b1..85b5be9 100644",
+        "index 86574b16..85b5be91 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -1,3 +1,2 @@",
@@ -272,7 +272,7 @@
         "+return false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7291f772ca242bae0a92ab87c1ab6ec2be28d4c1..018e3b49010dd5359d8071f4a856b6ccef409645"
+    "shas": "c2ef01b79b9b22e6e6f49923770ba63b149870a8..428cba3e1b4d7186ecced8004ddc6b1e82df3f0e"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-test",
@@ -303,7 +303,7 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index 85b5be9..1f328b3 100644",
+        "index 85b5be91..1f328b3b 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -1,2 +1 @@",
@@ -311,7 +311,7 @@
         " return false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "018e3b49010dd5359d8071f4a856b6ccef409645..bda912eec94150ac764d032b1243ec8dba01f3f0"
+    "shas": "428cba3e1b4d7186ecced8004ddc6b1e82df3f0e..6338763787e51da57da095e9e8e91e4d56873327"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-rest-test",
@@ -342,12 +342,12 @@
     ],
     "patch": [
         "diff --git a/false.js b/false.js",
-        "index 1f328b3..e69de29 100644",
+        "index 1f328b3b..e69de29b 100644",
         "--- a/false.js",
         "+++ b/false.js",
         "@@ -1 +0,0 @@",
         "-return false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "bda912eec94150ac764d032b1243ec8dba01f3f0..f6dfeb42af9db740677fd60341ea39da711f7c81"
+    "shas": "6338763787e51da57da095e9e8e91e4d56873327..d9d6e19c015a3f2dbb9d04d3867b13889dd798ac"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index e69de29..f928287 100644",
+        "index e69de29b..f9282876 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -0,0 +1 @@",
         "+for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "75f87f22428c68545ebb3f876a1b09caf59d75c9..1d91306ffc69509679ae514ecc2a3403dc94aefb"
+    "shas": "6e93ce14abfffa0befb5a6168efdc830619e0319..4591de1a2b85f3c2813876e233110cc887b0c706"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index f928287..4a482e9 100644",
+        "index f9282876..4a482e9e 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1d91306ffc69509679ae514ecc2a3403dc94aefb..2f951d1d02db4475f786a87f7077648822ef26d3"
+    "shas": "4591de1a2b85f3c2813876e233110cc887b0c706..c429195ed2092f33ba7e049821ceaec499bf038e"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-insert-test",
@@ -186,7 +186,7 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index 4a482e9..e949baf 100644",
+        "index 4a482e9e..e949bafb 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -196,7 +196,7 @@
         " for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2f951d1d02db4475f786a87f7077648822ef26d3..31f13f455d1c9d9efae42c7695abae57acf4684a"
+    "shas": "c429195ed2092f33ba7e049821ceaec499bf038e..b5d7e5afb889977c0b6a286814a02fd356c15c1e"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-test",
@@ -293,7 +293,7 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index e949baf..4a482e9 100644",
+        "index e949bafb..4a482e9e 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -303,7 +303,7 @@
         " for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "31f13f455d1c9d9efae42c7695abae57acf4684a..20bf2c4356e71329f5e131bec7be78669308acc8"
+    "shas": "b5d7e5afb889977c0b6a286814a02fd356c15c1e..b9772b80971e810b2fe559eacc6916548267991e"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-replacement-test",
@@ -364,7 +364,7 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index 4a482e9..6b5f12a 100644",
+        "index 4a482e9e..6b5f12ae 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -1,3 +1,2 @@",
@@ -374,7 +374,7 @@
         "+for (item in items) { item(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "20bf2c4356e71329f5e131bec7be78669308acc8..cc6e8abe393b4d3c5e2b919a60c832b78ad0a4cd"
+    "shas": "b9772b80971e810b2fe559eacc6916548267991e..61a0380174ea230f97ff054f79cd0b004ed3182c"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-test",
@@ -405,7 +405,7 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index 6b5f12a..a3d8882 100644",
+        "index 6b5f12ae..a3d8882d 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -1,2 +1 @@",
@@ -413,7 +413,7 @@
         " for (item in items) { item(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cc6e8abe393b4d3c5e2b919a60c832b78ad0a4cd..71a7b11ea45ba6cae99bbc5d1bdad0c7eb526a3b"
+    "shas": "61a0380174ea230f97ff054f79cd0b004ed3182c..f0e33cad1a66b2bebde032276a7728a3e8b754ea"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-rest-test",
@@ -444,12 +444,12 @@
     ],
     "patch": [
         "diff --git a/for-in-statement.js b/for-in-statement.js",
-        "index a3d8882..e69de29 100644",
+        "index a3d8882d..e69de29b 100644",
         "--- a/for-in-statement.js",
         "+++ b/for-in-statement.js",
         "@@ -1 +0,0 @@",
         "-for (item in items) { item(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "71a7b11ea45ba6cae99bbc5d1bdad0c7eb526a3b..d1b2bee18a7da4fefa2a4786b2f692fc5795f48c"
+    "shas": "f0e33cad1a66b2bebde032276a7728a3e8b754ea..03a1b4a15f149e9715aa37bf2334cb4f05f0e8ff"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index e69de29..c467478 100644",
+        "index e69de29b..c467478a 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -0,0 +1 @@",
         "+for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1c2dbb18fb6fc930b3d0e6bb31a559a853be5c63..974a2623d96129b8a5eb74659c0040931fe6597a"
+    "shas": "a7b8d1dcde9a2945edc002250d8df6d841189c39..365faf7882dbb2f146184940d80d82a70e647ea4"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index c467478..0147d31 100644",
+        "index c467478a..0147d318 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "974a2623d96129b8a5eb74659c0040931fe6597a..37f9b64351b20f87cdd2d65e794e8b43ea684959"
+    "shas": "365faf7882dbb2f146184940d80d82a70e647ea4..75a82c7096f5dade494e047719babc2f48789eaa"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-insert-test",
@@ -159,7 +159,7 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index 0147d31..306fa88 100644",
+        "index 0147d318..306fa88a 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -169,7 +169,7 @@
         " for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "37f9b64351b20f87cdd2d65e794e8b43ea684959..639c4e9d99aa30a48f0403a42eaf81f85a194e22"
+    "shas": "75a82c7096f5dade494e047719babc2f48789eaa..5bdcc57491e4a99dd0b0e2c4c1f70e5ee0289e69"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-test",
@@ -239,7 +239,7 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index 306fa88..0147d31 100644",
+        "index 306fa88a..0147d318 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -249,7 +249,7 @@
         " for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "639c4e9d99aa30a48f0403a42eaf81f85a194e22..8d475ef797fcd08a47c73f033c305642c4279115"
+    "shas": "5bdcc57491e4a99dd0b0e2c4c1f70e5ee0289e69..47d0ed7147dfb8cc9825138278e7bfaac9bc4186"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-replacement-test",
@@ -310,7 +310,7 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index 0147d31..f23fa31 100644",
+        "index 0147d318..f23fa316 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -1,3 +1,2 @@",
@@ -320,7 +320,7 @@
         "+for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8d475ef797fcd08a47c73f033c305642c4279115..d2051aee8f163a567cf3a5ff4060579795e0a2a1"
+    "shas": "47d0ed7147dfb8cc9825138278e7bfaac9bc4186..3d5f95b6f38777fa1f8b80599af5f5b39651570e"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-test",
@@ -351,7 +351,7 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index f23fa31..e968160 100644",
+        "index f23fa316..e9681607 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -1,2 +1 @@",
@@ -359,7 +359,7 @@
         " for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d2051aee8f163a567cf3a5ff4060579795e0a2a1..068a5eccf07c8be3b3a95d6eceadf7062d7b942d"
+    "shas": "3d5f95b6f38777fa1f8b80599af5f5b39651570e..76d098119efc28256e6574fd24adcb007ddba5f1"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-rest-test",
@@ -390,12 +390,12 @@
     ],
     "patch": [
         "diff --git a/for-loop-with-in-statement.js b/for-loop-with-in-statement.js",
-        "index e968160..e69de29 100644",
+        "index e9681607..e69de29b 100644",
         "--- a/for-loop-with-in-statement.js",
         "+++ b/for-loop-with-in-statement.js",
         "@@ -1 +0,0 @@",
         "-for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "068a5eccf07c8be3b3a95d6eceadf7062d7b942d..9c2fa1f20200ecb26074ec348c75c13c22138f87"
+    "shas": "76d098119efc28256e6574fd24adcb007ddba5f1..2b21000901a57001f039986154173f06d53be8a6"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index e69de29..1ed2754 100644",
+        "index e69de29b..1ed27542 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -0,0 +1 @@",
         "+for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9c2fa1f20200ecb26074ec348c75c13c22138f87..c46e44d842f77789f61d1f25221f0449f2d580c5"
+    "shas": "2b21000901a57001f039986154173f06d53be8a6..c2eb1bd5f31917fe68bdd408c3594c69b36834e6"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index 1ed2754..ab20ded 100644",
+        "index 1ed27542..ab20ded2 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c46e44d842f77789f61d1f25221f0449f2d580c5..1c06836a9dafef9518b54b9409dc10e9e4402666"
+    "shas": "c2eb1bd5f31917fe68bdd408c3594c69b36834e6..dd1aaacc8c2dc9ba44164e9c19594594b54772e9"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-insert-test",
@@ -186,7 +186,7 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index ab20ded..19561a3 100644",
+        "index ab20ded2..19561a3e 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -196,7 +196,7 @@
         " for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1c06836a9dafef9518b54b9409dc10e9e4402666..4c79ce75c12d7e2b77bd33d6f7e4f1d839ee88a8"
+    "shas": "dd1aaacc8c2dc9ba44164e9c19594594b54772e9..9d17d54ae7597e671bbe2bbbca1647205ce65dce"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-test",
@@ -293,7 +293,7 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index 19561a3..ab20ded 100644",
+        "index 19561a3e..ab20ded2 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -303,7 +303,7 @@
         " for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4c79ce75c12d7e2b77bd33d6f7e4f1d839ee88a8..cd97645bfe60051a1bbd7a490394b00b6df48a7d"
+    "shas": "9d17d54ae7597e671bbe2bbbca1647205ce65dce..dae7f960db312022d23ff082aba5a78642a561cd"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-replacement-test",
@@ -364,7 +364,7 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index ab20ded..62db34f 100644",
+        "index ab20ded2..62db34f8 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -1,3 +1,2 @@",
@@ -374,7 +374,7 @@
         "+for (let thing of things) { process(thing); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cd97645bfe60051a1bbd7a490394b00b6df48a7d..3fd962ae8d2bc510b50e7e85ef1ce4ad04375eb8"
+    "shas": "dae7f960db312022d23ff082aba5a78642a561cd..811a60e87ba626685fe89f707187e02c304fac32"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-test",
@@ -405,7 +405,7 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index 62db34f..5170ce4 100644",
+        "index 62db34f8..5170ce4b 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -1,2 +1 @@",
@@ -413,7 +413,7 @@
         " for (let thing of things) { process(thing); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3fd962ae8d2bc510b50e7e85ef1ce4ad04375eb8..821a3c7b8a7b00f8a8ad7967aed163a12f042d10"
+    "shas": "811a60e87ba626685fe89f707187e02c304fac32..6189b7baec6feb5f7bc08b781076f3acd9a0d50e"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-rest-test",
@@ -444,12 +444,12 @@
     ],
     "patch": [
         "diff --git a/for-of-statement.js b/for-of-statement.js",
-        "index 5170ce4..e69de29 100644",
+        "index 5170ce4b..e69de29b 100644",
         "--- a/for-of-statement.js",
         "+++ b/for-of-statement.js",
         "@@ -1 +0,0 @@",
         "-for (let thing of things) { process(thing); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "821a3c7b8a7b00f8a8ad7967aed163a12f042d10..0b1a50d075cdb5202c523f929502c24a9fce63ce"
+    "shas": "6189b7baec6feb5f7bc08b781076f3acd9a0d50e..0494efa588d0a283d42c62a35bcee1f439b6a16d"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index e69de29..2f51258 100644",
+        "index e69de29b..2f51258e 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -0,0 +1 @@",
         "+for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "eaeb10729b105d290f4091fea5f04c34030bb5a5..40bfcf71debc3d20926578f5d788f319165ccdbb"
+    "shas": "e2f5e2a31d37bfe30697e216363db3575aa06a6a..9a3f882a6921d8a2807d088e694edc3f6d4fefa1"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index 2f51258..095241f 100644",
+        "index 2f51258e..095241f1 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "40bfcf71debc3d20926578f5d788f319165ccdbb..14acd05cf2f47feba3234c70af8afe86828370ce"
+    "shas": "9a3f882a6921d8a2807d088e694edc3f6d4fefa1..e3ea2d4f24e771b6c9820d2356a99e7237d96b49"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index 095241f..9b0e26d 100644",
+        "index 095241f1..9b0e26d4 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "14acd05cf2f47feba3234c70af8afe86828370ce..26784319f5f567d3017095b6f9d0ca081043b817"
+    "shas": "e3ea2d4f24e771b6c9820d2356a99e7237d96b49..1f9261f5d8dc568a6c17844d43872e03f64e641d"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index 9b0e26d..095241f 100644",
+        "index 9b0e26d4..095241f1 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "26784319f5f567d3017095b6f9d0ca081043b817..5b15f8e9f8b68a8e4f4ba6ec6642a3cb37db7c60"
+    "shas": "1f9261f5d8dc568a6c17844d43872e03f64e641d..e585ba38f3f0aa601f846c34a898217167081202"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index 095241f..39af699 100644",
+        "index 095241f1..39af699a 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+for (i = 0, init(); i < 100; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5b15f8e9f8b68a8e4f4ba6ec6642a3cb37db7c60..70806220f9fba3804c162aed68cdfcb25c39ff0a"
+    "shas": "e585ba38f3f0aa601f846c34a898217167081202..8e99fa24d58ed9413ef72b84fc5d6a536de55ba2"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index 39af699..de8ae87 100644",
+        "index 39af699a..de8ae87b 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " for (i = 0, init(); i < 100; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "70806220f9fba3804c162aed68cdfcb25c39ff0a..9d01a0008d001fc966736db7d1583e0415da98fd"
+    "shas": "8e99fa24d58ed9413ef72b84fc5d6a536de55ba2..d7f1b547f69ddd450adce8a2d22d27f8b64db5dc"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/for-statement.js b/for-statement.js",
-        "index de8ae87..e69de29 100644",
+        "index de8ae87b..e69de29b 100644",
         "--- a/for-statement.js",
         "+++ b/for-statement.js",
         "@@ -1 +0,0 @@",
         "-for (i = 0, init(); i < 100; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9d01a0008d001fc966736db7d1583e0415da98fd..10c888c0caabf36cb211a96640afbe435dfad3fb"
+    "shas": "d7f1b547f69ddd450adce8a2d22d27f8b64db5dc..b8e96cb516ef4cd80a86e0b6a00f5d4e542141dd"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index e69de29..699333d 100644",
+        "index e69de29b..699333de 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -0,0 +1 @@",
         "+someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5d5d40b2fa515dfcb7494d9b83f22687c56de0f5..d2a8bcf4eb5c5193cb358f09a81b0239be2a84ad"
+    "shas": "ff5044f4617b79b896e8da9c860b589d4022aa5b..134a719c5ccc94c9a8583a521e8d4b4666ede5b1"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index 699333d..3f4ee6e 100644",
+        "index 699333de..3f4ee6ef 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d2a8bcf4eb5c5193cb358f09a81b0239be2a84ad..539cee544c8600977bd76181a692ef4e27c4b759"
+    "shas": "134a719c5ccc94c9a8583a521e8d4b4666ede5b1..3ec69cfc69155ac3e026b36ac8a41d575b4dc044"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-insert-test",
@@ -202,7 +202,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the console.log(a) method call"
+                    "summary": "Replaced the 'b' identifier with the 'a' identifier in the console.log(a) function call"
                 },
                 {
                     "span": {
@@ -267,7 +267,7 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index 3f4ee6e..dc419cb 100644",
+        "index 3f4ee6ef..dc419cba 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -1,3 +1,3 @@",
@@ -277,7 +277,7 @@
         " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "539cee544c8600977bd76181a692ef4e27c4b759..f808e14f78dbe08885649be38dff25564f90fd98"
+    "shas": "3ec69cfc69155ac3e026b36ac8a41d575b4dc044..892d8ea0f7fe8285bae3236b781249c94c60ec84"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-test",
@@ -390,7 +390,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the console.log(b) method call"
+                    "summary": "Replaced the 'a' identifier with the 'b' identifier in the console.log(b) function call"
                 },
                 {
                     "span": {
@@ -455,7 +455,7 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index dc419cb..3f4ee6e 100644",
+        "index dc419cba..3f4ee6ef 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -1,3 +1,3 @@",
@@ -465,7 +465,7 @@
         " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f808e14f78dbe08885649be38dff25564f90fd98..6df8cc03d89ad9408f10b3e84a8168891e16c824"
+    "shas": "892d8ea0f7fe8285bae3236b781249c94c60ec84..09414b2a48c0168304c23b6878394c51ce959392"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-replacement-test",
@@ -526,7 +526,7 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index 3f4ee6e..cae967b 100644",
+        "index 3f4ee6ef..cae967b6 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -1,3 +1,2 @@",
@@ -536,7 +536,7 @@
         "+someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6df8cc03d89ad9408f10b3e84a8168891e16c824..8fe5a2260c0258b29e266f904dcdb1dbe02d4c10"
+    "shas": "09414b2a48c0168304c23b6878394c51ce959392..0020b036b7829f6ca7ba7f32e211439f74b73d63"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-test",
@@ -567,7 +567,7 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index cae967b..0d19573 100644",
+        "index cae967b6..0d19573d 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -1,2 +1 @@",
@@ -575,7 +575,7 @@
         " someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8fe5a2260c0258b29e266f904dcdb1dbe02d4c10..657ddea03b3413ea6f2d4e8546403ec115769828"
+    "shas": "0020b036b7829f6ca7ba7f32e211439f74b73d63..550eba6d0f7ad10f05f0fbcf145ad4c69fb98579"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-rest-test",
@@ -606,12 +606,12 @@
     ],
     "patch": [
         "diff --git a/function-call-args.js b/function-call-args.js",
-        "index 0d19573..e69de29 100644",
+        "index 0d19573d..e69de29b 100644",
         "--- a/function-call-args.js",
         "+++ b/function-call-args.js",
         "@@ -1 +0,0 @@",
         "-someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "657ddea03b3413ea6f2d4e8546403ec115769828..b1ed87edc6bf561edc524058ab781a95970a3258"
+    "shas": "550eba6d0f7ad10f05f0fbcf145ad4c69fb98579..bc8f6203c7c5033d706c0155313d250aff41b6ce"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index e69de29..8bd95e0 100644",
+        "index e69de29b..8bd95e09 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -0,0 +1 @@",
         "+someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5ef42771e35b5af39f3befe137fedf40f174a5c7..00b36bff0934786a0071eff76e45c17c464e432a"
+    "shas": "65ec4b91fc50d92244f898493564425dc91dec99..b615308df966b578cf01e5d48566843aa41cdb9a"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index 8bd95e0..6bb4cf3 100644",
+        "index 8bd95e09..6bb4cf3f 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "00b36bff0934786a0071eff76e45c17c464e432a..520cba16d2faea8fd35a81086ea0a0b2405bf082"
+    "shas": "b615308df966b578cf01e5d48566843aa41cdb9a..bbeb6c549afd5768be327d11d6f0586b19b54f5f"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index 6bb4cf3..b38c232 100644",
+        "index 6bb4cf3f..b38c232b 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "520cba16d2faea8fd35a81086ea0a0b2405bf082..8f84b861874020df6e144f16bbccb5221b1543e4"
+    "shas": "bbeb6c549afd5768be327d11d6f0586b19b54f5f..34be18f8448763874f7ef124b682bfd0cf7f5d6c"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index b38c232..6bb4cf3 100644",
+        "index b38c232b..6bb4cf3f 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8f84b861874020df6e144f16bbccb5221b1543e4..718e8939aaef9685a140e371b050e8933450a215"
+    "shas": "34be18f8448763874f7ef124b682bfd0cf7f5d6c..48a4faebbb542de45e082a48f7ebc7dc146434ee"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index 6bb4cf3..3e15c6a 100644",
+        "index 6bb4cf3f..3e15c6ac 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+someFunction(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "718e8939aaef9685a140e371b050e8933450a215..35112398ed93567a624e79597194400f3a6ba5ed"
+    "shas": "48a4faebbb542de45e082a48f7ebc7dc146434ee..830303cbd8c1c18ab526b72ee0af22ce1117f291"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index 3e15c6a..1add64b 100644",
+        "index 3e15c6ac..1add64b5 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " someFunction(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "35112398ed93567a624e79597194400f3a6ba5ed..2928901cff45e08e275b3c7cc5559704326f2974"
+    "shas": "830303cbd8c1c18ab526b72ee0af22ce1117f291..907c562a9a25a3d6b2cba73e693b57825dc8157f"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/function-call.js b/function-call.js",
-        "index 1add64b..e69de29 100644",
+        "index 1add64b5..e69de29b 100644",
         "--- a/function-call.js",
         "+++ b/function-call.js",
         "@@ -1 +0,0 @@",
         "-someFunction(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2928901cff45e08e275b3c7cc5559704326f2974..f8662860eb083b9e95b5cc1c706a7872a4779532"
+    "shas": "907c562a9a25a3d6b2cba73e693b57825dc8157f..bded2c0215b6dc80127e031b7d9978f1883709b1"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index e69de29..2d8d739 100644",
+        "index e69de29b..2d8d739d 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -0,0 +1 @@",
         "+function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0bdf412036a9a6aea51108a20404c37541fffcfb..c76e13ba716fc18e9924e1f4675845f61823c9c7"
+    "shas": "6a98861e426cf72452392e143d875b8ccd968a2c..a9d3342f1523a3bdfb2089737e26c073d72518e1"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index 2d8d739..4389406 100644",
+        "index 2d8d739d..43894067 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c76e13ba716fc18e9924e1f4675845f61823c9c7..7c1485f22ad0c4bc98a22cdb8d341d2eb97fcab8"
+    "shas": "a9d3342f1523a3bdfb2089737e26c073d72518e1..ed5a8373997dc1879db9c1c9168d3b26e7b3dc90"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index 4389406..924c99e 100644",
+        "index 43894067..924c99e8 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7c1485f22ad0c4bc98a22cdb8d341d2eb97fcab8..9e13719e7c1614958c3528e609d7ac1cfb068fe6"
+    "shas": "ed5a8373997dc1879db9c1c9168d3b26e7b3dc90..dc33c0452310a395ba61cd50472fcbb7c09eb19a"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index 924c99e..4389406 100644",
+        "index 924c99e8..43894067 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9e13719e7c1614958c3528e609d7ac1cfb068fe6..e36301a0b4cc27e38d4c77c49f97e1a6ba816fbb"
+    "shas": "dc33c0452310a395ba61cd50472fcbb7c09eb19a..a95c62fef6c7f158ccb26b14adceb5a3a3f52ad1"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index 4389406..254dbcf 100644",
+        "index 43894067..254dbcf8 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+function(arg1, arg2) { arg1; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e36301a0b4cc27e38d4c77c49f97e1a6ba816fbb..fbc7371a528f691d2e0b43ceed413fab19186b82"
+    "shas": "a95c62fef6c7f158ccb26b14adceb5a3a3f52ad1..74d7b44b4bf8045b15dbd99ff56365d56beca8c3"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index 254dbcf..b37e867 100644",
+        "index 254dbcf8..b37e8671 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " function(arg1, arg2) { arg1; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fbc7371a528f691d2e0b43ceed413fab19186b82..dd37f0a24f8a677191eb11c1dad4119d46e35d14"
+    "shas": "74d7b44b4bf8045b15dbd99ff56365d56beca8c3..4a809529033c4b4ce9ac0dff95e378035c98a29f"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/function.js b/function.js",
-        "index b37e867..e69de29 100644",
+        "index b37e8671..e69de29b 100644",
         "--- a/function.js",
         "+++ b/function.js",
         "@@ -1 +0,0 @@",
         "-function(arg1, arg2) { arg1; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dd37f0a24f8a677191eb11c1dad4119d46e35d14..d700dc51fee7a3dd557906dcdf46d426285d7955"
+    "shas": "4a809529033c4b4ce9ac0dff95e378035c98a29f..9adc811773ddcc66050c739b5bc900c4c2daff55"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index e69de29..04e8a59 100644",
+        "index e69de29b..04e8a59b 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -0,0 +1 @@",
         "+function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5cab8720cde055f6d78f5c5deaf8980b89a434e1..8ff6dd40a182ab5500d976f04b8d0e919d045ddc"
+    "shas": "a50f5d25657afa02329debd2a87b7ffbb8f2b76d..9df04cfb26b2766e7e78bcd47ee06b6becb2f572"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index 04e8a59..ed5c037 100644",
+        "index 04e8a59b..ed5c0370 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8ff6dd40a182ab5500d976f04b8d0e919d045ddc..e3273bce016747d95cbc043e14d23cda41b65129"
+    "shas": "9df04cfb26b2766e7e78bcd47ee06b6becb2f572..ec757a8900be08223339e8e9727898b3255d8f08"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index ed5c037..0895c3f 100644",
+        "index ed5c0370..0895c3fd 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e3273bce016747d95cbc043e14d23cda41b65129..3dd2a62eface3915c946a63ecef0c9134bf5b9be"
+    "shas": "ec757a8900be08223339e8e9727898b3255d8f08..15ec5e1fa46bd4e16d253840d6f0102c44496fed"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index 0895c3f..ed5c037 100644",
+        "index 0895c3fd..ed5c0370 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3dd2a62eface3915c946a63ecef0c9134bf5b9be..9a4d77ff9359a6c8fe9ab42d88157282b742e1be"
+    "shas": "15ec5e1fa46bd4e16d253840d6f0102c44496fed..b7e7155e6794ba2a257dcbc55a91f8b12093fa58"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index ed5c037..1dae105 100644",
+        "index ed5c0370..1dae1059 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9a4d77ff9359a6c8fe9ab42d88157282b742e1be..63a8b6f6c41bdd248590069ba8f59d53a3b0992f"
+    "shas": "b7e7155e6794ba2a257dcbc55a91f8b12093fa58..f5c134c2262cb4b15c43b2c35a34ae3812d4cfd8"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index 1dae105..5846d1c 100644",
+        "index 1dae1059..5846d1c0 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "63a8b6f6c41bdd248590069ba8f59d53a3b0992f..2087f684c9ba7fa39876477f2eacf8b9b12949fa"
+    "shas": "f5c134c2262cb4b15c43b2c35a34ae3812d4cfd8..51e5241d63f1a14e77194ba7b954d06d11de1600"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/generator-function.js b/generator-function.js",
-        "index 5846d1c..e69de29 100644",
+        "index 5846d1c0..e69de29b 100644",
         "--- a/generator-function.js",
         "+++ b/generator-function.js",
         "@@ -1 +0,0 @@",
         "-function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2087f684c9ba7fa39876477f2eacf8b9b12949fa..973cce7b94116a9e6e8b399f9f0a50bd107fb9b5"
+    "shas": "51e5241d63f1a14e77194ba7b954d06d11de1600..35363e93d3151d395860548f66a39be33fcc6b34"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index e69de29..1cf4ad0 100644",
+        "index e69de29b..1cf4ad05 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -0,0 +1 @@",
         "+theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2642fef686808ac2a6c5edde323e87257f4f2983..369e63ae9927770fe9ca2fd662ca648e43ab72e5"
+    "shas": "23f245e71b4513803366aff2b4ae93549ad9d3fa..cdaacae44dc6aa4a3aba0e68c2459f5065fd1fa4"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index 1cf4ad0..888855a 100644",
+        "index 1cf4ad05..888855ad 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "369e63ae9927770fe9ca2fd662ca648e43ab72e5..ee416c16400890b8f6351b1c8113657cb7671eb7"
+    "shas": "cdaacae44dc6aa4a3aba0e68c2459f5065fd1fa4..1389abc96bdc1a98d47c21fd7d6740d4eeca4269"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-insert-test",
@@ -132,7 +132,7 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index 888855a..60e041c 100644",
+        "index 888855ad..60e041c1 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -1,3 +1,3 @@",
@@ -142,7 +142,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ee416c16400890b8f6351b1c8113657cb7671eb7..13d808ca205317e4c1b13c036517ed17cdde1da3"
+    "shas": "1389abc96bdc1a98d47c21fd7d6740d4eeca4269..3c9356ded5de6099c8d07a2edba09dfbbeb5807c"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-test",
@@ -185,7 +185,7 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index 60e041c..888855a 100644",
+        "index 60e041c1..888855ad 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -1,3 +1,3 @@",
@@ -195,7 +195,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "13d808ca205317e4c1b13c036517ed17cdde1da3..1f1988b798d7bd2558d1d050b242ef4afbd52629"
+    "shas": "3c9356ded5de6099c8d07a2edba09dfbbeb5807c..cfaa88230fcf2d750b14d9e07f3fd13a9d254b36"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-replacement-test",
@@ -256,7 +256,7 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index 888855a..fbc7b28 100644",
+        "index 888855ad..fbc7b28e 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -1,3 +1,2 @@",
@@ -266,7 +266,7 @@
         "+theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1f1988b798d7bd2558d1d050b242ef4afbd52629..6408b95d2773e060ccc2c624b319447b326c8a51"
+    "shas": "cfaa88230fcf2d750b14d9e07f3fd13a9d254b36..282c008a1c6565c04e67798c059f42f44495243f"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-test",
@@ -297,7 +297,7 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index fbc7b28..7276d95 100644",
+        "index fbc7b28e..7276d95d 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -1,2 +1 @@",
@@ -305,7 +305,7 @@
         " theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6408b95d2773e060ccc2c624b319447b326c8a51..011d19e2d6ea45758e3df50809069437b44911b5"
+    "shas": "282c008a1c6565c04e67798c059f42f44495243f..44cb18591cf8d85ba07812c409c991217cd383ba"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-rest-test",
@@ -336,12 +336,12 @@
     ],
     "patch": [
         "diff --git a/identifier.js b/identifier.js",
-        "index 7276d95..e69de29 100644",
+        "index 7276d95d..e69de29b 100644",
         "--- a/identifier.js",
         "+++ b/identifier.js",
         "@@ -1 +0,0 @@",
         "-theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "011d19e2d6ea45758e3df50809069437b44911b5..5180fa74c7ae39b3c2cb94b9b5498307af385e5c"
+    "shas": "44cb18591cf8d85ba07812c409c991217cd383ba..62c20bfb9474af540a2ab5d5be1a93530bd21eb8"
 }]

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

@@ -27,14 +27,14 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index e69de29..d81ebad 100644",
+        "index e69de29b..d81ebadd 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -0,0 +1 @@",
         "+if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ee538d5b471190fe27f80e1defc319f36f5f9c38..d5f532daeb84c4dd664519d388575b8891e7e25a"
+    "shas": "9b27e4158f8b990b3f7ca2f77fcf65bf40e26802..6da4e4af4550225b9f9493faa2575360b93f8e5f"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-insert-test",
@@ -80,7 +80,7 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index d81ebad..6bb0eaa 100644",
+        "index d81ebadd..6bb0eaa7 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -1 +1,3 @@",
@@ -89,7 +89,7 @@
         " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d5f532daeb84c4dd664519d388575b8891e7e25a..539d5f1eb9ec34131ed8d31c596c38285f83e6bf"
+    "shas": "6da4e4af4550225b9f9493faa2575360b93f8e5f..8a8df26cb938506ec102e908d4552929a7073d00"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-insert-test",
@@ -354,7 +354,7 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index 6bb0eaa..2034be1 100644",
+        "index 6bb0eaa7..2034be1b 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -1,3 +1,3 @@",
@@ -364,7 +364,7 @@
         " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "539d5f1eb9ec34131ed8d31c596c38285f83e6bf..f525e3671aa6d43caf17c2582f3c746f07570b7a"
+    "shas": "8a8df26cb938506ec102e908d4552929a7073d00..0dc2b9999e933cc5f579be3de82aafbe951cd42c"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-test",
@@ -629,7 +629,7 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index 2034be1..6bb0eaa 100644",
+        "index 2034be1b..6bb0eaa7 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -1,3 +1,3 @@",
@@ -639,7 +639,7 @@
         " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f525e3671aa6d43caf17c2582f3c746f07570b7a..9fce9df9688253990d3fcfa4eb8f2280aa1c0c7c"
+    "shas": "0dc2b9999e933cc5f579be3de82aafbe951cd42c..0b04aed14c61bf7674a5161b0f0de2b45aa73c7d"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-replacement-test",
@@ -700,7 +700,7 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index 6bb0eaa..e26d6c4 100644",
+        "index 6bb0eaa7..e26d6c43 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -1,3 +1,2 @@",
@@ -710,7 +710,7 @@
         "+if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9fce9df9688253990d3fcfa4eb8f2280aa1c0c7c..f5b900cb596f7084a32ca9441f01e9be4b1e27dd"
+    "shas": "0b04aed14c61bf7674a5161b0f0de2b45aa73c7d..805c0a73d13a58a939691a22c60cf60a9bf9ebe9"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-test",
@@ -741,7 +741,7 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index e26d6c4..1a55d0b 100644",
+        "index e26d6c43..1a55d0bd 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -1,2 +1 @@",
@@ -749,7 +749,7 @@
         " if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f5b900cb596f7084a32ca9441f01e9be4b1e27dd..c3bb4c6e35fc4755d18a5e0fb53d5410a476c039"
+    "shas": "805c0a73d13a58a939691a22c60cf60a9bf9ebe9..c61977d5bbe6b4469c6df78bfaeaff5caca6fa6f"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-rest-test",
@@ -780,12 +780,12 @@
     ],
     "patch": [
         "diff --git a/if-else.js b/if-else.js",
-        "index 1a55d0b..e69de29 100644",
+        "index 1a55d0bd..e69de29b 100644",
         "--- a/if-else.js",
         "+++ b/if-else.js",
         "@@ -1 +0,0 @@",
         "-if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c3bb4c6e35fc4755d18a5e0fb53d5410a476c039..dffe792710a5ad52de12ed62e48340a71e5c9227"
+    "shas": "c61977d5bbe6b4469c6df78bfaeaff5caca6fa6f..b0cccfc42d36aba8e42003998233c798245c627f"
 }]