Merge pull request #162 from docker/object-schema-compose-fix

Suggest completion items for Compose arrays with an object schema

Author: rcjsuen

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to the Docker Language Server will be documented in this file.
 
+## [Unreleased]
+
+### Added
+
+- Compose
+  - improve code completion by automatically including required attributes in completion items ([#155](https://github.com/docker/docker-language-server/issues/155))
+
+### Fixed
+
+- Compose
+  - suggest completion items for array items that use an object schema directly ([#161](https://github.com/docker/docker-language-server/issues/161))
+
 ## [0.5.0] - 2025-05-05
 
 ### Added

internal/compose/completion_test.go

@@ -1151,6 +1151,63 @@ services:
 				},
 			},
 		},
+		{
+			name: "attributes of the develop's watch array items",
+			content: `
+services:
+  postgres:
+    develop:
+      watch:
+        - `,
+			line:      5,
+			character: 10,
+			list: &protocol.CompletionList{
+				Items: []protocol.CompletionItem{
+					{
+						Label:            "action",
+						Detail:           types.CreateStringPointer("string"),
+						TextEdit:         textEdit("action: ${1|rebuild,restart,sync,sync+exec,sync+restart|}", 5, 10, 0),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+					},
+					{
+						Label:            "exec",
+						Detail:           types.CreateStringPointer("object"),
+						TextEdit:         textEdit("exec:\n            ", 5, 10, 0),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+					},
+					{
+						Label:            "ignore",
+						Detail:           types.CreateStringPointer("array or string"),
+						TextEdit:         textEdit("ignore:", 5, 10, 0),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+					},
+					{
+						Label:            "include",
+						Detail:           types.CreateStringPointer("array or string"),
+						TextEdit:         textEdit("include:", 5, 10, 0),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+					},
+					{
+						Label:            "path",
+						Detail:           types.CreateStringPointer("string"),
+						TextEdit:         textEdit("path: ", 5, 10, 0),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+					},
+					{
+						Label:            "target",
+						Detail:           types.CreateStringPointer("string"),
+						TextEdit:         textEdit("target: ", 5, 10, 0),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+					},
+				},
+			},
+		},
 		{
 			name: "inner attributes of the deploy/resources object under service",
 			content: `

internal/compose/schema.go

@@ -119,6 +119,7 @@ func recurseNodeProperties(nodes []*ast.MappingValueNode, line, column, nodeOffs
 					}
 				}
 			}
+			return recurseNodeProperties(nodes, line, column, nodeOffset+1, schema.Properties, true)
 		}
 
 		if nodes[nodeOffset].Key.GetToken().Position.Column < column {