Merge pull request #116 from docker/compose-spacing-bug-fix

Fix spacing issue in Compose completions

Author: rcjsuen

CHANGELOG.md

@@ -7,6 +7,8 @@ All notable changes to the Docker Language Server will be documented in this fil
 ### Fixed
 
 - Compose
+  - textDocument/completion
+    - resolved a spacing offset issue with object or array completions ([#115](https://github.com/docker/docker-language-server/issues/115))
   - textDocument/hover
     - return the hover results for Compose files
 

internal/compose/completion.go

@@ -77,8 +77,8 @@ func Completion(ctx context.Context, params *protocol.CompletionParams, doc docu
 	} else if properties, ok := nodeProps.(map[string]*jsonschema.Schema); ok {
 		sb := strings.Builder{}
 		for i := range lines[lspLine] {
-			if unicode.IsSpace(rune(lines[lspLine][i])) {
-				sb.WriteString(string(lines[lspLine][i]))
+			if unicode.IsSpace(rune(lines[lspLine][i])) || lines[lspLine][i] == '-' {
+				sb.WriteString(" ")
 			}
 		}
 		sb.WriteString("  ")

internal/compose/completion_test.go

@@ -1399,6 +1399,76 @@ services:
 				Items: serviceProperties,
 			},
 		},
+		{
+			name: "properties of a volumes array item with no content",
+			content: `
+services:
+  test:
+    image: alpine
+    volumes:
+      - `,
+			line:      5,
+			character: 8,
+			list: &protocol.CompletionList{
+				Items: []protocol.CompletionItem{
+					{
+						Label:          "bind",
+						Detail:         types.CreateStringPointer("object"),
+						InsertText:     types.CreateStringPointer("bind:\n          "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "consistency",
+						Detail:         types.CreateStringPointer("string"),
+						InsertText:     types.CreateStringPointer("consistency: "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "image",
+						Detail:         types.CreateStringPointer("object"),
+						InsertText:     types.CreateStringPointer("image:\n          "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "read_only",
+						Detail:         types.CreateStringPointer("boolean or string"),
+						InsertText:     types.CreateStringPointer("read_only: "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "source",
+						Detail:         types.CreateStringPointer("string"),
+						InsertText:     types.CreateStringPointer("source: "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "target",
+						Detail:         types.CreateStringPointer("string"),
+						InsertText:     types.CreateStringPointer("target: "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "tmpfs",
+						Detail:         types.CreateStringPointer("object"),
+						InsertText:     types.CreateStringPointer("tmpfs:\n          "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:            "type",
+						Detail:           types.CreateStringPointer("string"),
+						InsertText:       types.CreateStringPointer("type: ${1|bind,cluster,image,npipe,tmpfs,volume|}"),
+						InsertTextFormat: types.CreateInsertTextFormatPointer(protocol.InsertTextFormatSnippet),
+						InsertTextMode:   types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+					{
+						Label:          "volume",
+						Detail:         types.CreateStringPointer("object"),
+						InsertText:     types.CreateStringPointer("volume:\n          "),
+						InsertTextMode: types.CreateInsertTextModePointer(protocol.InsertTextModeAsIs),
+					},
+				},
+			},
+		},
 		{
 			name: "properties of a volume array item's sibling attributes under a service object",
 			content: `