Merge branch 'master' into travis-windows

diff --combined .travis.yml
index 8b89afdd8cac5bc1ca6a80775c9c113df4e8cd2d,07dc18b060dbf82d137ab15c67a4eadc103c8faf..4d0f05264fbd0b8d9202688f2bd46320ed3ac0f9
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -2,47 -2,33 +2,47 @@@ language: 
  
  sudo: false
  
 +os:
 +- windows
 +- linux
 +- osx
 +
 +dist: xenial
 +
  cache:
    directories:
      - .stack-work
      - $HOME/.stack
      - $HOME/haskell-ide-engine/.stack-work
 +    - C:/Users/travis/AppData/Local/Programs/stack
 +    - C:/sr
    timeout: 1000
  
  addons:
    apt:
      packages:
        - npm
 +  homebrew:
 +    packages:
 +      - haskell-stack
 +      - npm
  
  before_install:
    - mkdir -p ~/.local/bin
    - export PATH=$HOME/.local/bin:$PATH
 -  - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
 +  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install haskell-stack nodejs 7zip; fi
 +  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL https://get.haskellstack.org/ | sh; fi
    - mkdir -p haskell-ide-engine
    - cd $HOME/haskell-ide-engine
    - git init
    - git remote add origin https://github.com/haskell/haskell-ide-engine.git
    - git pull origin master
-   - git checkout ed512e250b8699d212417191064e5fbbc0ecdac8
 -  - git checkout 890ca3f2f3bd3bfe74e1f38a426b383a847763bb
++  - git checkout 1a5640f4790bde364dcd0a61617c5ca5b85b145a
    - git submodule init
    - git submodule sync
    - git submodule update --init
-   - stack --no-terminal --skip-ghc-check -j2 install
-   - stack exec hoogle generate
+   - stack --no-terminal --skip-ghc-check -j2 install --stack-yaml=stack-8.6.2.yaml
+   - stack exec hoogle generate --stack-yaml=stack-8.6.2.yaml
    - cd $TRAVIS_BUILD_DIR
    - npm update
    - npm i -g javascript-typescript-langserver