[Git][ghc/ghc][wip/az/locateda-epa-improve-2023-03-27] 2 commits: EPA: Fix simple tests

Alan Zimmerman (@alanz) gitlab at gitlab.haskell.org
Wed Jul 5 17:40:35 UTC 2023



Alan Zimmerman pushed to branch wip/az/locateda-epa-improve-2023-03-27 at Glasgow Haskell Compiler / GHC


Commits:
2c369aa6 by Alan Zimmerman at 2023-07-04T20:54:17+01:00
EPA: Fix simple tests

- - - - -
90b2ee28 by Alan Zimmerman at 2023-07-04T23:31:36+01:00
EPA: do not convert comments to deltas when balancing.

It seems its not needed with the new approach

- - - - -


14 changed files:

- compiler/GHC/Parser.y
- testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
- testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/DumpSemis.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
- testsuite/tests/parser/should_compile/T14189.stderr
- testsuite/tests/parser/should_compile/T15323.stderr
- testsuite/tests/parser/should_compile/T20452.stderr
- testsuite/tests/parser/should_compile/T20846.stderr
- testsuite/tests/printer/Test20297.stdout
- testsuite/tests/typecheck/should_compile/T15242.stderr
- utils/check-exact/Transform.hs


Changes:

=====================================
compiler/GHC/Parser.y
=====================================
@@ -2415,7 +2415,7 @@ gadt_constrlist :: { Located ([AddEpAnn]
                           ,[LConDecl GhcPs]) } -- Returned in order
 
         : 'where' '{'        gadt_constrs '}'    {% checkEmptyGADTs $
-                                                      L (comb2 $1 $3)
+                                                      L (comb2 $1 $4)
                                                         ([mj AnnWhere $1
                                                          ,moc $2
                                                          ,mcc $4]


=====================================
testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
=====================================
@@ -10,7 +10,7 @@
     (AnnsModule
      [(AddEpAnn AnnModule (EpaSpan { T17544.hs:3:1-6 }))
      ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:3:15-19 }))]
-      []
+     []
      (Just
       ((,)
        { T17544.hs:57:1 }
@@ -99,7 +99,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { T17544.hs:6:3-4 })
+          (EpaSpan { T17544.hs:6:3-16 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:6:6-7 }))
            [])
@@ -135,7 +135,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { T17544.hs:6:9 })
+              (EpaSpan { T17544.hs:6:9-16 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -282,7 +282,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { T17544.hs:10:3-4 })
+          (EpaSpan { T17544.hs:10:3-16 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:10:6-7 }))
            [])
@@ -318,7 +318,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { T17544.hs:10:9 })
+              (EpaSpan { T17544.hs:10:9-16 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -463,7 +463,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { T17544.hs:14:3-4 })
+          (EpaSpan { T17544.hs:14:3-16 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:14:6-7 }))
            [])
@@ -499,7 +499,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { T17544.hs:14:9 })
+              (EpaSpan { T17544.hs:14:9-16 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -647,7 +647,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { T17544.hs:18:3-4 })
+          (EpaSpan { T17544.hs:18:3-16 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:18:6-7 }))
            [])
@@ -683,7 +683,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { T17544.hs:18:9 })
+              (EpaSpan { T17544.hs:18:9-16 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -747,7 +747,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { T17544.hs:20:3-4 })
+          (EpaSpan { T17544.hs:20:3-16 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:20:6-7 }))
            [])
@@ -783,7 +783,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { T17544.hs:20:9 })
+              (EpaSpan { T17544.hs:20:9-16 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -985,7 +985,7 @@
       (ClsInstDecl
        ((,)
         (EpAnn
-         (EpaSpan { T17544.hs:23:1-8 })
+         (EpaSpan { T17544.hs:(23,1)-(25,18) })
          [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:23:1-8 }))
          ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:23:17-21 }))]
          (EpaComments
@@ -1359,7 +1359,7 @@
       (ClsInstDecl
        ((,)
         (EpAnn
-         (EpaSpan { T17544.hs:29:1-8 })
+         (EpaSpan { T17544.hs:(29,1)-(31,18) })
          [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:29:1-8 }))
          ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:29:17-21 }))]
          (EpaComments
@@ -1733,7 +1733,7 @@
       (ClsInstDecl
        ((,)
         (EpAnn
-         (EpaSpan { T17544.hs:35:1-8 })
+         (EpaSpan { T17544.hs:(35,1)-(37,18) })
          [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:35:1-8 }))
          ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:35:17-21 }))]
          (EpaComments
@@ -2107,7 +2107,7 @@
       (ClsInstDecl
        ((,)
         (EpAnn
-         (EpaSpan { T17544.hs:41:1-8 })
+         (EpaSpan { T17544.hs:(41,1)-(43,18) })
          [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:41:1-8 }))
          ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:41:17-21 }))]
          (EpaComments
@@ -2481,7 +2481,7 @@
       (ClsInstDecl
        ((,)
         (EpAnn
-         (EpaSpan { T17544.hs:47:1-8 })
+         (EpaSpan { T17544.hs:(47,1)-(49,18) })
          [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:47:1-8 }))
          ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:47:17-21 }))]
          (EpaComments
@@ -2855,7 +2855,7 @@
       (ClsInstDecl
        ((,)
         (EpAnn
-         (EpaSpan { T17544.hs:53:1-8 })
+         (EpaSpan { T17544.hs:(53,1)-(55,20) })
          [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:53:1-8 }))
          ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:53:18-22 }))]
          (EpaComments


=====================================
testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
=====================================
@@ -10,7 +10,7 @@
     (AnnsModule
      [(AddEpAnn AnnModule (EpaSpan { T17544_kw.hs:11:1-6 }))
      ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:13:13-17 }))]
