From 0c4fecd6d16fadb920c87a9c3b33bc47ef8ffe2e Mon Sep 17 00:00:00 2001
From: Snoweuph <snow@euph.email>
Date: Wed, 18 Feb 2026 12:06:34 +0100
Subject: [PATCH] language/hcl: fix #1350 (#1405)

---
 docs/manual/release-notes/rl-0.9.md |  3 +++
 modules/plugins/languages/hcl.nix   | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 93961818..47ce7cd6 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -204,6 +204,9 @@
 
 - Added Makefile support via `languages.make`.
 
+- Fix `languages.hcl` init, depending on `comment-nvim` by checking if it is
+  enabled. Fixes a crash (#1350).
+
 - Added Debugging support to `languages.php`.
 
 - Added Formatting support to `languages.php` via
diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index e32719b9..c20c7872 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -76,9 +76,14 @@ in {
           end
         })
 
-        local ft = require('Comment.ft')
-        ft
-          .set('hcl', '#%s')
+         ${
+          if config.vim.comments.comment-nvim.enable
+          then ''
+            local ft = require('Comment.ft')
+            ft.set('hcl', '#%s')
+          ''
+          else ""
+        }
       '';
     }
     (mkIf cfg.treesitter.enable {