From a032d0e4a2a55f8a71cf566dfd675925cd5eba87 Mon Sep 17 00:00:00 2001 From: fendor Date: Wed, 22 May 2019 12:24:30 +0200 Subject: [PATCH 1/2] Bump version for hsimport to 0.10.0 --- stack-8.2.1.yaml | 2 +- stack-8.4.2.yaml | 2 +- stack-8.4.3.yaml | 2 +- stack-8.4.4.yaml | 2 +- stack-8.6.1.yaml | 2 +- stack-8.6.2.yaml | 2 +- stack-8.6.3.yaml | 2 +- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index f2fb89041..02ca606bc 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -23,7 +23,7 @@ extra-deps: - haskell-lsp-0.13.0.0 - haskell-lsp-types-0.13.0.0@rev:2 - hlint-2.0.11 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - mtl-2.2.2 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 00c9ed88b..b664d3020 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -25,7 +25,7 @@ extra-deps: - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 653ba7804..d67897d9a 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -24,7 +24,7 @@ extra-deps: - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index e71718ccb..88c2f1ba1 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -24,7 +24,7 @@ extra-deps: - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - optparse-simple-0.1.0 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index a99bf85c5..e9fd7f1e9 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -26,7 +26,7 @@ extra-deps: - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index 6d7b3a4c7..e20dfeeea 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 04bb340b9..c48849c09 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 588e9f89f..4351df641 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -21,7 +21,7 @@ extra-deps: - haskell-src-exts-1.21.0 - hlint-2.1.17 - hoogle-5.0.17.6 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 439f8ed4d..bd7672b64 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-lsp-0.13.0.0 - haskell-lsp-types-0.13.0.0 - hlint-2.1.17 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 diff --git a/stack.yaml b/stack.yaml index 439f8ed4d..bd7672b64 100644 --- a/stack.yaml +++ b/stack.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-lsp-0.13.0.0 - haskell-lsp-types-0.13.0.0 - hlint-2.1.17 -- hsimport-0.8.8 +- hsimport-0.10.0 - lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 From 24def8ffaa52d16f50620d1f774ca4bef09888ad Mon Sep 17 00:00:00 2001 From: fendor Date: Wed, 22 May 2019 14:03:37 +0200 Subject: [PATCH 2/2] Add test to prove #1228 is resolved --- test/functional/FunctionalCodeActionsSpec.hs | 3 +++ test/testdata/CodeActionImportList.hs | 1 + 2 files changed, 4 insertions(+) diff --git a/test/functional/FunctionalCodeActionsSpec.hs b/test/functional/FunctionalCodeActionsSpec.hs index c717a521b..e1439c4cb 100644 --- a/test/functional/FunctionalCodeActionsSpec.hs +++ b/test/functional/FunctionalCodeActionsSpec.hs @@ -145,6 +145,7 @@ spec = describe "code actions" $ do , " )" , "import Control.Monad ( when )" , "import Data.Maybe ( fromMaybe )" + , "-- | Main entry point to the program" , "main :: IO ()" , "main =" , " when True" @@ -169,6 +170,7 @@ spec = describe "code actions" $ do [ "import System.IO (stdout, hPutStrLn)" , "import Control.Monad (when)" , "import Data.Maybe (fromMaybe)" + , "-- | Main entry point to the program" , "main :: IO ()" , "main =" , " when True" @@ -568,6 +570,7 @@ hsImportSpec formatterName [e1, e2, e3] = [ "import System.IO (stdout, hPutStrLn)" , "import Control.Monad (when)" , "import Data.Maybe (fromMaybe)" + , "-- | Main entry point to the program" , "main :: IO ()" , "main =" , " when True" diff --git a/test/testdata/CodeActionImportList.hs b/test/testdata/CodeActionImportList.hs index 1e1892e4a..1a0d3ee3e 100644 --- a/test/testdata/CodeActionImportList.hs +++ b/test/testdata/CodeActionImportList.hs @@ -1,3 +1,4 @@ +-- | Main entry point to the program main :: IO () main = when True