Only compare line numbers when checking cursor presence

Author: crtschin

ghcide-test/exe/CompletionTests.hs

@@ -200,18 +200,17 @@ localCompletionTests = [
         ,("abcde", CompletionItemKind_Function, "abcde", True, False, Nothing)
         ],
     testSessionEmpty "incomplete entries" $ do
-        let src a = "data Data = " <> a
-        doc <- createDoc "A.hs" "haskell" $ src "AAA"
+        let src a = a <> " = aaa"
+        doc <- createDoc "A.hs" "haskell" $ src "aaa"
         void $ waitForTypecheck doc
-        let editA rhs =
-                changeDoc doc [TextDocumentContentChangeEvent . InR . TextDocumentContentChangeWholeDocument $ src rhs]
-        editA "AAAA"
+        let editA rhs = changeDoc doc [TextDocumentContentChangeEvent . InR . TextDocumentContentChangeWholeDocument $ src rhs]
+        editA "aaaa"
         void $ waitForTypecheck doc
-        editA "AAAAA"
+        editA "aaaaa"
         void $ waitForTypecheck doc
 
-        compls <- getCompletions doc (Position 0 15)
-        liftIO $ filter ("AAA" `T.isPrefixOf`) (mapMaybe _insertText compls) @?= ["AAAAA"]
+        compls <- getCompletions doc (Position 0 11)
+        liftIO $ filter ("aaa" `T.isPrefixOf`) (mapMaybe _insertText compls) @?= ["aaaaa"]
         pure (),
     completionTest
         "polymorphic record dot completion"
@@ -345,10 +344,10 @@ otherCompletionTests = [
           T.unlines
             [ "module A where",
               "import B",
-              "memb"
+              "3 = memb"
             ]
       _ <- waitForDiagnostics
-      compls <- getCompletions docA $ Position 2 4
+      compls <- getCompletions docA $ Position 2 7
       let compls' = [txt | CompletionItem {_insertText = Just txt, ..} <- compls, _label == "member"]
       liftIO $ take 1 compls' @?= ["member"],
 

ghcide/src/Development/IDE/Plugin/Completions/Context.hs

@@ -155,8 +155,9 @@ getContext (ContextMap chunks) query =
     searchChunks :: Bool -> [ContextChunk] -> ([ContextGroup], ContextResult)
     searchChunks _ [] = ([], mempty)
     searchChunks firstChunk (Chunk cLo cHi group contextOf : rest)
-      | -- query is past this chunk
-        qLo > cHi = searchChunks False rest
+      | -- query is past this chunk (line-only comparison so cursors
+        -- past the last column on the final line still match)
+        _line qLo > _line cHi = searchChunks False rest
       | -- query is before this chunk
         qHi < cLo = (if firstChunk then [HeaderGroup] else [], mempty)
         -- this chunk is relevant, emit the group and all relevant intervals
@@ -209,8 +210,13 @@ contextual context shouldStop query s =
 dominates :: Range -> Range -> Bool
 dominates (Range s e) (Range qs qe) = s <= qs && qe <= e
 
+-- | A query range is outside a source range if it ends before the source
+-- starts, or it starts on a line after the source ends.
+-- We intentionally compare only lines (not columns) for the trailing
+-- boundary so that a cursor past the last token on a line still falls
+-- inside the node occupying that line.
 outside :: Range -> Range -> Bool
-outside (Range ps pe) (Range qs qe) = pe < qs || ps > qe
+outside (Range ps pe) (Range qs qe) = pe < qs || _line ps > _line qe
 
 instance Pretty Context where
   pretty = \case