Merge pull request #7274 from dotnet/dev/alexgav/FixLspSnippets

Fixing snippets in new LSP completion

Author: alexgav

src/razor/src/completion/completionHandler.ts

@@ -10,6 +10,7 @@ import {
     CompletionParams,
     CompletionTriggerKind,
     InsertReplaceEdit,
+    InsertTextFormat,
     InsertTextMode,
     MarkupContent,
     Position,
@@ -344,6 +345,7 @@ export class CompletionHandler {
                 documentation: CompletionHandler.toMarkupContent(completionItem.documentation),
                 filterText: completionItem.filterText,
                 insertText: CompletionHandler.toLspInsertText(completionItem.insertText),
+                insertTextFormat: CompletionHandler.toLspInsertTextFormat(completionItem.insertText),
                 insertTextMode: CompletionHandler.toInsertTextMode(completionItem.keepWhitespace),
                 kind: completionItem.kind ? completionItem.kind + 1 : completionItem.kind, // VSCode and LSP are off by one
                 label: CompletionHandler.toLspCompletionItemLabel(completionItem.label),
@@ -390,6 +392,19 @@ export class CompletionHandler {
         return snippetString?.value ?? <string | undefined>insertText;
     }
 
+    private static toLspInsertTextFormat(insertText?: string | vscode.SnippetString): InsertTextFormat {
+        return insertText instanceof vscode.SnippetString ? InsertTextFormat.Snippet : InsertTextFormat.PlainText;
+    }
+
+    private static toInsertTextMode(keepWhitespace?: boolean): InsertTextMode | undefined {
+        if (keepWhitespace === undefined) {
+            return undefined;
+        }
+
+        const insertTextMode: InsertTextMode = keepWhitespace ? InsertTextMode.asIs : InsertTextMode.adjustIndentation;
+        return insertTextMode;
+    }
+
     private static toLspTextEdit(
         newText?: string,
         range?: vscode.Range | { inserting: vscode.Range; replacing: vscode.Range }
@@ -448,13 +463,4 @@ export class CompletionHandler {
 
         return lspPosition;
     }
-
-    private static toInsertTextMode(keepWhitespace?: boolean): InsertTextMode | undefined {
-        if (keepWhitespace === undefined) {
-            return undefined;
-        }
-
-        const insertTextMode: InsertTextMode = keepWhitespace ? InsertTextMode.asIs : InsertTextMode.adjustIndentation;
-        return insertTextMode;
-    }
 }