feat(completion): quote labels when necessary

pkg/server/completion.go

@@ -43,7 +43,7 @@ func (s *Server) Completion(_ context.Context, params *protocol.CompletionParams
 
 	vm := s.getVM(doc.item.URI.SpanURI().Filename())
 
-	items := s.completionFromStack(line, searchStack, vm)
+	items := s.completionFromStack(line, searchStack, vm, params.Position)
 	return &protocol.CompletionList{IsIncomplete: false, Items: items}, nil
 }
 
@@ -57,7 +57,7 @@ func getCompletionLine(fileContent string, position protocol.Position) string {
 	return line
 }
 
-func (s *Server) completionFromStack(line string, stack *nodestack.NodeStack, vm *jsonnet.VM) []protocol.CompletionItem {
+func (s *Server) completionFromStack(line string, stack *nodestack.NodeStack, vm *jsonnet.VM, position protocol.Position) []protocol.CompletionItem {
 	lineWords := strings.Split(line, " ")
 	lastWord := lineWords[len(lineWords)-1]
 	lastWord = strings.TrimRight(lastWord, ",;") // Ignore trailing commas and semicolons, they can present when someone is modifying an existing line
@@ -76,7 +76,7 @@ func (s *Server) completionFromStack(line string, stack *nodestack.NodeStack, vm
 						continue
 					}
 
-					items = append(items, createCompletionItem(label, label, protocol.VariableCompletion, bind.Body))
+					items = append(items, createCompletionItem(label, "", protocol.VariableCompletion, bind.Body, position))
 				}
 			}
 		}
@@ -90,7 +90,7 @@ func (s *Server) completionFromStack(line string, stack *nodestack.NodeStack, vm
 	}
 
 	completionPrefix := strings.Join(indexes[:len(indexes)-1], ".")