-      []
+     []
      (Just
       ((,)
        { T17544_kw.hs:25:1 }
@@ -247,7 +247,7 @@
                  [])))
               (HsTupleTy
                (EpAnn
-                (EpaSpan { T17544_kw.hs:19:18 })
+                (EpaSpan { T17544_kw.hs:19:18-19 })
                 (AnnParen
                  (AnnParens)
                  (EpaSpan { T17544_kw.hs:19:18 })
@@ -359,7 +359,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { T17544_kw.hs:24:5-13 })
+          (EpaSpan { T17544_kw.hs:24:5-18 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { T17544_kw.hs:24:15-16 }))
            [])


=====================================
testsuite/tests/parser/should_compile/DumpParsedAst.stderr
=====================================
@@ -251,7 +251,7 @@
                   [])))
                (HsParTy
                 (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:11:10 })
+                 (EpaSpan { DumpParsedAst.hs:11:10-17 })
                  (AnnParen
                   (AnnParens)
                   (EpaSpan { DumpParsedAst.hs:11:10 })
@@ -365,7 +365,7 @@
                   [])))
                (HsParTy
                 (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:11:26 })
+                 (EpaSpan { DumpParsedAst.hs:11:26-36 })
                  (AnnParen
                   (AnnParens)
                   (EpaSpan { DumpParsedAst.hs:11:26 })
@@ -461,7 +461,7 @@
                   [])))
                (HsExplicitListTy
                 (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:12:10 })
+                 (EpaSpan { DumpParsedAst.hs:12:10-12 })
                  [(AddEpAnn AnnSimpleQuote (EpaSpan { DumpParsedAst.hs:12:10 }))
                  ,(AddEpAnn AnnOpenS (EpaSpan { DumpParsedAst.hs:12:11 }))
                  ,(AddEpAnn AnnCloseS (EpaSpan { DumpParsedAst.hs:12:12 }))]
@@ -539,7 +539,7 @@
                [])))
             (HsListTy
              (EpAnn
-              (EpaSpan { DumpParsedAst.hs:10:27 })
+              (EpaSpan { DumpParsedAst.hs:10:27-29 })
               (AnnParen
                (AnnParensSquare)
                (EpaSpan { DumpParsedAst.hs:10:27 })
@@ -751,7 +751,7 @@
                   [])))
                (HsParTy
                 (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:15:25 })
+                 (EpaSpan { DumpParsedAst.hs:15:25-29 })
                  (AnnParen
                   (AnnParens)
                   (EpaSpan { DumpParsedAst.hs:15:25 })
@@ -1155,7 +1155,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { DumpParsedAst.hs:17:31 })
+              (EpaSpan { DumpParsedAst.hs:17:31-39 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -1290,7 +1290,7 @@
              [])))
           (HsFunTy
            (EpAnn
-            (EpaSpan { DumpParsedAst.hs:20:20 })
+            (EpaSpan { DumpParsedAst.hs:20:20-33 })
             (NoEpAnns)
             (EpaComments
              []))
@@ -1331,7 +1331,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { DumpParsedAst.hs:20:25 })
+              (EpaSpan { DumpParsedAst.hs:20:25-33 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -1429,7 +1429,7 @@
               [])))
            (HsParTy
             (EpAnn
-             (EpaSpan { DumpParsedAst.hs:21:22 })
+             (EpaSpan { DumpParsedAst.hs:21:22-37 })
              (AnnParen
               (AnnParens)
               (EpaSpan { DumpParsedAst.hs:21:22 })
@@ -1445,7 +1445,7 @@
                 [])))
              (HsKindSig
               (EpAnn
-               (EpaSpan { DumpParsedAst.hs:21:23 })
+               (EpaSpan { DumpParsedAst.hs:21:23-36 })
                [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:21:25-26 }))]
                (EpaComments
                 []))
@@ -1481,7 +1481,7 @@
                   [])))
                (HsFunTy
                 (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:21:28 })
+                 (EpaSpan { DumpParsedAst.hs:21:28-36 })
                  (NoEpAnns)
                  (EpaComments
                   []))
@@ -1551,7 +1551,7 @@
               [])))
            (HsFunTy
             (EpAnn
-             (EpaSpan { DumpParsedAst.hs:21:42-52 })
+             (EpaSpan { DumpParsedAst.hs:21:42-60 })
              (NoEpAnns)
              (EpaComments
               []))
@@ -1569,7 +1569,7 @@
                 [])))
              (HsParTy
               (EpAnn
-               (EpaSpan { DumpParsedAst.hs:21:42 })
+               (EpaSpan { DumpParsedAst.hs:21:42-52 })
                (AnnParen
                 (AnnParens)
                 (EpaSpan { DumpParsedAst.hs:21:42 })
@@ -1585,7 +1585,7 @@
                   [])))
                (HsFunTy
                 (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:21:43 })
+                 (EpaSpan { DumpParsedAst.hs:21:43-51 })
                  (NoEpAnns)
                  (EpaComments
                   []))
