Only compare line numbers when checking cursor presence

Author: crtschin

ghcide-test/exe/CompletionTests.hs

@@ -523,9 +523,7 @@ contextCompletionTests =
       doc <- openDoc "A.hs" "haskell"
       _ <- waitForDiagnostics
       compls <- getCompletions doc (Position 1 3)
-      let importSnippets = [ c | c@CompletionItem{..} <- compls
-                          , _kind == Just CompletionItemKind_Snippet
-                          , _label == "import" ]
+      let importSnippets = filterSnippetsLabel "import" compls
       liftIO $ length importSnippets @?= 4
 
   , completionTest "no import snippet past a declaration"
@@ -594,9 +592,7 @@ contextCompletionTests =
       doc <- openDoc "A.hs" "haskell"
       _ <- waitForDiagnostics
       compls <- getCompletions doc (Position 4 13)
-      let snippets = [ c | c@CompletionItem{..} <- compls
-                     , _kind == Just CompletionItemKind_Snippet
-                     , _label == "import" ]
+      let snippets = filterSnippetsLabel "import" compls
       liftIO $ snippets @?= []
 
   , testSessionSingleFile "top level excludes regular completions" "A.hs"
@@ -671,9 +667,7 @@ contextCompletionTests =
       doc <- openDoc "A.hs" "haskell"
       _ <- waitForDiagnostics
       compls <- getCompletions doc (Position 3 15)  -- after "imp" in "    helper = imp"
-      let snippets = [ c | c@CompletionItem{..} <- compls
-                     , _kind == Just CompletionItemKind_Snippet
-                     , _label == "import" ]
+      let snippets = filterSnippetsLabel "import" compls
       liftIO $ snippets @?= []
 
   , completionTest
@@ -733,6 +727,12 @@ contextCompletionTests =
       (Position 5 19)  -- after "Xxx" in "  let helper :: Xxx"
       [("Xxxtype", CompletionItemKind_Struct, "Xxxtype", False, True, Nothing)]
   ]
+  where
+    filterSnippetsLabel l snippets =
+      [ c | c@CompletionItem{..} <- snippets
+      , _kind == Just CompletionItemKind_Snippet
+      , _label == l
+      ]
 
 completionDocTests :: [TestTree]
 completionDocTests =

plugins/hls-refactor-plugin/test/Main.hs

@@ -189,30 +189,30 @@ completionTests =
       , testGroup "Data constructor"
         [ completionCommandTest
             "not imported"
-            ["module A where", "import Text.Printf ()", "ZeroPad"]
-            (Position 2 4)
+            ["module A where", "import Text.Printf ()", "a = ZeroPad"]
+            (Position 2 8)
             "ZeroPad"
-            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
+            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "a = ZeroPad"]
         , completionCommandTest
             "parent imported abs"
-            ["module A where", "import Text.Printf (FormatAdjustment)", "ZeroPad"]
-            (Position 2 4)
+            ["module A where", "import Text.Printf (FormatAdjustment)", "a = ZeroP"]
+            (Position 2 8)
             "ZeroPad"
-            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
+            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "a = ZeroP"]
         , completionNoCommandTest
             "parent imported all"
-            ["module A where", "import Text.Printf (FormatAdjustment (..))", "ZeroPad"]
-            (Position 2 4)
+            ["module A where", "import Text.Printf (FormatAdjustment (..))", "a = ZeroP"]
+            (Position 2 8)
             "ZeroPad"
         , completionNoCommandTest
             "already imported"
-            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
-            (Position 2 4)
+            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "a = ZeroP"]
+            (Position 2 8)
             "ZeroPad"
         , completionNoCommandTest
             "function from Prelude"
-            ["module A where", "import Data.Maybe ()", "Nothing"]
-            (Position 2 4)
+            ["module A where", "import Data.Maybe ()", "a = Nothi"]
+            (Position 2 8)
             "Nothing"
         , completionCommandTest
             "type operator parent"
@@ -224,20 +224,20 @@ completionTests =
       , testGroup "Record completion"
         [ completionCommandTest
             "not imported"
-            ["module A where", "import Text.Printf ()", "FormatParse"]
-            (Position 2 10)
+            ["module A where", "import Text.Printf ()", "a :: FormatParse"]
+            (Position 2 14)
             "FormatParse"
-            ["module A where", "import Text.Printf (FormatParse)", "FormatParse"]
+            ["module A where", "import Text.Printf (FormatParse)", "a :: FormatParse"]
         , completionCommandTest
             "parent imported"
-            ["module A where", "import Text.Printf (FormatParse)", "FormatParse"]
-            (Position 2 10)
+            ["module A where", "import Text.Printf (FormatParse)", "a = FormatParse"]
+            (Position 2 14)
             "FormatParse"
-            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
+            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "a = FormatParse"]
         , completionNoCommandTest
             "already imported"
-            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
-            (Position 2 10)
+            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "a = FormatP"]
+            (Position 2 14)
             "FormatParse"
         ]
         , testGroup "Package completion"