From 976a52a961ef7253fd2d09e4fd98642866f51e2a Mon Sep 17 00:00:00 2001
From: Jana Chadt <jana.chadt@nets.at>
Date: Thu, 29 Jul 2021 14:18:36 +0200
Subject: [PATCH 1/2] Add tracking of cabal files

---
 package.json     | 13 ++++++++++++-
 src/extension.ts |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d2b30049..534897ea 100644
--- a/package.json
+++ b/package.json
@@ -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": [
diff --git a/src/extension.ts b/src/extension.ts
index ba391c1f..c53816dd 100644
--- a/src/extension.ts
+++ b/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.

From 59e5af97baee969ccddae0c7ad2fb1aa42b6f540 Mon Sep 17 00:00:00 2001
From: Fendor <power.walross@gmail.com>
Date: Sat, 2 Dec 2023 14:31:53 +0100
Subject: [PATCH 2/2] Prepare release 2.5.1

---
 Changelog.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index d37a18a3..1c3a86e0 100644
--- a/Changelog.md
+++ b/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
diff --git a/package.json b/package.json
index 534897ea..93717b71 100644
--- a/package.json
+++ b/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": {