handle comments

Author: kokobd

ghcide/src/Development/IDE/Plugin/CodeAction.hs

@@ -80,10 +80,13 @@ import           Text.Regex.TDFA                                   (mrAfter,
                                                                     (=~), (=~~))
 #if MIN_VERSION_ghc(9,2,0)
 import           GHC                                               (AddEpAnn (AddEpAnn),
+                                                                    Anchor (anchor_op),
+                                                                    AnchorOperation (..),
                                                                     AnnsModule (am_main),
                                                                     DeltaPos (..),
                                                                     EpAnn (..),
                                                                     EpaLocation (..),
+                                                                    LEpaComment,
                                                                     LocatedA)
 
 import           Control.Monad                                     (msum)
@@ -1453,8 +1456,16 @@ findPositionAfterModuleName ps hsmodName' = do
 
     epaLocationToLine :: EpaLocation -> Maybe Int
     epaLocationToLine (EpaSpan sp) = Just . srcLocLine . realSrcSpanEnd $ sp
-    epaLocationToLine (EpaDelta (SameLine _) _) = Just 0
-    epaLocationToLine (EpaDelta (DifferentLine line _) _) = Just line
+    epaLocationToLine (EpaDelta (SameLine _) priorComments) = Just $ sumCommentsOffset priorComments
+    epaLocationToLine (EpaDelta (DifferentLine line _) priorComments) = Just (line + sumCommentsOffset priorComments)
+
+    sumCommentsOffset :: [LEpaComment] -> Int
+    sumCommentsOffset = sum . fmap (\(L anchor _) -> anchorOpLine (anchor_op anchor))
+
+    anchorOpLine :: AnchorOperation -> Int
+    anchorOpLine UnchangedAnchor                      = 0
+    anchorOpLine (MovedAnchor (SameLine _))           = 0
+    anchorOpLine (MovedAnchor (DifferentLine line _)) = line
 #else
     whereKeywordLineOffset = do
         ann <- annsA ps M.!? mkAnnKey (astA ps)

ghcide/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs

@@ -0,0 +1,20 @@
+module Asdf
+ (f
+ , where')
+-- hello
+-- world
+
+ where
+import Data.Int
+
+
+
+f :: Int64 -> Int64
+f = id'
+  where id' = id
+
+g :: Int -> Int
+g = id
+
+where' :: Int -> Int
+where' = id

ghcide/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.hs

@@ -0,0 +1,19 @@
+module Asdf
+ (f
+ , where')
+-- hello
+-- world
+
+ where
+
+
+
+f :: Int64 -> Int64
+f = id'
+  where id' = id
+
+g :: Int -> Int
+g = id
+
+where' :: Int -> Int
+where' = id

ghcide/test/exe/Main.hs

@@ -912,6 +912,11 @@ insertImportTests = testGroup "insert import"
         "WhereDeclLowerInFile.hs"
         "WhereDeclLowerInFile.expected.hs"
         "import Data.Int"
+  , checkImport
+        "module where keyword lower in file with comments before it"
+        "WhereDeclLowerInFileWithCommentsBeforeIt.hs"
+        "WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs"
+        "import Data.Int"
   , expectFailBecause
       "'findNextPragmaPosition' function doesn't account for case when shebang is not placed at top of file"
       (checkImport