From dae655bfb3a64b47b1c8cdaf9e40d669363687e4 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Wed, 25 Aug 2021 23:37:39 +0200
Subject: [PATCH 1/2] Add changelog entry for 1.6.1

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 0251efae..d81d505f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 - Add tracking of cabal files to work together with the incoming cabal formatter plugin
 
+### 1.6.1
+
+- Fix wrapper call to get project ghc version in windows with spaces in path (<https://github.com/haskell/vscode-haskell/pull/439>)
+
 ### 1.6.0
 
 - Bump up vscode version to 1.52.0 (#424) by @berberman

From 91e9738e36e421785b0c64340c70c6920aef15ae Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Wed, 25 Aug 2021 23:40:07 +0200
Subject: [PATCH 2/2] Revert "Merge pull request #417 from
 VeryMilkyJoe/track-cabal-files"

Reverting temporary the tracking of cabal file
as the hls plugin is delayed and we should not release
this change accidentally

This reverts commit c661eab34db71b7d8fe23f330232bde94d2e4b9c, reversing
changes made to a15678ef40f3cfc827579aeea8af8dc45ac0c28d.
---
 src/extension.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index 9fce35f2..1a8dde1e 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -228,7 +228,6 @@ async function activateServerForFolder(context: ExtensionContext, uri: Uri, fold
     documentSelector: [
       { scheme: 'file', language: 'haskell', pattern: pat },
       { scheme: 'file', language: 'literate haskell', pattern: pat },
-      { scheme: 'file', language: 'cabal', pattern: pat },
     ],
     synchronize: {
       // Synchronize the setting section 'haskell' to the server.