From 45bdc003629165ad1ed8e6ee339a1988540bdb3c Mon Sep 17 00:00:00 2001
From: Remy Suen <remy.suen@docker.com>
Date: Thu, 7 Aug 2025 08:23:37 -0400
Subject: [PATCH] Ignore comments when hovering in a Bake file

Signed-off-by: Remy Suen <remy.suen@docker.com>
---
 CHANGELOG.md                    | 8 ++++++++
 internal/bake/hcl/hover.go      | 5 ++++-
 internal/bake/hcl/hover_test.go | 7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index feaab13..a2b9a96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to the Docker Language Server will be documented in this file.
 
+## [Unreleased]
+
+### Fixed
+
+- Bake
+  - textDocument/hover
+    - fix error when hovering inside a comment ([#410](https://github.com/docker/docker-language-server/issues/410))
+
 ## [0.15.0] - 2025-08-06
 
 ### Added
diff --git a/internal/bake/hcl/hover.go b/internal/bake/hcl/hover.go
index 3e53707..1666b05 100644
--- a/internal/bake/hcl/hover.go
+++ b/internal/bake/hcl/hover.go
@@ -42,7 +42,10 @@ func Hover(ctx context.Context, params *protocol.HoverParams, document document.
 	if err != nil {
 		var positionalError *decoder.PositionalError
 		if !errors.As(err, &positionalError) {
-			return nil, fmt.Errorf("hover analysis encountered an error: %w", err)
+			var posOutOfRangeError *decoder.PosOutOfRangeError
+			if !errors.As(err, &posOutOfRangeError) {
+				return nil, fmt.Errorf("hover analysis encountered an error: %w", err)
+			}
 		}
 		return nil, nil
 	}
diff --git a/internal/bake/hcl/hover_test.go b/internal/bake/hcl/hover_test.go
index 074ddf7..07f29e1 100644
--- a/internal/bake/hcl/hover_test.go
+++ b/internal/bake/hcl/hover_test.go
@@ -224,6 +224,13 @@ func TestHover(t *testing.T) {
 			character: 11,
 			result:    nil,
 		},
+		{
+			name:      "hover inside a comment returns nothing",
+			content:   "/*target",
+			line:      0,
+			character: 4,
+			result:    nil,
+		},
 	}
 
 	temporaryBakeFile := fmt.Sprintf("file:///%v", strings.TrimPrefix(filepath.ToSlash(filepath.Join(os.TempDir(), "docker-bake.hcl")), "/"))