-	return createCompletionItemsFromRanges(ranges, completionPrefix, line)
+	return createCompletionItemsFromRanges(ranges, completionPrefix, line, position)
 }
 
 func (s *Server) completionStdLib(line string) []protocol.CompletionItem {
@@ -132,7 +132,7 @@ func (s *Server) completionStdLib(line string) []protocol.CompletionItem {
 	return items
 }
 
-func createCompletionItemsFromRanges(ranges []processing.ObjectRange, completionPrefix, currentLine string) []protocol.CompletionItem {
+func createCompletionItemsFromRanges(ranges []processing.ObjectRange, completionPrefix, currentLine string, position protocol.Position) []protocol.CompletionItem {
 	var items []protocol.CompletionItem
 	labels := make(map[string]bool)
 
@@ -152,7 +152,7 @@ func createCompletionItemsFromRanges(ranges []processing.ObjectRange, completion
 			continue
 		}
 
-		items = append(items, createCompletionItem(label, completionPrefix+"."+label, protocol.FieldCompletion, field.Node))
+		items = append(items, createCompletionItem(label, completionPrefix, protocol.FieldCompletion, field.Node, position))
 		labels[label] = true
 	}
 
@@ -163,8 +163,20 @@ func createCompletionItemsFromRanges(ranges []processing.ObjectRange, completion
 	return items
 }
 
-func createCompletionItem(label, detail string, kind protocol.CompletionItemKind, body ast.Node) protocol.CompletionItem {
+func createCompletionItem(label, prefix string, kind protocol.CompletionItemKind, body ast.Node, position protocol.Position) protocol.CompletionItem {
+	runes := []rune(label)
+	mustQuoteLabel := !(hasOnlyLetter(runes[0:1]) && len(runes) > 1 && hasOnlyLettersAndNumber(runes[1:]))
+
 	insertText := label
+	detail := label
+	if prefix != "" {
+		detail = prefix + "." + insertText
+	}
+	if mustQuoteLabel {
+		insertText = "['" + label + "']"
+		detail = prefix + insertText
+	}
+
 	if asFunc, ok := body.(*ast.Function); ok {
 		kind = protocol.FunctionCompletion
 		params := []string{}
@@ -176,7 +188,7 @@ func createCompletionItem(label, detail string, kind protocol.CompletionItemKind
 		insertText += paramsString
 	}
 
-	return protocol.CompletionItem{
+	item := protocol.CompletionItem{
 		Label:  label,
 		Detail: detail,
 		Kind:   kind,
@@ -185,6 +197,42 @@ func createCompletionItem(label, detail string, kind protocol.CompletionItemKind
 		},
 		InsertText: insertText,
 	}
+
+	// Remove leading `.` character when quoting label
+	if mustQuoteLabel {
+		item.TextEdit = &protocol.TextEdit{
+			Range: protocol.Range{
+				Start: protocol.Position{
+					Line:      position.Line,
+					Character: position.Character - 1,
+				},
+				End: protocol.Position{
+					Line:      position.Line,
+					Character: position.Character,
+				},
+			},
+			NewText: insertText,
+		}
+	}
+
+	return item
+}
+
+func hasOnlyLetter(s []rune) bool {
+	for _, c := range s {
+		if (c < 'a' || c > 'z') && (c < 'A' || c > 'Z') {
+			return false
+		}
+	}
+	return true
+}
+func hasOnlyLettersAndNumber(s []rune) bool {
+	for _, c := range s {
+		if (c < 'a' || c > 'z') && (c < 'A' || c > 'Z') && (c < '0' || c > '9') {
+			return false
+		}
+	}
+	return true
 }
 
 func typeToString(t ast.Node) string {

pkg/server/completion_test.go

@@ -586,6 +586,83 @@ func TestCompletion(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:            "quote label",
+			filename:        "testdata/quote_label.jsonnet",
+			replaceString:   "lib",
+			replaceByString: "lib.",
+			expected: protocol.CompletionList{
+				IsIncomplete: false,
+				Items: []protocol.CompletionItem{
+					{
+						Label:      "1num",
+						Kind:       protocol.FieldCompletion,
+						Detail:     "lib['1num']",
+						InsertText: "['1num']",
+						LabelDetails: protocol.CompletionItemLabelDetails{
+							Description: "string",
+						},
+						TextEdit: &protocol.TextEdit{
+							Range: protocol.Range{
+								Start: protocol.Position{
+									Line:      0,
+									Character: 9,
+								},
+								End: protocol.Position{
+									Line:      0,
+									Character: 10,
+								},
+							},
+							NewText: "['1num']",
+						},
+					},
+					{
+						Label:      "abc#func",
+						Kind:       protocol.FunctionCompletion,
+						Detail:     "lib['abc#func'](param)",
+						InsertText: "['abc#func'](param)",
+						LabelDetails: protocol.CompletionItemLabelDetails{
+							Description: "function",
+						},
+						TextEdit: &protocol.TextEdit{
+							Range: protocol.Range{
+								Start: protocol.Position{
+									Line:      0,
+									Character: 9,
+								},
+								End: protocol.Position{
+									Line:      0,
+									Character: 10,
+								},
+							},
+							NewText: "['abc#func'](param)",
+						},
+					},
+					{
+						Label:      "abc#var",
+						Kind:       protocol.FieldCompletion,
+						Detail:     "lib['abc#var']",
+						InsertText: "['abc#var']",
+						LabelDetails: protocol.CompletionItemLabelDetails{
+							Description: "string",
+						},
+						TextEdit: &protocol.TextEdit{
+							Range: protocol.Range{
+								Start: protocol.Position{
+									Line:      0,
+									Character: 9,
+								},
+								End: protocol.Position{
+									Line:      0,
+									Character: 10,
+								},
+							},
+							NewText: "['abc#var']",
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

pkg/server/testdata/quote_label.jsonnet

@@ -0,0 +1,7 @@
+local lib = {
+  '1num': 'val',
+  'abc#func'(param=1): param,
+  'abc#var': 'val',
+};
+
+lib