Merge branch 'master' into master

Author: tittoassini

.circleci/config.yml

@@ -171,33 +171,6 @@ jobs:
           key: cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
           paths:
             - ~/.cabal
-  nix:
-    working_directory: ~/build
-    environment:
-        - NIXPKGS_ALLOW_BROKEN: 1
-    docker:
-        - image: nixorg/nix:circleci
-    steps:
-      - checkout
-      - run:
-          name: Sync submodules
-          command: git submodule sync --recursive
-      - run:
-          name: Update submodules
-          command: git submodule update --recursive --init
-      - restore-cache:
-          keys:
-            - cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
-      - run:
-          name: Build
-          command: nix-shell -j4 --run "cabal new-update && (cabal new-build -j1 --enable-tests || cabal new-build -j1 --enable-tests) "
-          no_output_timeout: 30m
-      - save_cache:
-          key: cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
-          paths:
-            - ~/.cabal
-
-
 
 workflows:
   version: 2
@@ -212,4 +185,3 @@ workflows:
       - ghc-8.10.2
       # - ghc-nightly
       - cabal
-      - nix

.github/workflows/nix.yml

@@ -0,0 +1,26 @@
+name: Nix
+
+on: [push, pull_request]
+jobs:
+  nix:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc: ['default', 'ghc8102', 'ghc884', 'ghc865']
+        os: [ubuntu-latest, macOS-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - uses: cachix/install-nix-action@v12
+      with:
+        nix_path: nixpkgs=channel:nixos-20.03
+    - uses: cachix/cachix-action@v8
+      with:
+        name: haskell-language-server
+        extraPullNames: haskell-ghcide
+        authToken: '${{ secrets.HLS_CACHIX_AUTH_TOKEN }}'
+    - run: nix-shell --argstr compiler ${{ matrix.ghc }} --run "cabal update && cabal build"

README.md

@@ -691,16 +691,28 @@ $ cp install/hie.yaml.cbl install/hie.yaml
 
 #### Using Stack
 
-Note: Stack project must also be built once until [this issue](https://github.com/commercialhaskell/stack/issues/5213) is fixed.
-
 ```shell
 $ cp hie.yaml.stack hie.yaml
 $ cp install/hie.yaml.stack install/hie.yaml
+$ cp ghcide/hie.yaml.stack ghcide/hie.yaml
 $ stack build --test --no-run-tests
 $ cd install
 $ stack build
 ```
 
+#### Using Nix
+
+The instructions below show how to set up a Cachix binary cache and open a nix shell for local development.
+
+```shell
+$ cachix use haskell-language-server
+$ nix-shell
+$ cabal update
+$ cabal build
+```
+
+If you are looking for a Nix expression to create haskell-language-server binaries, see https://github.com/haskell/haskell-language-server/issues/122
+
 #### Introduction tutorial
 Pepeiborra [wrote an tutorial](https://github.com/pepeiborra/hls-tutorial) on writing a plugin in HLS.
 

cabal.project

@@ -5,6 +5,8 @@ packages:
          ./hls-plugin-api
          ./plugins/tactics
          ./plugins/hls-hlint-plugin
+         ./plugins/hls-explicit-imports-plugin
+         ./plugins/hls-retrie-plugin
 
 source-repository-package
   type: git
@@ -23,11 +25,6 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-11-12T03:53:09Z
+index-state: 2020-12-03T03:58:05Z
 
 allow-newer: data-tree-print:base
-
--- To ensure the build get the version with the fix for #498
--- Remove when the constraint is included upstream
-constraints: implicit-hie >= 0.1.2.3
-constraints: implicit-hie-cradle >= 0.3.0.0

exe/Main.hs

@@ -18,7 +18,7 @@ import           Ide.Plugin.Example2       as Example2
 import           Ide.Plugin.Floskell       as Floskell
 import           Ide.Plugin.Fourmolu       as Fourmolu
 import           Ide.Plugin.GhcIde         as GhcIde
-import           Ide.Plugin.ImportLens     as ImportLens
+import           Ide.Plugin.ExplicitImports as ExplicitImports
 import           Ide.Plugin.Ormolu         as Ormolu
 import           Ide.Plugin.Retrie         as Retrie
 import           Ide.Plugin.StylishHaskell as StylishHaskell
@@ -60,7 +60,7 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
       , Brittany.descriptor "brittany"
 #endif
       , Eval.descriptor "eval"
-      , ImportLens.descriptor "importLens"
+      , ExplicitImports.descriptor "importLens"
       , ModuleName.descriptor "moduleName"
       , Hlint.descriptor "hlint"
       ]

haskell-language-server.cabal

@@ -98,11 +98,9 @@ executable haskell-language-server
     Ide.Plugin.Example2
     Ide.Plugin.Floskell
     Ide.Plugin.Fourmolu
-    Ide.Plugin.ImportLens
     Ide.Plugin.ModuleName
     Ide.Plugin.Ormolu
     Ide.Plugin.Pragmas
-    Ide.Plugin.Retrie
     Ide.Plugin.StylishHaskell
 
   ghc-options:
@@ -133,10 +131,11 @@ executable haskell-language-server
     , hls-hlint-plugin
     , hls-plugin-api
     , hls-tactics-plugin
+    , hls-explicit-imports-plugin
+    , hls-retrie-plugin
     , lens
     , ormolu                   ^>=0.1.2
     , regex-tdfa
-    , retrie                   >=0.1.1.0
     , hslogger
     , optparse-applicative
     , haskell-lsp              ^>=0.22
@@ -145,7 +144,6 @@ executable haskell-language-server
     , mtl
     , ormolu                   ^>=0.1.2
     , regex-tdfa
-    , retrie                   >=0.1.1.0
     , safe-exceptions
     , shake                    >=0.17.5
     , stylish-haskell          ^>=0.12

hls-plugin-api/src/Ide/Plugin.hs

@@ -238,9 +238,8 @@ makeExecuteCommands ecs lf ide = wrapUnhandledExceptions $ do
                 -- Send off the workspace request if it has one
                 forM_ mEdit $ \edit -> do
                   let eParams = J.ApplyWorkspaceEditParams edit
-                  -- TODO: Use lspfuncs to send an applyedit message. Or change
-                  -- the API to allow a list of messages to be returned.
-                  return (Right J.Null, Just(J.WorkspaceApplyEdit, eParams))
+                  reqId <- LSP.getNextReqId lf
+                  LSP.sendFunc lf $ ReqApplyWorkspaceEdit $ RequestMessage "2.0" reqId WorkspaceApplyEdit eParams
 
                 case mCmd of
                   -- If we have a command, continue to execute it

nix/default.nix

@@ -0,0 +1,40 @@
+{ sources ? import ./sources.nix }:
+let
+  overlay = _self: pkgs:
+    let sharedOverrides = {
+        overrides = _self: super: {
+            mkDerivation = args: super.mkDerivation (args //
+                {
+                    # skip running tests for Hackage packages
+                    doCheck = args.pname != "ghcide" && args.pname != "haskell-language-server";
+                    # relax upper bounds
+                    jailbreak = args.pname != "jailbreak-cabal";
+                });
+            };
+            };
+        gitignoreSource = (import sources.gitignore { inherit (pkgs) lib; }).gitignoreSource;
+        extended = haskellPackages:
+          haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides {
+            haskell-language-server = gitignoreSource ../.;
+            ghcide = gitignoreSource ../ghcide;
+            hie-compat = gitignoreSource ../ghcide/hie-compat;
+            hls-plugin-api = gitignoreSource ../hls-plugin-api;
+            hls-tactics-plugin = gitignoreSource ../plugins/tactics;
+            hls-hlint-plugin = gitignoreSource ../plugins/hls-hlint-plugin;
+            hls-explicit-imports-plugin = gitignoreSource ../plugins/hls-explicit-imports-plugin;
+            hls-retrie-plugin = gitignoreSource ../plugins/hls-retrie-plugin;
+          });
+        in
+        {
+        inherit gitignoreSource;
+        ourHaskell = pkgs.haskell // {
+            packages = pkgs.haskell.packages // {
+                # relax upper bounds on ghc 8.10.x versions (and skip running tests)
+                ghc8101 = extended (pkgs.haskell.packages.ghc8101.override sharedOverrides);
+                ghc8102 = extended (pkgs.haskell.packages.ghc8102.override sharedOverrides);
+            };
+        };
+        };
+
+in import sources.nixpkgs
+{ overlays = [ overlay ] ; config = {allowBroken = true;}; }

nix/sources.json

@@ -1,4 +1,16 @@
 {
+    "gitignore": {
+        "branch": "master",
+        "description": "Nix function for filtering local git sources",
+        "homepage": "",
+        "owner": "hercules-ci",
+        "repo": "gitignore",
+        "rev": "c4662e662462e7bf3c2a968483478a665d00e717",
+        "sha256": "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx",
+        "type": "tarball",
+        "url": "https://github.com/hercules-ci/gitignore/archive/c4662e662462e7bf3c2a968483478a665d00e717.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",
@@ -12,15 +24,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixpkgs-unstable",
+        "branch": "haskell-updates",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "a332da8588aeea4feb9359d23f58d95520899e3c",
-        "sha256": "18hlja5syv3xpi14c07h9lrn1cchq2azmj06fyalq52vl064nx75",
+        "repo": "nixpkgs",
+        "rev": "cbf707b2af4cd66bdcdd84b2bddfb627194b39c0",
+        "sha256": "1bj55jkgdzx7lv6dvy26l354c7vsxaa1jipm99axgqqax905m8sa",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/a332da8588aeea4feb9359d23f58d95520899e3c.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cbf707b2af4cd66bdcdd84b2bddfb627194b39c0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }