Merge pull request #996 from alanz/994-completion

Strip leading '-' from OPTIONS_GHC completions

Author: alanz

src/Haskell/Ide/Engine/Plugin/HieExtras.hs

@@ -422,13 +422,19 @@ getCompletions uri prefixInfo (WithSnippets withSnippets) =
             filtPragmaCompls = filtListWithSnippet mkPragmaCompl validPragmas
             filtOptsCompls   = filtListWith mkExtCompl
 
+            stripLeading :: Char -> String -> String
+            stripLeading _ [] = []
+            stripLeading c (s:ss)
+              | s == c = ss
+              | otherwise = s:ss
+
             result
               | "import " `T.isPrefixOf` fullLine
               = filtImportCompls
               | "{-# language" `T.isPrefixOf` T.toLower fullLine
               = filtOptsCompls cachedExtensions
               | "{-# options_ghc" `T.isPrefixOf` T.toLower fullLine
-              = filtOptsCompls (map T.pack $ GHC.flagsForCompletion False)
+              = filtOptsCompls (map (T.pack . stripLeading '-') $ GHC.flagsForCompletion False)
               | "{-# " `T.isPrefixOf` fullLine
               = filtPragmaCompls (pragmaSuffix fullLine)
               | otherwise

test/functional/CompletionSpec.hs

@@ -115,6 +115,28 @@ spec = describe "completions" $ do
       item ^. insertTextFormat `shouldBe` Just Snippet
       item ^. insertText `shouldBe` Just ("OPTIONS_GHC -${1:option} #-}")
 
+  -- -----------------------------------
+
+  it "completes ghc options pragma values" $ runSession hieCommand fullCaps "test/testdata/completion" $ do
+    doc <- openDoc "Completion.hs" "haskell"
+
+    _ <- skipManyTill loggingNotification (count 2 noDiagnostics)
+
+    let te = TextEdit (Range (Position 0 0) (Position 0 0)) "{-# OPTIONS_GHC -Wno-red  #-}\n"
+    _ <- applyEdit doc te
+
+    compls <- getCompletions doc (Position 0 24)
+    -- liftIO $ putStrLn $ "completions=" ++ show (map (^.label) compls)
+    let item = head $ filter ((== "Wno-redundant-constraints") . (^. label)) compls
+    liftIO $ putStrLn $ "item=" ++ show item
+    liftIO $ do
+      item ^. label `shouldBe` "Wno-redundant-constraints"
+      item ^. kind `shouldBe` Just CiKeyword
+      item ^. insertTextFormat `shouldBe` Nothing
+      item ^. insertText `shouldBe` Nothing
+
+  -- -----------------------------------
+
   it "completes with no prefix" $ runSession hieCommand fullCaps "test/testdata/completion" $ do
     doc <- openDoc "Completion.hs" "haskell"
     _ <- skipManyTill loggingNotification (count 2 noDiagnostics)