From 8f5220771ef490a441e3ad1a4010ad154278cb12 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Mon, 5 Nov 2018 11:49:43 +0000 Subject: [PATCH 1/6] Bump stack resolvers --- stack-8.4.4.yaml | 2 +- stack.yaml | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 8129f9fef..d624027dc 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -1,4 +1,4 @@ -resolver: lts-12.16 # LTS 12.15 is first to support GHC 8.4.4 +resolver: lts-12.17 # LTS 12.15 is first to support GHC 8.4.4 packages: - . - hie-plugin-api diff --git a/stack.yaml b/stack.yaml index eb5b8cc9f..a40dd5987 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2018-09-28 # Last GHC 8.4.3 +resolver: lts-12.17 # GHC 8.4.4 packages: - . - hie-plugin-api @@ -8,23 +8,19 @@ extra-deps: - ./submodules/HaRe - ./submodules/ghc-mod - ./submodules/ghc-mod/core - -- aeson-1.3.1.1 - base-compat-0.9.3 -- base-orphans-0.7 - cabal-helper-0.8.1.0@rev:0 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 -- ekg-json-0.1.0.6 -- ekg-wai-0.1.0.3 +- ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 +- haddock-library-1.6.0 +- haskell-lsp-0.8.0.1 +- haskell-lsp-types-0.8.0.1 - hsimport-0.8.6 - lsp-test-0.4.0.0 -- monad-memo-0.4.1 -- semigroupoids-5.2.2 - syz-0.2.0.0 - temporary-1.2.1.1 -- yaml-0.8.32 flags: haskell-ide-engine: From 998fd325811316da689a551625a36b40e8e99c9a Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Wed, 7 Nov 2018 15:53:52 +0200 Subject: [PATCH 2/6] Preparing for 0.3.0.0 --- Changelog.md | 4 ++++ haskell-ide-engine.cabal | 2 +- stack-8.4.3.yaml | 1 + stack-8.4.4.yaml | 1 + stack.yaml | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index b52569bfd..d92839cfb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# 0.3.0.0 + +Numerous changes. + # 0.2.2.0 Add more code actions for various diagnostics: diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index 3c8e0245b..8f2b98b30 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -1,5 +1,5 @@ name: haskell-ide-engine -version: 0.2.2.0 +version: 0.3.0.0 synopsis: Provide a common engine to power any Haskell IDE description: Please see README.md homepage: http://github.com/githubuser/haskell-ide-engine#readme diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 489214121..c4f6463c4 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -8,6 +8,7 @@ extra-deps: - ./submodules/HaRe - ./submodules/ghc-mod - ./submodules/ghc-mod/core + - base-compat-0.9.3 - cabal-helper-0.8.1.0@rev:0 - cabal-plan-0.3.0.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index d624027dc..0d4ce313f 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -8,6 +8,7 @@ extra-deps: - ./submodules/HaRe - ./submodules/ghc-mod - ./submodules/ghc-mod/core + - base-compat-0.9.3 - cabal-helper-0.8.1.0@rev:0 - cabal-plan-0.3.0.0 diff --git a/stack.yaml b/stack.yaml index a40dd5987..2661643c7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -8,6 +8,7 @@ extra-deps: - ./submodules/HaRe - ./submodules/ghc-mod - ./submodules/ghc-mod/core + - base-compat-0.9.3 - cabal-helper-0.8.1.0@rev:0 - cabal-plan-0.3.0.0 From 6727d3c3629ef91513232e5241abb8467c8557cf Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Wed, 7 Nov 2018 16:34:39 +0000 Subject: [PATCH 3/6] Update changelog --- Changelog.md | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index d92839cfb..d723e4f3a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,45 @@ # 0.3.0.0 -Numerous changes. + - LSP mode is now the default, and the `--lsp` flag has no effect + - The `--json` flag can be used for JSON transport + - HIE now warns you if there is mismatch between the HIE GHC verison and the project GHC version + - Add Liquid Haskell support + - Add support for hierarchical document symbols + - Add many new types of code actions + - Typed holes + - HaRe refactoring + - Misspelled variables + - Missing top-level signatures + - Prefix unused terms with '_' + - Case splitting + - Suggested pragmas and language extensions + - The parsed output from a module is now cached + - Some features are now available without the need for the module to typecheck first + - Improve code completion + - Suggests modules that can be imported + - Suggests GHC extensions + - Recognizes when completing a type or expression + - Provides snippets for arguments to functions + - Add the ability to set an explicit hoogle database + +Thanks to the contributors for this release: + - bbarker + - Avi-D-coder + - jhreck + - Technix + - meck + - alanz + - cronokirby + - expipiplus1 + - mpilgrem + - jkachmar + - lorenzo + - bubba + - m13m + - cblp + - waddlaw + - apeyroux + - Gurkenglas # 0.2.2.0 From 3059f1d9889113e6b2219ea658492e0ceaefa330 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Thu, 8 Nov 2018 11:36:08 +0200 Subject: [PATCH 4/6] Bump CI cache, tweak changelog --- .circleci/config.yml | 12 ++++++------ Changelog.md | 34 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c9ac7d57a..78858e706 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,9 +22,9 @@ defaults: &defaults - restore_cache: keys: - - stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }} - - stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }} - - stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }} + - stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }} + - stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }} + - stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }} - run: name: Stack setup @@ -55,7 +55,7 @@ defaults: &defaults command: rm -fr ~/.cache/cabal-helper - save_cache: - key: stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }} + key: stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }} paths: - ~/.stack - ~/.cache @@ -77,7 +77,7 @@ defaults: &defaults path: test-logs - save_cache: - key: stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }} + key: stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }} paths: - ~/.stack - ~/.cache @@ -90,7 +90,7 @@ defaults: &defaults - ~/build/submodules/cabal-helper/.stack-work - save_cache: - key: stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }} + key: stack-cache-11-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }} paths: - ~/.stack - ~/.cache diff --git a/Changelog.md b/Changelog.md index d723e4f3a..de00d993c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -23,23 +23,23 @@ - Add the ability to set an explicit hoogle database Thanks to the contributors for this release: - - bbarker - - Avi-D-coder - - jhreck - - Technix - - meck - - alanz - - cronokirby - - expipiplus1 - - mpilgrem - - jkachmar - - lorenzo - - bubba - - m13m - - cblp - - waddlaw - - apeyroux - - Gurkenglas + - @Avi-D-coder + - @Gurkenglas + - @Technix + - @alanz + - @apeyroux + - @bbarker + - @bubba + - @cblp + - @cronokirby + - @expipiplus1 + - @jhrceck + - @jkachmar + - @lorenzo + - @m13m + - @meck + - @mpilgrem + - @waddlaw # 0.2.2.0 From 43217a462591547f01e00fa62bef8f3ddb9620ab Mon Sep 17 00:00:00 2001 From: Jan Hrcek Date: Thu, 8 Nov 2018 10:42:42 +0100 Subject: [PATCH 5/6] Fix typo --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index de00d993c..a48bfbf7b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -33,7 +33,7 @@ Thanks to the contributors for this release: - @cblp - @cronokirby - @expipiplus1 - - @jhrceck + - @jhrcek - @jkachmar - @lorenzo - @m13m From a892814f000ff28ef13a7a6f975e8f312a9fcfba Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Thu, 8 Nov 2018 14:14:57 +0200 Subject: [PATCH 6/6] Fix typo in ChangeLog skip CI skip [CI] --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a48bfbf7b..d72984ddc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,7 +10,7 @@ - HaRe refactoring - Misspelled variables - Missing top-level signatures - - Prefix unused terms with '_' + - Prefix unused terms with `_` - Case splitting - Suggested pragmas and language extensions - The parsed output from a module is now cached