Expanding Completion of objects & arrays to multiple lines (#1012)

Fixes #792
Azure · Nov 26, 2020 · c02b8c4 · c02b8c4
1 parent f2f9111
commit c02b8c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Bicep.Core.Samples/Files/Completions/object.json b/src/Bicep.Core.Samples/Files/Completions/object.json
@@ -7,10 +7,10 @@
     "preselect": true,
     "sortText": "1_{}",
     "insertTextFormat": "snippet",
-    "insertTextMode": "asIs",
+    "insertTextMode": "adjustIndentation",
     "textEdit": {
       "range": {},
-      "newText": "{$0}"
+      "newText": "{\n\t$0\n}"
     }
   }
 ]
diff --git a/src/Bicep.Core.Samples/Files/InvalidResources_CRLF/Completions/arrayPlusSymbols.json b/src/Bicep.Core.Samples/Files/InvalidResources_CRLF/Completions/arrayPlusSymbols.json
@@ -7,10 +7,10 @@
     "preselect": true,
     "sortText": "1_[]",
     "insertTextFormat": "snippet",
-    "insertTextMode": "asIs",
+    "insertTextMode": "adjustIndentation",
     "textEdit": {
       "range": {},
-      "newText": "[$0]"
+      "newText": "[\n\t$0\n]"
     }
   },
   {

diff --git a/src/Bicep.Core.Samples/Files/InvalidResources_CRLF/Completions/objectPlusSymbols.json b/src/Bicep.Core.Samples/Files/InvalidResources_CRLF/Completions/objectPlusSymbols.json
@@ -1477,10 +1477,10 @@
     "preselect": true,
     "sortText": "1_{}",
     "insertTextFormat": "snippet",
-    "insertTextMode": "asIs",
+    "insertTextMode": "adjustIndentation",
     "textEdit": {
       "range": {},
-      "newText": "{$0}"
+      "newText": "{\n\t$0\n}"
     }
   }
 ]
diff --git a/src/Bicep.LangServer/Completions/BicepCompletionProvider.cs b/src/Bicep.LangServer/Completions/BicepCompletionProvider.cs
@@ -395,7 +395,7 @@ private static IEnumerable<CompletionItem> GetValueCompletionsForType(TypeSymbol
                     const string arrayLabel = "[]";
                     yield return CompletionItemBuilder.Create(CompletionItemKind.Value)
                         .WithLabel(arrayLabel)
-                        .WithSnippetEdit(replacementRange, "[$0]")
+                        .WithSnippetEdit(replacementRange, "[\n\t$0\n]", InsertTextMode.AdjustIndentation)
                         .WithDetail(arrayLabel)
                         .Preselect()
                         .WithSortText(GetSortText(arrayLabel, CompletionPriority.High));
@@ -423,7 +423,7 @@ private static CompletionItem CreateObjectBodyCompletion(Range replacementRange)
             const string objectLabel = "{}";
             return CompletionItemBuilder.Create(CompletionItemKind.Value)
                 .WithLabel(objectLabel)
-                .WithSnippetEdit(replacementRange, "{$0}")
+                .WithSnippetEdit(replacementRange, "{\n\t$0\n}", InsertTextMode.AdjustIndentation)
                 .WithDetail(objectLabel)
                 .Preselect()
                 .WithSortText(GetSortText(objectLabel, CompletionPriority.High));