From e82848006f76e469c61935ed444fd6a8476c3a08 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 20 Jul 2020 13:19:42 +0200 Subject: [PATCH 1/5] Use -haddock for cabal and stack --- cabal.project | 9 +++++++-- stack-8.10.1.yaml | 3 +++ stack-8.6.4.yaml | 3 +++ stack-8.6.5.yaml | 3 +++ stack-8.8.2.yaml | 3 +++ stack-8.8.3.yaml | 3 +++ stack-8.8.4.yaml | 3 +++ stack.yaml | 3 +++ 8 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 0c4da5e3aa..6b0bcd3337 100644 --- a/cabal.project +++ b/cabal.project @@ -1,9 +1,14 @@ -packages: +packages: ./ ghcide tests: true -documentation: true + +program-options + ghc-options: -haddock + +package * + ghc-options: -haddock package haskell-language-server test-show-details: direct diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index c28931ef18..d0d8d751bd 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -4,6 +4,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - Cabal-3.0.2.0 - hie-bios-0.6.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 56eb41a9ad..7c91fdfa59 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -4,6 +4,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - aeson-1.4.3.0 - brittany-0.12.1.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 62db328d8c..42ae12f867 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -4,6 +4,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - ansi-terminal-0.10.2 - base-compat-0.11.0 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index ad95d9ea5b..331cba20d2 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -4,6 +4,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - apply-refact-0.7.0.0 - brittany-0.12.1.1 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index bba9679ccc..797de0dbd9 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -4,6 +4,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - apply-refact-0.7.0.0 - bytestring-trie-0.2.5.0 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index ca3370ee98..570ed1838f 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -5,6 +5,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - apply-refact-0.7.0.0 - bytestring-trie-0.2.5.0 diff --git a/stack.yaml b/stack.yaml index 1ff400f465..f1442812bb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,6 +4,9 @@ packages: - . - ./ghcide/ + ghc-options: + "$everything": -haddock + extra-deps: - ansi-terminal-0.10.2 - base-compat-0.11.0 From 897e1ea93d9b49a0061a2ee9851abc4654d698b5 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 21 Jul 2020 23:50:13 +0200 Subject: [PATCH 2/5] Remove unused program-options --- cabal.project | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 6b0bcd3337..7036da4eef 100644 --- a/cabal.project +++ b/cabal.project @@ -1,12 +1,9 @@ -packages: +packages: ./ ghcide tests: true -program-options - ghc-options: -haddock - package * ghc-options: -haddock From 8d84e9ceb324f2e728e7474d158d31454351ea1d Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 21 Jul 2020 23:50:49 +0200 Subject: [PATCH 3/5] Remove leading white space --- stack-8.10.1.yaml | 2 +- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack-8.8.2.yaml | 2 +- stack-8.8.3.yaml | 2 +- stack-8.8.4.yaml | 2 +- stack.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index d0d8d751bd..02f99032a0 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -4,7 +4,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 7c91fdfa59..b3d09b090e 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -4,7 +4,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 42ae12f867..4fda368fa4 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -4,7 +4,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 331cba20d2..bc43e541b3 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -4,7 +4,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 797de0dbd9..0e3dbce818 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -4,7 +4,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 570ed1838f..97eb469e4e 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -5,7 +5,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: diff --git a/stack.yaml b/stack.yaml index f1442812bb..69df69abb1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,7 +4,7 @@ packages: - . - ./ghcide/ - ghc-options: +ghc-options: "$everything": -haddock extra-deps: From 077ae416f0a454746a0b02293e727b8baa7396ea Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 23 Jul 2020 14:17:34 +0200 Subject: [PATCH 4/5] Remove non useful comment --- test/functional/Deferred.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/functional/Deferred.hs b/test/functional/Deferred.hs index 4bcebda277..1eaef8eb64 100644 --- a/test/functional/Deferred.hs +++ b/test/functional/Deferred.hs @@ -159,7 +159,6 @@ multiMainTests :: TestTree multiMainTests = testGroup "multiple main modules" [ ignoreTestBecause "Broken: Unexpected ConduitParser.empty" $ testCase "Can load one file at a time, when more than one Main module exists" - -- $ runSession hieCommand fullCaps "test/testdata" $ do $ runSession hieCommand fullCaps "test/testdata" $ do _doc <- openDoc "ApplyRefact2.hs" "haskell" _diagsRspHlint <- skipManyTill anyNotification message :: Session PublishDiagnosticsNotification @@ -175,4 +174,4 @@ multiMainTests = testGroup "multiple main modules" [ let (List diags2) = diagsRsp2 ^. params . diagnostics liftIO $ show diags2 `shouldBe` "[]" - ] \ No newline at end of file + ] From caf684581fba3bce609a3cb47db97d6f04a90257 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 23 Jul 2020 14:19:06 +0200 Subject: [PATCH 5/5] Change commented out code to block format To avoid parse error with -haddock ghc option enabled --- test/functional/TypeDefinition.hs | 33 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/test/functional/TypeDefinition.hs b/test/functional/TypeDefinition.hs index 893448d36d..a415c82618 100644 --- a/test/functional/TypeDefinition.hs +++ b/test/functional/TypeDefinition.hs @@ -75,21 +75,22 @@ tests = testGroup "type definitions" [ (Range (toPos (18, 1)) (toPos (18, 26))) ] - -- TODO Implement - -- , ignoreTestBecause "Broken" $ testCase "find type-definition of type def in component" - -- $ pendingWith "Finding symbols cross module is currently not supported" - -- $ runSession hieCommand fullCaps "test/testdata/gototest" - -- $ do - -- doc <- openDoc "src/Lib2.hs" "haskell" - -- otherDoc <- openDoc "src/Lib.hs" "haskell" - -- closeDoc otherDoc - -- defs <- getTypeDefinitions doc (toPos (13, 20)) - -- liftIO $ do - -- fp <- canonicalizePath "test/testdata/gototest/src/Lib.hs" - -- defs - -- `shouldBe` [ Location (filePathToUri fp) - -- (Range (toPos (8, 1)) (toPos (8, 29))) - -- ] + {-- TODO Implement + , ignoreTestBecause "Broken" $ testCase "find type-definition of type def in component" + $ pendingWith "Finding symbols cross module is currently not supported" + $ runSession hieCommand fullCaps "test/testdata/gototest" + $ do + doc <- openDoc "src/Lib2.hs" "haskell" + otherDoc <- openDoc "src/Lib.hs" "haskell" + closeDoc otherDoc + defs <- getTypeDefinitions doc (toPos (13, 20)) + liftIO $ do + fp <- canonicalizePath "test/testdata/gototest/src/Lib.hs" + defs + `shouldBe` [ Location (filePathToUri fp) + (Range (toPos (8, 1)) (toPos (8, 29))) + ] + --} , ignoreTestBecause "Broken" $ testCase "find definition of parameterized data type" $ runSession hieCommand fullCaps "test/testdata/gototest" $ do @@ -105,4 +106,4 @@ tests = testGroup "type definitions" [ --NOTE: copied from Haskell.Ide.Engine.ArtifactMap toPos :: (Int,Int) -> Position -toPos (l,c) = Position (l-1) (c-1) \ No newline at end of file +toPos (l,c) = Position (l-1) (c-1)