@@ -1718,7 +1718,7 @@
                    [])))
                 (HsParTy
                  (EpAnn
-                  (EpaSpan { DumpParsedAst.hs:22:10 })
+                  (EpaSpan { DumpParsedAst.hs:22:10-34 })
                   (AnnParen
                    (AnnParens)
                    (EpaSpan { DumpParsedAst.hs:22:10 })
@@ -1736,7 +1736,7 @@
                    (NoExtField)
                    (HsForAllInvis
                     (EpAnn
-                     (EpaSpan { DumpParsedAst.hs:22:11-16 })
+                     (EpaSpan { DumpParsedAst.hs:22:11-20 })
                      ((,)
                       (AddEpAnn AnnForall (EpaSpan { DumpParsedAst.hs:22:11-16 }))
                       (AddEpAnn AnnDot (EpaSpan { DumpParsedAst.hs:22:20 })))
@@ -1774,7 +1774,7 @@
                        [])))
                     (HsFunTy
                      (EpAnn
-                      (EpaSpan { DumpParsedAst.hs:22:22-25 })
+                      (EpaSpan { DumpParsedAst.hs:22:22-33 })
                       (NoEpAnns)
                       (EpaComments
                        []))


=====================================
testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
=====================================
@@ -502,7 +502,7 @@
                  [])))
               (HsListTy
                (EpAnn
-                (EpaSpan { DumpRenamedAst.hs:12:27 })
+                (EpaSpan { DumpRenamedAst.hs:12:27-29 })
                 (AnnParen
                  (AnnParensSquare)
                  (EpaSpan { DumpRenamedAst.hs:12:27 })
@@ -598,7 +598,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { DumpRenamedAst.hs:16:20 })
+              (EpaSpan { DumpRenamedAst.hs:16:20-33 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -634,7 +634,7 @@
                  [])))
               (HsFunTy
                (EpAnn
-                (EpaSpan { DumpRenamedAst.hs:16:25 })
+                (EpaSpan { DumpRenamedAst.hs:16:25-33 })
                 (NoEpAnns)
                 (EpaComments
                  []))
@@ -724,7 +724,7 @@
                   [])))
                (HsKindSig
                 (EpAnn
-                 (EpaSpan { DumpRenamedAst.hs:19:23 })
+                 (EpaSpan { DumpRenamedAst.hs:19:23-36 })
                  [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:19:25-26 }))]
                  (EpaComments
                   []))
@@ -755,7 +755,7 @@
                     [])))
                  (HsFunTy
                   (EpAnn
-                   (EpaSpan { DumpRenamedAst.hs:19:28 })
+                   (EpaSpan { DumpRenamedAst.hs:19:28-36 })
                    (NoEpAnns)
                    (EpaComments
                     []))
@@ -815,7 +815,7 @@
                 [])))
              (HsFunTy
               (EpAnn
-               (EpaSpan { DumpRenamedAst.hs:19:42-52 })
+               (EpaSpan { DumpRenamedAst.hs:19:42-60 })
                (NoEpAnns)
                (EpaComments
                 []))
@@ -842,7 +842,7 @@
                     [])))
                  (HsFunTy
                   (EpAnn
-                   (EpaSpan { DumpRenamedAst.hs:19:43 })
+                   (EpaSpan { DumpRenamedAst.hs:19:43-51 })
                    (NoEpAnns)
                    (EpaComments
                     []))
@@ -998,7 +998,7 @@
                          [])))
                       (HsFunTy
                        (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:20:22-25 })
+                        (EpaSpan { DumpRenamedAst.hs:20:22-33 })
                         (NoEpAnns)
                         (EpaComments
                          []))
@@ -1644,7 +1644,7 @@
                  [])))
               (HsFunTy
                (EpAnn
-                (EpaSpan { DumpRenamedAst.hs:24:31 })
+                (EpaSpan { DumpRenamedAst.hs:24:31-39 })
                 (NoEpAnns)
                 (EpaComments
                  []))
@@ -1905,7 +1905,7 @@
                  [])))
               (HsListTy
                (EpAnn
-                (EpaSpan { DumpRenamedAst.hs:30:12 })
+                (EpaSpan { DumpRenamedAst.hs:30:12-14 })
                 (AnnParen
                  (AnnParensSquare)
                  (EpaSpan { DumpRenamedAst.hs:30:12 })
@@ -1968,7 +1968,7 @@
                    [])))
                 (HsListTy
                  (EpAnn
-                  (EpaSpan { DumpRenamedAst.hs:31:10 })
+                  (EpaSpan { DumpRenamedAst.hs:31:10-12 })
                   (AnnParen
                    (AnnParensSquare)
                    (EpaSpan { DumpRenamedAst.hs:31:10 })


=====================================
testsuite/tests/parser/should_compile/DumpSemis.stderr
=====================================
@@ -152,7 +152,7 @@
      (NoExtField)
      (TypeSig
       (EpAnn
-       (EpaSpan { DumpSemis.hs:9:1-3 })
+       (EpaSpan { DumpSemis.hs:9:1-12 })
        (AnnSig
         (AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:9:5-6 }))
         [])
@@ -221,7 +221,7 @@
                [])))
             (HsTupleTy
              (EpAnn
-              (EpaSpan { DumpSemis.hs:9:11 })
+              (EpaSpan { DumpSemis.hs:9:11-12 })
               (AnnParen
                (AnnParens)
                (EpaSpan { DumpSemis.hs:9:11 })
@@ -456,7 +456,7 @@
      (NoExtField)
      (TypeSig
       (EpAnn
-       (EpaSpan { DumpSemis.hs:14:1-3 })
+       (EpaSpan { DumpSemis.hs:14:1-12 })
        (AnnSig
         (AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:14:5-6 }))
         [])
@@ -525,7 +525,7 @@
                [])))
             (HsTupleTy
              (EpAnn
-              (EpaSpan { DumpSemis.hs:14:11 })
+              (EpaSpan { DumpSemis.hs:14:11-12 })
               (AnnParen
                (AnnParens)
                (EpaSpan { DumpSemis.hs:14:11 })
@@ -719,7 +719,7 @@
      (NoExtField)
      (TypeSig
       (EpAnn
-       (EpaSpan { DumpSemis.hs:21:1-3 })
+       (EpaSpan { DumpSemis.hs:21:1-12 })
        (AnnSig
         (AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:21:5-6 }))
         [])
@@ -788,7 +788,7 @@
                [])))
             (HsTupleTy
              (EpAnn
-              (EpaSpan { DumpSemis.hs:21:11 })
+              (EpaSpan { DumpSemis.hs:21:11-12 })
               (AnnParen
                (AnnParens)
                (EpaSpan { DumpSemis.hs:21:11 })
@@ -1357,7 +1357,7 @@
            [])))
         (ClassOpSig
          (EpAnn
-          (EpaSpan { DumpSemis.hs:29:3-7 })
+          (EpaSpan { DumpSemis.hs:29:3-23 })
           (AnnSig
            (AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:29:9-10 }))
            [])
