Merge branch 'master' into custom-unit-id

Author: pepeiborra

ChangeLog.md

@@ -20,6 +20,10 @@ Among others,
 
 ### Pull requests merged for 1.0.0
 
+- Correctly split non-varpats in tactics
+([#1427](https://github.com/haskell/haskell-language-server/pull/1427)) by @isovector
+- Move tactics tests to be standalone
+([#1425](https://github.com/haskell/haskell-language-server/pull/1425)) by @isovector
 - Fix the handling of default HLS config again
 ([#1419](https://github.com/haskell/haskell-language-server/pull/1419)) by @pepeiborra
 - Patch pre-commit-hook to work with GHCIDE/hls-plugin-api codes
@@ -38,6 +42,8 @@ Among others,
 ([#1406](https://github.com/haskell/haskell-language-server/pull/1406)) by @fendor
 - Update to hie-bios 0.7.4
 ([#1405](https://github.com/haskell/haskell-language-server/pull/1405)) by @fendor
+- Prepare 1.0.0 release
+([#1402](https://github.com/haskell/haskell-language-server/pull/1402)) by @Ailrun
 - Fix install script after hlint fixes
 ([#1400](https://github.com/haskell/haskell-language-server/pull/1400)) by @jhrcek
 - Use last with-utf8 to fix #1372

ghcide/src/Development/IDE/Core/RuleTypes.hs

@@ -250,7 +250,7 @@ type instance RuleResult GetModIfaceWithoutLinkable = HiFileResult
 type instance RuleResult GetFileContents = (FileVersion, Maybe Text)
 
 -- The Shake key type for getModificationTime queries
-data GetModificationTime = GetModificationTime_
+newtype GetModificationTime = GetModificationTime_
     { missingFileDiagnostics :: Bool
       -- ^ If false, missing file diagnostics are not reported
     }

ghcide/src/Development/IDE/Import/DependencyInformation.hs

@@ -76,25 +76,29 @@ type FilePathIdSet = IntSet
 data PathIdMap = PathIdMap
   { idToPathMap :: !(FilePathIdMap ArtifactsLocation)
   , pathToIdMap :: !(HashMap NormalizedFilePath FilePathId)
+  , nextFreshId :: !Int
   }
   deriving (Show, Generic)
 
 instance NFData PathIdMap
 
 emptyPathIdMap :: PathIdMap
-emptyPathIdMap = PathIdMap IntMap.empty HMS.empty
+emptyPathIdMap = PathIdMap IntMap.empty HMS.empty 0
 
 getPathId :: ArtifactsLocation -> PathIdMap -> (FilePathId, PathIdMap)
 getPathId path m@PathIdMap{..} =
     case HMS.lookup (artifactFilePath path) pathToIdMap of
         Nothing ->
-            let !newId = FilePathId $ HMS.size pathToIdMap
+            let !newId = FilePathId nextFreshId
             in (newId, insertPathId path newId m)
         Just id -> (id, m)
-
-insertPathId :: ArtifactsLocation -> FilePathId -> PathIdMap -> PathIdMap
-insertPathId path id PathIdMap{..} =
-    PathIdMap (IntMap.insert (getFilePathId id) path idToPathMap) (HMS.insert (artifactFilePath path) id pathToIdMap)
+  where
+    insertPathId :: ArtifactsLocation -> FilePathId -> PathIdMap -> PathIdMap
+    insertPathId path id PathIdMap{..} =
+        PathIdMap
+            (IntMap.insert (getFilePathId id) path idToPathMap)
+            (HMS.insert (artifactFilePath path) id pathToIdMap)
+            (succ nextFreshId)
 
 insertImport :: FilePathId -> Either ModuleParseError ModuleImports -> RawDependencyInformation -> RawDependencyInformation
 insertImport (FilePathId k) v rawDepInfo = rawDepInfo { rawImports = IntMap.insert k v (rawImports rawDepInfo) }

haskell-language-server.cabal

@@ -458,12 +458,9 @@ test-suite func-test
     Rename
     Symbol
     TypeDefinition
-    Tactic
     Splice
     HaddockComments
     Ide.Plugin.Splice.Types
-    Ide.Plugin.Tactic.FeatureSet
-    Ide.Plugin.Tactic.TestTypes
     Ide.Plugin.Eval.Types
 
   default-extensions: OverloadedStrings

plugins/hls-tactics-plugin/hls-tactics-plugin.cabal

@@ -78,26 +78,64 @@ library
   default-language: Haskell2010
   default-extensions: DataKinds, TypeOperators
 
+
+executable test-server
+  default-language:   Haskell2010
+  build-depends:
+    , base
+    , data-default
+    , ghcide
+    , hls-tactics-plugin
+    , hls-plugin-api
+    , shake
+  main-is: Server.hs
+  hs-source-dirs: test
+  ghc-options:
+    "-with-rtsopts=-I0 -A128M"
+    -threaded -Wall -Wno-name-shadowing -Wredundant-constraints
+
 test-suite tests
   type: exitcode-stdio-1.0
   main-is: Main.hs
   other-modules:
     AutoTupleSpec
+    GoldenSpec
     UnificationSpec
   hs-source-dirs:
       test
   ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       QuickCheck
+    , aeson
     , base
+    , bytestring
     , checkers
+    , containers
+    , data-default
+    , deepseq
+    , directory
+    , filepath
+    , ghc
+    , ghcide                >= 0.7.5.0
+    , hie-bios
+    , hls-plugin-api
+    , hls-tactics-plugin
     , hspec
+    , hspec-expectations
+    , lens
+    , lsp-test
+    , lsp-types
+    , megaparsec
     , mtl
-    , hls-tactics-plugin
-    , hls-plugin-api
-    , hie-bios
-    , ghc
-    , containers
-  build-tool-depends: hspec-discover:hspec-discover
+    , tasty
+    , tasty-ant-xml           >=1.1.6
+    , tasty-expected-failure
+    , tasty-golden
+    , tasty-hunit
+    , tasty-rerun
+    , text
+  build-tool-depends:
+      hspec-discover:hspec-discover
+    , hls-tactics-plugin:test-server -any
   default-language: Haskell2010
 

plugins/hls-tactics-plugin/test/AutoTupleSpec.hs

@@ -2,23 +2,17 @@
 
 module AutoTupleSpec where
 
-import           Data.Either (isRight)
-import qualified Data.Map as M
-import           Ide.Plugin.Tactic.Debug
-import           Ide.Plugin.Tactic.Judgements (mkFirstJudgement)
-import           Ide.Plugin.Tactic.Machinery
-import           Ide.Plugin.Tactic.Tactics (auto')
-import           Ide.Plugin.Tactic.Types
-import           OccName (mkVarOcc)
-import           Test.Hspec
-import           Test.QuickCheck
-import           Type (mkTyVarTy)
-import           TysPrim (alphaTyVars)
-import           TysWiredIn (mkBoxedTupleTy)
-
-
-instance Show Type where
-  show = unsafeRender
+import Data.Either (isRight)
+import Ide.Plugin.Tactic.Judgements (mkFirstJudgement)
+import Ide.Plugin.Tactic.Machinery
+import Ide.Plugin.Tactic.Tactics (auto')
+import Ide.Plugin.Tactic.Types
+import OccName (mkVarOcc)
+import Test.Hspec
+import Test.QuickCheck
+import Type (mkTyVarTy)
+import TysPrim (alphaTyVars)
+import TysWiredIn (mkBoxedTupleTy)
 
 
 spec :: Spec