Skip to content

Resolve anchors for all supported document links #349

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
Jul 10, 2025
Merged

Resolve anchors for all supported document links #349

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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to the Docker Language Server will be documented in this fil

## [Unreleased]

### Added

- Compose
- textDocument/documentLink
- add anchor resolution for all supported document links ([#348](https://github.com/docker/docker-language-server/issues/348))

### Fixed

- Compose
Expand Down
26 changes: 13 additions & 13 deletions internal/compose/documentLink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ func stringNode(value ast.Node) *ast.StringNode {
}

func createdNestedLink(u *url.URL, serviceNode *ast.MappingValueNode, parent, child string) *protocol.DocumentLink {
if serviceNode.Key.GetToken().Value == parent {
if resolveAnchor(serviceNode.Key).GetToken().Value == parent {
if mappingNode, ok := resolveAnchor(serviceNode.Value).(*ast.MappingNode); ok {
for _, buildAttribute := range mappingNode.Values {
if buildAttribute.Key.GetToken().Value == child {
if resolveAnchor(buildAttribute.Key).GetToken().Value == child {
return createFileLink(u, buildAttribute)
}
}
Expand All @@ -74,7 +74,7 @@ func createdNestedLink(u *url.URL, serviceNode *ast.MappingValueNode, parent, ch
}

func createImageLink(serviceNode *ast.MappingValueNode) *protocol.DocumentLink {
if serviceNode.Key.GetToken().Value == "image" {
if resolveAnchor(serviceNode.Key).GetToken().Value == "image" {
service := stringNode(serviceNode.Value)
if service != nil {
linkedText, link := extractImageLink(service.Value)
Expand All @@ -91,7 +91,7 @@ func createImageLink(serviceNode *ast.MappingValueNode) *protocol.DocumentLink {
}

func createObjectFileLink(u *url.URL, serviceNode *ast.MappingValueNode) *protocol.DocumentLink {
if serviceNode.Key.GetToken().Value == "file" {
if resolveAnchor(serviceNode.Key).GetToken().Value == "file" {
return createFileLink(u, serviceNode)
}
return nil
Expand All @@ -100,23 +100,23 @@ func createObjectFileLink(u *url.URL, serviceNode *ast.MappingValueNode) *protoc
func includedFiles(nodes []ast.Node) []*token.Token {
tokens := []*token.Token{}
for _, entry := range nodes {
if mappingNode, ok := entry.(*ast.MappingNode); ok {
if mappingNode, ok := resolveAnchor(entry).(*ast.MappingNode); ok {
for _, value := range mappingNode.Values {
if value.Key.GetToken().Value == "path" {
if paths, ok := value.Value.(*ast.SequenceNode); ok {
if resolveAnchor(value.Key).GetToken().Value == "path" {
if paths, ok := resolveAnchor(value.Value).(*ast.SequenceNode); ok {
// include:
// - path:
// - ../commons/compose.yaml
// - ./commons-override.yaml
for _, path := range paths.Values {
tokens = append(tokens, path.GetToken())
tokens = append(tokens, resolveAnchor(path).GetToken())
}
} else {
// include:
// - path: ../commons/compose.yaml
// project_directory: ..
// env_file: ../another/.env
tokens = append(tokens, value.Value.GetToken())
tokens = append(tokens, resolveAnchor(value.Value).GetToken())
}
}
}
Expand All @@ -139,7 +139,7 @@ func scanForLinks(u *url.URL, n *ast.MappingValueNode) []protocol.DocumentLink {
links := []protocol.DocumentLink{}
switch s.Value {
case "include":
if sequence, ok := n.Value.(*ast.SequenceNode); ok {
if sequence, ok := resolveAnchor(n.Value).(*ast.SequenceNode); ok {
for _, token := range includedFiles(sequence.Values) {
link := createLink(u, token)
if link != nil {
Expand All @@ -148,7 +148,7 @@ func scanForLinks(u *url.URL, n *ast.MappingValueNode) []protocol.DocumentLink {
}
}
case "services":
if mappingNode, ok := n.Value.(*ast.MappingNode); ok {
if mappingNode, ok := resolveAnchor(n.Value).(*ast.MappingNode); ok {
for _, node := range mappingNode.Values {
if serviceAttributes, ok := resolveAnchor(node.Value).(*ast.MappingNode); ok {
for _, serviceAttribute := range serviceAttributes.Values {
Expand All @@ -171,7 +171,7 @@ func scanForLinks(u *url.URL, n *ast.MappingValueNode) []protocol.DocumentLink {
}
}
case "configs":
if mappingNode, ok := n.Value.(*ast.MappingNode); ok {
if mappingNode, ok := resolveAnchor(n.Value).(*ast.MappingNode); ok {
for _, node := range mappingNode.Values {
if configAttributes, ok := resolveAnchor(node.Value).(*ast.MappingNode); ok {
for _, configAttribute := range configAttributes.Values {
Expand All @@ -184,7 +184,7 @@ func scanForLinks(u *url.URL, n *ast.MappingValueNode) []protocol.DocumentLink {
}
}
case "secrets":
if mappingNode, ok := n.Value.(*ast.MappingNode); ok {
if mappingNode, ok := resolveAnchor(n.Value).(*ast.MappingNode); ok {
for _, node := range mappingNode.Values {
if configAttributes, ok := resolveAnchor(node.Value).(*ast.MappingNode); ok {
for _, configAttribute := range configAttributes.Values {
Expand Down
Loading
Loading