@@ -1393,7 +1393,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { DumpSemis.hs:29:12-16 })
+              (EpaSpan { DumpSemis.hs:29:12-23 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -1464,7 +1464,7 @@
      (NoExtField)
      (TypeSig
       (EpAnn
-       (EpaSpan { DumpSemis.hs:31:1 })
+       (EpaSpan { DumpSemis.hs:31:1-30 })
        (AnnSig
         (AddEpAnn AnnDcolon (EpaSpan { DumpSemis.hs:31:3-4 }))
         [])
@@ -1503,7 +1503,7 @@
            (NoExtField)
            (L
             (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:31:6-20 })
+                         (EpaSpan { DumpSemis.hs:31:6-23 })
                          (AnnContext
                           (Just
                            ((,)
@@ -1514,7 +1514,7 @@
                           [(EpaSpan { DumpSemis.hs:31:19 })
                           ,(EpaSpan { DumpSemis.hs:31:20 })])
                          (EpaComments
-                          [])) { DumpSemis.hs:31:6-20 })
+                          [])) { DumpSemis.hs:31:6-23 })
             [(L
               ((EpAnnS
                 (EpaSpan { DumpSemis.hs:31:8-11 })
@@ -1635,7 +1635,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { DumpSemis.hs:31:25 })
+              (EpaSpan { DumpSemis.hs:31:25-30 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -1694,7 +1694,12 @@
     ((EpAnnS
       (EpaSpan { DumpSemis.hs:32:1-7 })
       (AnnListItem
-       [])
+       [(AddSemiAnn
+         (EpaSpan { DumpSemis.hs:33:1 }))
+       ,(AddSemiAnn
+         (EpaSpan { DumpSemis.hs:34:6 }))
+       ,(AddSemiAnn
+         (EpaSpan { DumpSemis.hs:34:7 }))])
       (EpaComments
        [])))
     (ValD
@@ -1718,12 +1723,7 @@
           ((EpAnnS
             (EpaSpan { DumpSemis.hs:32:1-7 })
             (AnnListItem
-             [(AddSemiAnn
-               (EpaSpan { DumpSemis.hs:33:1 }))
-             ,(AddSemiAnn
-               (EpaSpan { DumpSemis.hs:34:6 }))
-             ,(AddSemiAnn
-               (EpaSpan { DumpSemis.hs:34:7 }))])
+             [])
             (EpaComments
              [])))
           (Match
@@ -2124,7 +2124,8 @@
     ((EpAnnS
       (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
       (AnnListItem
-       [])
+       [(AddSemiAnn
+         (EpaSpan { DumpSemis.hs:45:1 }))])
       (EpaComments
        [])))
     (ValD
@@ -2148,8 +2149,7 @@
           ((EpAnnS
             (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
             (AnnListItem
-             [(AddSemiAnn
-               (EpaSpan { DumpSemis.hs:45:1 }))])
+             [])
             (EpaComments
              [])))
           (Match
@@ -2268,7 +2268,7 @@
                         [])))
                      (Match
                       (EpAnn
-                       (EpaSpan { DumpSemis.hs:39:6 })
+                       (EpaSpan { DumpSemis.hs:39:6-13 })
                        []
                        (EpaComments
                         []))
@@ -2306,7 +2306,7 @@
                            []))
                          (GRHS
                           (EpAnn
-                           (EpaSpan { DumpSemis.hs:39:8-9 })
+                           (EpaSpan { DumpSemis.hs:39:8-13 })
                            (GrhsAnn
                             (Nothing)
                             (AddEpAnn AnnRarrow (EpaSpan { DumpSemis.hs:39:8-9 })))
@@ -2341,7 +2341,7 @@
                         [])))
                      (Match
                       (EpAnn
-                       (EpaSpan { DumpSemis.hs:40:6 })
+                       (EpaSpan { DumpSemis.hs:40:6-13 })
                        []
                        (EpaComments
                         []))
@@ -2379,7 +2379,7 @@
                            []))
                          (GRHS
                           (EpAnn
-                           (EpaSpan { DumpSemis.hs:40:8-9 })
+                           (EpaSpan { DumpSemis.hs:40:8-13 })
                            (GrhsAnn
                             (Nothing)
                             (AddEpAnn AnnRarrow (EpaSpan { DumpSemis.hs:40:8-9 })))
@@ -2416,7 +2416,7 @@
                         [])))
                      (Match
                       (EpAnn
-                       (EpaSpan { DumpSemis.hs:41:6 })
+                       (EpaSpan { DumpSemis.hs:41:6-13 })
                        []
                        (EpaComments
                         []))
@@ -2454,7 +2454,7 @@
                            []))
                          (GRHS
                           (EpAnn
-                           (EpaSpan { DumpSemis.hs:41:8-9 })
+                           (EpaSpan { DumpSemis.hs:41:8-13 })
                            (GrhsAnn
                             (Nothing)
                             (AddEpAnn AnnRarrow (EpaSpan { DumpSemis.hs:41:8-9 })))
@@ -2493,7 +2493,7 @@
                         [])))
                      (Match
                       (EpAnn
-                       (EpaSpan { DumpSemis.hs:42:6 })
+                       (EpaSpan { DumpSemis.hs:42:6-13 })
                        []
                        (EpaComments
                         []))
@@ -2531,7 +2531,7 @@
                            []))
                          (GRHS
                           (EpAnn
-                           (EpaSpan { DumpSemis.hs:42:8-9 })
+                           (EpaSpan { DumpSemis.hs:42:8-13 })
                            (GrhsAnn
                             (Nothing)
                             (AddEpAnn AnnRarrow (EpaSpan { DumpSemis.hs:42:8-9 })))


=====================================
testsuite/tests/parser/should_compile/KindSigs.stderr
=====================================
@@ -147,7 +147,7 @@
                 [])))
              (HsKindSig
               (EpAnn
-               (EpaSpan { KindSigs.hs:12:11-13 })
+               (EpaSpan { KindSigs.hs:12:11-21 })
                [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:12:15-16 }))]
                (EpaComments
                 []))
