Skip to content

Fix Bake attribute definitions that referenced nil pointers #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rcjsuen merged 1 commit into from
Jun 10, 2025
Merged

Fix Bake attribute definitions that referenced nil pointers #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ All notable changes to the Docker Language Server will be documented in this fil
- stop volume named references from causing volume attributes to not be suggested ([#309](https://github.com/docker/docker-language-server/issues/309))
- textDocument/documentLink
- ensure the image attribute is valid before trying to process it for document links ([#306](https://github.com/docker/docker-language-server/issues/306))
- Bake
- textDocument/definition
- fix nil pointers when navigating around a top level attribute that is not in any block ([#311](https://github.com/docker/docker-language-server/issues/311))

## [0.10.2] - 2025-06-06

Expand Down
4 changes: 2 additions & 2 deletions internal/bake/hcl/definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func ResolveAttributeValue(ctx context.Context, definitionLinkSupport bool, mana
if tupleConsExpr, ok := attribute.Expr.(*hclsyntax.TupleConsExpr); ok {
for _, e := range tupleConsExpr.Exprs {
if isInsideRange(e.Range(), position) {
if templateExpr, ok := e.(*hclsyntax.TemplateExpr); ok {
if templateExpr, ok := e.(*hclsyntax.TemplateExpr); ok && sourceBlock != nil {
if templateExpr.IsStringLiteral() {
// look up a target reference if it's inside a
// target block's inherits attribute, or a
Expand Down Expand Up @@ -169,7 +169,7 @@ func ResolveExpression(ctx context.Context, definitionLinkSupport bool, manager

if objectConsExpression, ok := expression.(*hclsyntax.ObjectConsExpr); ok {
for _, item := range objectConsExpression.Items {
if isInsideRange(item.KeyExpr.Range(), position) {
if isInsideRange(item.KeyExpr.Range(), position) && sourceBlock != nil {
if attributeName == "args" && sourceBlock.Type == "target" {
dockerfilePath, err := doc.DockerfileForTarget(sourceBlock)
if dockerfilePath == "" || err != nil {
Expand Down
93 changes: 93 additions & 0 deletions internal/bake/hcl/definition_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,99 @@ func TestDefinition(t *testing.T) {
},
},
},
{
name: "attribute whitespace should resolve to nothing",
content: "a1 = \"value\"",
line: 0,
character: 3,
endCharacter: -1,
locations: nil,
links: nil,
},
{
name: "attribute array string value",
content: "a1 = [\"value\"]",
line: 0,
character: 10,
endCharacter: -1,
locations: nil,
links: nil,
},
{
name: "attribute array string has a templated variable",
content: "a1 = \"\"\na2 = [\"${a1}\"]",
line: 1,
character: 10,
endCharacter: -1,
locations: []protocol.Location{
{
URI: bakeFileURI,
Range: protocol.Range{
Start: protocol.Position{Line: 0, Character: 0},
End: protocol.Position{Line: 0, Character: 2},
},
},
},
links: []protocol.LocationLink{
{
OriginSelectionRange: &protocol.Range{
Start: protocol.Position{Line: 1, Character: 9},
End: protocol.Position{Line: 1, Character: 11},
},
TargetURI: bakeFileURI,
TargetRange: protocol.Range{
Start: protocol.Position{Line: 0, Character: 0},
End: protocol.Position{Line: 0, Character: 2},
},
TargetSelectionRange: protocol.Range{
Start: protocol.Position{Line: 0, Character: 0},
End: protocol.Position{Line: 0, Character: 2},
},
},
},
},
{
name: "attribute object value's attribute name",
content: "args = { var = value }",
line: 0,
character: 11,
endCharacter: -1,
locations: nil,
links: nil,
},
{
name: "attribute object value's attribute name",
content: "a1 = \"\"\nargs = { var = a1 }",
line: 1,
character: 16,
endCharacter: -1,
locations: []protocol.Location{
{
URI: bakeFileURI,
Range: protocol.Range{
Start: protocol.Position{Line: 0, Character: 0},
End: protocol.Position{Line: 0, Character: 2},
},
},
},
links: []protocol.LocationLink{
{
OriginSelectionRange: &protocol.Range{
Start: protocol.Position{Line: 1, Character: 15},
End: protocol.Position{Line: 1, Character: 17},
},
TargetURI: bakeFileURI,
TargetRange: protocol.Range{
Start: protocol.Position{Line: 0, Character: 0},
End: protocol.Position{Line: 0, Character: 2},
},
TargetSelectionRange: protocol.Range{
Start: protocol.Position{Line: 0, Character: 0},
End: protocol.Position{Line: 0, Character: 2},
},
},
},
},
{
name: "variable referenced in for loop conditional",
content: "variable num { default = 3 }\nvariable varList { default = [\"tag\"] }\ntarget default {\n tags = [for var in varList : upper(var) if num > 2]\n}",
Expand Down