Merge Pre release 2.5 into master (#1030)

* Add tracking of cabal files

* Prepare release 2.5.1

---------

Co-authored-by: Jana Chadt <[email protected]>

Author: fendor

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog for vscode-haskell
 
+## 2.5.1
+
+- Includes changes of the 2.4.2 release
+
 ## 2.5.0
 
 - Add tracking of cabal files

package.json

@@ -2,7 +2,7 @@
   "name": "haskell",
   "displayName": "Haskell",
   "description": "Haskell language support powered by the Haskell Language Server",
-  "version": "2.4.2",
+  "version": "2.5.1",
   "license": "MIT",
   "publisher": "haskell",
   "engines": {
@@ -34,7 +34,8 @@
   },
   "activationEvents": [
     "onLanguage:haskell",
-    "onLanguage:literate haskell"
+    "onLanguage:literate haskell",
+    "onLanguage:cabal"
   ],
   "main": "./dist/extension",
   "contributes": {
@@ -49,6 +50,16 @@
           ".hs"
         ]
       },
+      {
+        "id": "cabal",
+        "aliases": [
+          "Cabal"
+        ],
+        "extensions": [
+          ".cabal"
+        ]
+      },
+
       {
         "id": "literate haskell",
         "aliases": [

src/extension.ts

@@ -259,6 +259,7 @@ 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.