@@ -300,7 +300,7 @@
           [])))
        (HsTupleTy
         (EpAnn
-         (EpaSpan { KindSigs.hs:15:14 })
+         (EpaSpan { KindSigs.hs:15:14-51 })
          (AnnParen
           (AnnParens)
           (EpaSpan { KindSigs.hs:15:14 })
@@ -318,7 +318,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:15:16-18 })
+            (EpaSpan { KindSigs.hs:15:16-26 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:20-21 }))]
             (EpaComments
              []))
@@ -401,7 +401,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:15:35-41 })
+            (EpaSpan { KindSigs.hs:15:35-49 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:43-44 }))]
             (EpaComments
              []))
@@ -543,7 +543,7 @@
           [])))
        (HsTupleTy
         (EpAnn
-         (EpaSpan { KindSigs.hs:16:15-16 })
+         (EpaSpan { KindSigs.hs:16:15-54 })
          (AnnParen
           (AnnParensHash)
           (EpaSpan { KindSigs.hs:16:15-16 })
@@ -561,7 +561,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:16:18-20 })
+            (EpaSpan { KindSigs.hs:16:18-28 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:22-23 }))]
             (EpaComments
              []))
@@ -644,7 +644,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:16:37-43 })
+            (EpaSpan { KindSigs.hs:16:37-51 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:45-46 }))]
             (EpaComments
              []))
@@ -764,7 +764,7 @@
           [])))
        (HsListTy
         (EpAnn
-         (EpaSpan { KindSigs.hs:19:12 })
+         (EpaSpan { KindSigs.hs:19:12-26 })
          (AnnParen
           (AnnParensSquare)
           (EpaSpan { KindSigs.hs:19:12 })
@@ -780,7 +780,7 @@
             [])))
          (HsKindSig
           (EpAnn
-           (EpaSpan { KindSigs.hs:19:14-16 })
+           (EpaSpan { KindSigs.hs:19:14-24 })
            [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:19:18-19 }))]
            (EpaComments
             []))
@@ -841,7 +841,7 @@
      (NoExtField)
      (TypeSig
       (EpAnn
-       (EpaSpan { KindSigs.hs:22:1-3 })
+       (EpaSpan { KindSigs.hs:22:1-44 })
        (AnnSig
         (AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:5-6 }))
         [])
@@ -878,7 +878,7 @@
              [])))
           (HsFunTy
            (EpAnn
-            (EpaSpan { KindSigs.hs:22:8-20 })
+            (EpaSpan { KindSigs.hs:22:8-44 })
             (NoEpAnns)
             (EpaComments
              []))
@@ -896,7 +896,7 @@
                [])))
             (HsParTy
              (EpAnn
-              (EpaSpan { KindSigs.hs:22:8 })
+              (EpaSpan { KindSigs.hs:22:8-20 })
               (AnnParen
                (AnnParens)
                (EpaSpan { KindSigs.hs:22:8 })
@@ -912,7 +912,7 @@
                  [])))
               (HsKindSig
                (EpAnn
-                (EpaSpan { KindSigs.hs:22:9-11 })
+                (EpaSpan { KindSigs.hs:22:9-19 })
                 [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:13-14 }))]
                 (EpaComments
                  []))
@@ -971,7 +971,7 @@
                [])))
             (HsFunTy
              (EpAnn
-              (EpaSpan { KindSigs.hs:22:25-28 })
+              (EpaSpan { KindSigs.hs:22:25-44 })
               (NoEpAnns)
               (EpaComments
                []))
@@ -1012,7 +1012,7 @@
                  [])))
               (HsParTy
                (EpAnn
-                (EpaSpan { KindSigs.hs:22:33 })
+                (EpaSpan { KindSigs.hs:22:33-44 })
                 (AnnParen
                  (AnnParens)
                  (EpaSpan { KindSigs.hs:22:33 })
@@ -1028,7 +1028,7 @@
                    [])))
                 (HsKindSig
                  (EpAnn
-                  (EpaSpan { KindSigs.hs:22:34-35 })
+                  (EpaSpan { KindSigs.hs:22:34-43 })
                   [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:37-38 }))]
                   (EpaComments
                    []))
