Merge pull request #144 from docker/highlighting-long-form-services

Support highlighting of the long form syntax for services in depends_on

Author: rcjsuen

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to the Docker Language Server will be documented in this fil
     - suggest dependent secret names for the `secrets` attribute ([#135](https://github.com/docker/docker-language-server/issues/135))
   - textDocument/documentHighlight
     - support highlighting the short form `depends_on` syntax for services ([#70](https://github.com/docker/docker-language-server/issues/70))
+    - support highlighting the long form `depends_on` syntax for services ([#71](https://github.com/docker/docker-language-server/issues/71))
 
 ### Fixed
 

internal/compose/documentHighlight.go

@@ -18,6 +18,12 @@ func serviceReferences(node *ast.MappingValueNode, dependencyAttributeName strin
 							for _, service := range sequenceNode.Values {
 								tokens = append(tokens, service.GetToken())
 							}
+						} else if dependentService, ok := attributeNode.Value.(*ast.StringNode); ok {
+							tokens = append(tokens, dependentService.GetToken())
+						} else if mappingNode, ok := attributeNode.Value.(*ast.MappingNode); ok {
+							for _, dependentService := range mappingNode.Values {
+								tokens = append(tokens, dependentService.Key.GetToken())
+							}
 						}
 					}
 				}

internal/compose/documentHighlight_test.go

@@ -45,6 +45,33 @@ services:
 				documentHighlight(4, 8, 4, 13, protocol.DocumentHighlightKindRead),
 			},
 		},
+		{
+			name: "read highlight on an undefined service object with no properties",
+			content: `
+services:
+  test:
+    depends_on:
+      test2:`,
+			line:      4,
+			character: 9,
+			ranges: []protocol.DocumentHighlight{
+				documentHighlight(4, 6, 4, 11, protocol.DocumentHighlightKindRead),
+			},
+		},
+		{
+			name: "read highlight on an undefined service object with properties",
+			content: `
+services:
+  test:
+    depends_on:
+      test2:
+        condition: service_started`,
+			line:      4,
+			character: 9,
+			ranges: []protocol.DocumentHighlight{
+				documentHighlight(4, 6, 4, 11, protocol.DocumentHighlightKindRead),
+			},
+		},
 		{
 			name: "cursor not on anything meaningful",
 			content: `