From d0414324f43f048100f18b354cd389450142d6ef Mon Sep 17 00:00:00 2001
From: fendor <fendor@posteo.de>
Date: Thu, 17 Apr 2025 10:43:18 +0200
Subject: [PATCH] Prepare release 2.6.0

---
 Changelog.md | 15 +++++++++++++++
 package.json | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c7dccd8c..22c61b5d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,20 @@
 # Changelog for vscode-haskell
 
+## 2.6.0
+
+- Add option to enable/disable `.cabal` file support
+  ([#1223](https://github.com/haskell/vscode-haskell/pull/1223))  by @fendor
+- Upgrade project to use latest eslint version
+  ([#1150](https://github.com/haskell/vscode-haskell/pull/1150))  by @fendor
+- Fix windows CI
+  ([#1149](https://github.com/haskell/vscode-haskell/pull/1149))  by @fendor
+- Manually install ghcup into image
+  ([#1119](https://github.com/haskell/vscode-haskell/pull/1119))  by @fendor
+- bump vscode-languageclient version to 9.0.1
+  ([#1108](https://github.com/haskell/vscode-haskell/pull/1108))  by @jetjinser
+- Add cabalFormattingProvider to package.json
+  ([#1100](https://github.com/haskell/vscode-haskell/pull/1100))  by @fendor
+
 ## 2.5.3
 
 - Split out packaging action
diff --git a/package.json b/package.json
index 6aecef5e..d1dad1b8 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.5.3",
+  "version": "2.6.0",
   "license": "MIT",
   "publisher": "haskell",
   "engines": {
@@ -292,6 +292,24 @@
           "scope": "resource",
           "type": "boolean"
         },
+        "haskell.plugin.cabal.hoverOn": {
+          "default": true,
+          "description": "Enables cabal hover",
+          "scope": "resource",
+          "type": "boolean"
+        },
+        "haskell.plugin.cabal.symbolsOn": {
+          "default": true,
+          "description": "Enables cabal symbols",
+          "scope": "resource",
+          "type": "boolean"
+        },
+        "haskell.plugin.cabalHaskellIntegration.globalOn": {
+          "default": true,
+          "description": "Enables cabalHaskellIntegration plugin",
+          "scope": "resource",
+          "type": "boolean"
+        },
         "haskell.plugin.callHierarchy.globalOn": {
           "default": true,
           "description": "Enables callHierarchy plugin",
@@ -334,9 +352,15 @@
           "scope": "resource",
           "type": "boolean"
         },
-        "haskell.plugin.explicit-fields.globalOn": {
+        "haskell.plugin.explicit-fields.codeActionsOn": {
+          "default": true,
+          "description": "Enables explicit-fields code actions",
+          "scope": "resource",
+          "type": "boolean"
+        },
+        "haskell.plugin.explicit-fields.inlayHintsOn": {
           "default": true,
-          "description": "Enables explicit-fields plugin",
+          "description": "Enables explicit-fields inlay hints",
           "scope": "resource",
           "type": "boolean"
         },
@@ -470,6 +494,12 @@
           "scope": "resource",
           "type": "boolean"
         },
+        "haskell.plugin.importLens.inlayHintsOn": {
+          "default": true,
+          "description": "Enables importLens inlay hints",
+          "scope": "resource",
+          "type": "boolean"
+        },
         "haskell.plugin.moduleName.globalOn": {
           "default": true,
           "description": "Enables moduleName plugin",