@@ -1041,7 +1041,7 @@
                      [])))
                   (HsTupleTy
                    (EpAnn
-                    (EpaSpan { KindSigs.hs:22:34 })
+                    (EpaSpan { KindSigs.hs:22:34-35 })
                     (AnnParen
                      (AnnParens)
                      (EpaSpan { KindSigs.hs:22:34 })
@@ -1219,7 +1219,7 @@
           [])))
        (HsExplicitListTy
         (EpAnn
-         (EpaSpan { KindSigs.hs:26:13 })
+         (EpaSpan { KindSigs.hs:26:13-29 })
          [(AddEpAnn AnnSimpleQuote (EpaSpan { KindSigs.hs:26:13 }))
          ,(AddEpAnn AnnOpenS (EpaSpan { KindSigs.hs:26:14 }))
          ,(AddEpAnn AnnCloseS (EpaSpan { KindSigs.hs:26:29 }))]
@@ -1235,7 +1235,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:26:16-19 })
+            (EpaSpan { KindSigs.hs:26:16-27 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:26:21-22 }))]
             (EpaComments
              []))
@@ -1323,7 +1323,7 @@
           [])))
        (HsExplicitListTy
         (EpAnn
-         (EpaSpan { KindSigs.hs:27:14 })
+         (EpaSpan { KindSigs.hs:27:14-45 })
          [(AddEpAnn AnnOpenS (EpaSpan { KindSigs.hs:27:14 }))
          ,(AddEpAnn AnnCloseS (EpaSpan { KindSigs.hs:27:45 }))]
          (EpaComments
@@ -1339,7 +1339,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:27:16-19 })
+            (EpaSpan { KindSigs.hs:27:16-27 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:21-22 }))]
             (EpaComments
              []))
@@ -1398,7 +1398,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:27:30-34 })
+            (EpaSpan { KindSigs.hs:27:30-42 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:36-37 }))]
             (EpaComments
              []))
@@ -1508,7 +1508,7 @@
           [])))
        (HsExplicitTupleTy
         (EpAnn
-         (EpaSpan { KindSigs.hs:28:16 })
+         (EpaSpan { KindSigs.hs:28:16-44 })
          [(AddEpAnn AnnSimpleQuote (EpaSpan { KindSigs.hs:28:16 }))
          ,(AddEpAnn AnnOpenP (EpaSpan { KindSigs.hs:28:17 }))
          ,(AddEpAnn AnnCloseP (EpaSpan { KindSigs.hs:28:44 }))]
@@ -1524,7 +1524,7 @@
              [])))
           (HsKindSig
            (EpAnn
-            (EpaSpan { KindSigs.hs:28:19-29 })
+            (EpaSpan { KindSigs.hs:28:19-39 })
             [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:28:31-32 }))]
             (EpaComments
              []))
@@ -1537,7 +1537,7 @@
                [])))
             (HsExplicitListTy
              (EpAnn
-              (EpaSpan { KindSigs.hs:28:19 })
+              (EpaSpan { KindSigs.hs:28:19-29 })
               [(AddEpAnn AnnOpenS (EpaSpan { KindSigs.hs:28:19 }))
               ,(AddEpAnn AnnCloseS (EpaSpan { KindSigs.hs:28:29 }))]
               (EpaComments
@@ -1599,7 +1599,7 @@
                [])))
             (HsListTy
              (EpAnn
-              (EpaSpan { KindSigs.hs:28:34 })
+              (EpaSpan { KindSigs.hs:28:34-39 })
               (AnnParen
                (AnnParensSquare)
                (EpaSpan { KindSigs.hs:28:34 })
@@ -1690,7 +1690,7 @@
           [])))
        (HsKindSig
         (EpAnn
-         (EpaSpan { KindSigs.hs:31:21-23 })
+         (EpaSpan { KindSigs.hs:31:21-31 })
          [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:31:25-26 }))]
          (EpaComments
           []))
@@ -1751,7 +1751,7 @@
      (NoExtField)
      (TypeSig
       (EpAnn
-       (EpaSpan { KindSigs.hs:34:1-4 })
+       (EpaSpan { KindSigs.hs:34:1-22 })
        (AnnSig
         (AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:34:6-7 }))
         [])
@@ -1788,7 +1788,7 @@
              [])))
           (HsParTy
            (EpAnn
-            (EpaSpan { KindSigs.hs:34:9 })
+            (EpaSpan { KindSigs.hs:34:9-22 })
             (AnnParen
              (AnnParens)
              (EpaSpan { KindSigs.hs:34:9 })
@@ -1804,7 +1804,7 @@
                [])))
             (HsKindSig
              (EpAnn
-              (EpaSpan { KindSigs.hs:34:10-13 })
+              (EpaSpan { KindSigs.hs:34:10-21 })
               [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:34:15-16 }))]
               (EpaComments
                []))
@@ -1942,5 +1942,3 @@
                    {OccName: True}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))]))
-
-


=====================================
testsuite/tests/parser/should_compile/T14189.stderr
=====================================
@@ -142,7 +142,7 @@
              (RecCon
               (L
                (SrcSpanAnn (EpAnn
-                            (EpaSpan { T14189.hs:6:31 })
+                            (EpaSpan { T14189.hs:6:31-42 })
                             (AnnList
                              (Just
                               (EpaSpan { T14189.hs:6:33-40 }))
@@ -164,11 +164,12 @@
                  (ConDeclField
                   (EpAnnNotUsed)
                   [(L
-                    (EpAnnS
+                    ((EpAnnS
                      (EpaSpan { T14189.hs:6:33 })
-                     (NoEpAnns)
+                      (AnnListItem
+                       [])
                      (EpaComments
-                      []))
+                       [])))
                     (FieldOcc
                      {Name: T14189.f}
                      (L
@@ -248,12 +249,14 @@
         (EpaComments
          [])))
       (IEThingWith
-       (EpAnn
-        (EpaSpan { T14189.hs:3:3-8 })
-        [(AddEpAnn AnnOpenP (EpaSpan { T14189.hs:3:10 }))
-        ,(AddEpAnn AnnCloseP (EpaSpan { T14189.hs:3:15 }))]
-        (EpaComments
-         []))
+       ((,)
+        (Nothing)
+        (EpAnn
+         (EpaSpan { T14189.hs:3:3-8 })
+         [(AddEpAnn AnnOpenP (EpaSpan { T14189.hs:3:10 }))
+         ,(AddEpAnn AnnCloseP (EpaSpan { T14189.hs:3:15 }))]
+         (EpaComments
+          [])))
        (L
         ((EpAnnS
           (EpaSpan { T14189.hs:3:3-8 })


=====================================
testsuite/tests/parser/should_compile/T15323.stderr
=====================================
@@ -121,14 +121,14 @@
             (HsNormalTok))
            (L
             ((EpAnnS
-              (EpaSpan { T15323.hs:6:20-54 })
+              (EpaSpan { T15323.hs:6:20-29 })
               (AnnListItem
                [])
               (EpaComments
                [])))
             (HsOuterExplicit
              (EpAnn
-              (EpaSpan { T15323.hs:6:20-25 })
+              (EpaSpan { T15323.hs:6:20-29 })
               ((,)
                (AddEpAnn AnnForall (EpaSpan { T15323.hs:6:20-25 }))
                (AddEpAnn AnnDot (EpaSpan { T15323.hs:6:29 })))
@@ -160,7 +160,7 @@
            (Just
             (L
              (SrcSpanAnn (EpAnn
-                          (EpaSpan { T15323.hs:6:31-36 })
+                          (EpaSpan { T15323.hs:6:31-39 })
                           (AnnContext
                            (Just
                             ((,)
@@ -169,7 +169,7 @@
                            []
                            [])
                           (EpaComments
-                           [])) { T15323.hs:6:31-36 })
+                           [])) { T15323.hs:6:31-39 })
              [(L
                ((EpAnnS
                  (EpaSpan { T15323.hs:6:31-36 })
@@ -179,7 +179,7 @@
                   [])))
                (HsParTy
                 (EpAnn
-                 (EpaSpan { T15323.hs:6:31 })
+                 (EpaSpan { T15323.hs:6:31-36 })
                  (AnnParen
                   (AnnParens)
                   (EpaSpan { T15323.hs:6:31 })


=====================================
testsuite/tests/parser/should_compile/T20452.stderr
=====================================
@@ -432,7 +432,7 @@
               [])))
            (HsListTy
             (EpAnn
-             (EpaSpan { T20452.hs:8:57 })
+             (EpaSpan { T20452.hs:8:57-74 })
              (AnnParen
               (AnnParensSquare)
               (EpaSpan { T20452.hs:8:57 })
@@ -448,7 +448,7 @@
                 [])))
              (HsTupleTy
               (EpAnn
-               (EpaSpan { T20452.hs:8:58 })
+               (EpaSpan { T20452.hs:8:58-73 })
                (AnnParen
                 (AnnParens)
                 (EpaSpan { T20452.hs:8:58 })
@@ -688,7 +688,7 @@
               [])))
            (HsListTy
             (EpAnn
-             (EpaSpan { T20452.hs:9:57 })
+             (EpaSpan { T20452.hs:9:57-74 })
              (AnnParen
               (AnnParensSquare)
               (EpaSpan { T20452.hs:9:57 })
@@ -704,7 +704,7 @@
                 [])))
              (HsTupleTy
               (EpAnn
-               (EpaSpan { T20452.hs:9:58 })
+               (EpaSpan { T20452.hs:9:58-73 })
                (AnnParen
                 (AnnParens)
                 (EpaSpan { T20452.hs:9:58 })


=====================================
testsuite/tests/parser/should_compile/T20846.stderr
=====================================
@@ -44,7 +44,7 @@
      (NoExtField)
      (FixSig
       (EpAnn
-       (EpaSpan { T20846.hs:3:1-6 })
+       (EpaSpan { T20846.hs:3:1-11 })
        [(AddEpAnn AnnInfix (EpaSpan { T20846.hs:3:1-6 }))]
        (EpaComments
         []))


=====================================
testsuite/tests/printer/Test20297.stdout
=====================================
@@ -93,13 +93,13 @@
              [])
             [(L
               (EpAnnS
-               (EpaSpan { Test20297.hs:(5,5)-(7,7) })
+               (EpaSpan { Test20297.hs:5:5-7 })
                (NoEpAnns)
                (EpaComments
                 []))
               (GRHS
                (EpAnn
-                (EpaSpan { Test20297.hs:(5,5)-(7,7) })
+                (EpaSpan { Test20297.hs:5:5-7 })
                 (GrhsAnn
                  (Nothing)
                  (AddEpAnn AnnEqual (EpaSpan { Test20297.hs:5:5 })))
@@ -205,13 +205,13 @@
              [])
             [(L
               (EpAnnS
-               (EpaSpan { Test20297.hs:(9,5)-(11,26) })
+               (EpaSpan { Test20297.hs:9:5-7 })
                (NoEpAnns)
                (EpaComments
                 []))
               (GRHS
                (EpAnn
-                (EpaSpan { Test20297.hs:(9,5)-(11,26) })
+                (EpaSpan { Test20297.hs:9:5-7 })
                 (GrhsAnn
                  (Nothing)
                  (AddEpAnn AnnEqual (EpaSpan { Test20297.hs:9:5 })))
@@ -484,13 +484,13 @@
              [])
             [(L
               (EpAnnS
-               (EpaSpan { Test20297.ppr.hs:(4,3)-(5,7) })
+               (EpaSpan { Test20297.ppr.hs:4:3-5 })
                (NoEpAnns)
                (EpaComments
                 []))
               (GRHS
                (EpAnn
-                (EpaSpan { Test20297.ppr.hs:(4,3)-(5,7) })
+                (EpaSpan { Test20297.ppr.hs:4:3-5 })
                 (GrhsAnn
                  (Nothing)
                  (AddEpAnn AnnEqual (EpaSpan { Test20297.ppr.hs:4:3 })))
@@ -586,13 +586,13 @@
              [])
             [(L
               (EpAnnS
-               (EpaSpan { Test20297.ppr.hs:(7,3)-(9,24) })
+               (EpaSpan { Test20297.ppr.hs:7:3-5 })
                (NoEpAnns)
                (EpaComments
                 []))
               (GRHS
                (EpAnn
-                (EpaSpan { Test20297.ppr.hs:(7,3)-(9,24) })
+                (EpaSpan { Test20297.ppr.hs:7:3-5 })
                 (GrhsAnn
                  (Nothing)
                  (AddEpAnn AnnEqual (EpaSpan { Test20297.ppr.hs:7:3 })))


=====================================
testsuite/tests/typecheck/should_compile/T15242.stderr
=====================================
@@ -1,34 +1,17 @@
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:5-41 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:6-40 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:7-39 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:8-35 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:9-34 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:10-33 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:11-29 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:12-25 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:13-21 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:6:14-20 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:5:5-17 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:5:6-16 })
-(HsPar
-[])))
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:5:19-37 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:5:20-32 })
-(HsPar
-(SrcSpanAnn (EpAnnNotUsed) { T15242.hs:5:21-31 })
-(HsPar
-[])))
-(HsPar
+(EpaSpan { T15242.hs:6:5-41 })
+(EpaSpan { T15242.hs:6:6-40 })
+(EpaSpan { T15242.hs:6:7-39 })
+(EpaSpan { T15242.hs:6:8-35 })
+(EpaSpan { T15242.hs:6:9-34 })
+(EpaSpan { T15242.hs:6:10-33 })
+(EpaSpan { T15242.hs:6:11-29 })
+(EpaSpan { T15242.hs:6:12-25 })
+(EpaSpan { T15242.hs:6:13-21 })
+(EpaSpan { T15242.hs:6:14-20 })
+(EpaSpan { T15242.hs:5:5-17 })
+(EpaSpan { T15242.hs:5:6-16 })
+[]))
+(EpaSpan { T15242.hs:5:19-37 })
+(EpaSpan { T15242.hs:5:20-32 })
+(EpaSpan { T15242.hs:5:21-31 })
+[]))
\ No newline at end of file


=====================================
utils/check-exact/Transform.hs
=====================================
@@ -585,7 +585,8 @@ balanceCommentsMatch (L l (Match am mctxt pats (GRHSs xg grhss binds))) = do
   where
     simpleBreak (r,_) = r /= 0
     an1 = l
-    anc1 = addCommentOrigDeltas $ s_comments an1
+    -- anc1 = addCommentOrigDeltas $ s_comments an1
+    anc1 = s_comments an1
     cs1f = getFollowingComments anc1
     (move',stay') = break simpleBreak (trailingCommentsDeltas (anchorFromLocatedA (L l ())) cs1f)
     move = map snd move'
@@ -605,7 +606,8 @@ balanceCommentsMatch (L l (Match am mctxt pats (GRHSs xg grhss binds))) = do
               -- ---------------------------------
 
               (EpAnn anc an lgc) = ag
-              lgc' = splitCommentsEnd (realSrcSpan "balanceCommentsMatch" $ locA lg) $ addCommentOrigDeltas lgc
+              -- lgc' = splitCommentsEnd (realSrcSpan "balanceCommentsMatch" $ locA lg) $ addCommentOrigDeltas lgc
+              lgc' = splitCommentsEnd (realSrcSpan "balanceCommentsMatch" $ locA lg) lgc
               ag' = if moved
                       then EpAnn anc an lgc'
                       else EpAnn anc an (lgc' <> (EpaCommentsBalanced [] move))
@@ -808,7 +810,8 @@ balanceSameLineComments (L la (Match anm mctxt pats (GRHSs x grhss lb))) = do
       (L lg (GRHS ga gs rhs):grs) -> (la'',reverse $ (L lg (GRHS ga' gs rhs)):grs,[(gac,(csp,csf))])
         where
           an1 = la
-          anc1 = addCommentOrigDeltas $ s_comments an1
+          -- anc1 = addCommentOrigDeltas $ s_comments an1
+          anc1 = s_comments an1
           (EpAnn anc an _) = ga :: EpAnn GrhsAnn
           (csp,csf) = case anc1 of
             EpaComments cs -> ([],cs)
@@ -818,7 +821,8 @@ balanceSameLineComments (L la (Match anm mctxt pats (GRHSs x grhss lb))) = do
           stay = map snd stay'
           cs1 = EpaCommentsBalanced csp stay
 
-          gac = addCommentOrigDeltas $ epAnnComments ga
+          -- gac = addCommentOrigDeltas $ epAnnComments ga
+          gac = epAnnComments ga
           gfc = getFollowingComments gac
           gac' = setFollowingComments gac (sortEpaComments $ gfc ++ move)
           ga' = (EpAnn anc an gac')



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d089deac3bba3e017285a002b6740b91c2bba1d1...90b2ee280996c4a37d9c570d0526d944aa0d2d4a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d089deac3bba3e017285a002b6740b91c2bba1d1...90b2ee280996c4a37d9c570d0526d944aa0d2d4a
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230705/4f58eb27/attachment-0001.html>


More information about the ghc-commits mailing list