Rebase from main

src/Bicep.Core.Samples/Files/Completions/moduleObject.json

@@ -83,6 +83,17 @@
     "textEdit": {
       "range": {},
       "newText": "{\n\t$0\n}"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "{}"
+          },
+          "EventName": "ModuleBodySnippetInsertion"
+        }
+      ]
     }
   }
 ]

src/Bicep.Core.Samples/Files/Completions/resourceObject.json

@@ -67,24 +67,6 @@
       "newText": "if (${1:condition}) {\n\t$0\n}"
     }
   },
-  {
-    "label": "snippet",
-    "kind": "snippet",
-    "detail": "Web Deploy for a Web Application",
-    "documentation": {
-      "kind": "markdown",
-      "value": "```bicep\n\n\n```"
-    },
-    "deprecated": false,
-    "preselect": true,
-    "sortText": "2_snippet",
-    "insertTextFormat": "snippet",
-    "insertTextMode": "adjustIndentation",
-    "textEdit": {
-      "range": {},
-      "newText": "\n"
-    }
-  },
   {
     "label": "{}",
     "kind": "snippet",
@@ -101,6 +83,18 @@
     "textEdit": {
       "range": {},
       "newText": "{\n\t$0\n}"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "{}",
+            "type": "error"
+          },
+          "EventName": "ResourceBodySnippetInsertion"
+        }
+      ]
     }
   }
 ]

src/Bicep.Core.Samples/Files/InvalidModules_LF/Completions/moduleBodyCompletions.json

@@ -83,6 +83,17 @@
     "textEdit": {
       "range": {},
       "newText": "{\n\tname: $1\n\tparams: {\n\t\tarrayParam: $2\n\t\tobjParam: {\n\t\t}\n\t\tstringParamB: $3\n\t}\n\t$0\n}"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "required-properties"
+          },
+          "EventName": "ModuleBodySnippetInsertion"
+        }
+      ]
     }
   },
   {
@@ -101,6 +112,17 @@
     "textEdit": {
       "range": {},
       "newText": "{\n\t$0\n}"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "{}"
+          },
+          "EventName": "ModuleBodySnippetInsertion"
+        }
+      ]
     }
   }
 ]

src/Bicep.Core.Samples/Files/InvalidResources_CRLF/Completions/objectPlusFor.json

@@ -83,6 +83,18 @@
     "textEdit": {
       "range": {},
       "newText": "{\n\tname: $1\n\tlocation: $2\n\t$0\n}"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "required-properties",
+            "type": "Microsoft.Network/dnsZones@2018-05-01"
+          },
+          "EventName": "ResourceBodySnippetInsertion"
+        }
+      ]
     }
   },
   {
@@ -101,6 +113,18 @@
     "textEdit": {
       "range": {},
       "newText": "{\n  name: ${2:'name'}\n  location: 'global'\n}\n"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "snippet",
+            "type": "Microsoft.Network/dnsZones@2018-05-01"
+          },
+          "EventName": "ResourceBodySnippetInsertion"
+        }
+      ]
     }
   },
   {
@@ -119,6 +143,18 @@
     "textEdit": {
       "range": {},
       "newText": "{\n\t$0\n}"
+    },
+    "command": {
+      "command": "bicep.Telemetry",
+      "arguments": [
+        {
+          "Properties": {
+            "name": "{}",
+            "type": "Microsoft.Network/dnsZones@2018-05-01"
+          },
+          "EventName": "ResourceBodySnippetInsertion"
+        }
+      ]
     }
   }
 ]

src/Bicep.LangServer.IntegrationTests/TelemetryTests.cs

@@ -35,9 +35,11 @@ public async Task VerifyTopLevelDeclarationSnippetInsertionFiresTelemetryEvent()
             var telemetryReceived = new TaskCompletionSource<TelemetryEventParams>();
 
             var client = await IntegrationTestHelper.StartServerWithClientConnectionAsync(
-                options => options.OnTelemetryEvent(telemetry => {
-                    telemetryReceived.SetResult(telemetry);
-                }),
+                TestContext,
+                options => 
+                {
+                    options.OnTelemetryEvent(telemetry => telemetryReceived.SetResult(telemetry));
+                },
                 fileResolver: new InMemoryFileResolver(fileSystemDict));
 
             var mainUri = DocumentUri.FromFileSystemPath("/main.bicep");
@@ -67,11 +69,11 @@ public async Task VerifyTopLevelDeclarationSnippetInsertionFiresTelemetryEvent()
 
             TelemetryEventParams telemetryEventParams = await IntegrationTestHelper.WithTimeoutAsync(telemetryReceived.Task);
 
-            telemetryEventParams.Data.Keys.Count.Should().Be(2);
-            telemetryEventParams.Data.Keys.Should().Contain("eventName");
-            telemetryEventParams.Data.Keys.Should().Contain("properties");
-            telemetryEventParams.Data["eventName"].ToString().Should().Be(TelemetryConstants.EventNames.TopLevelDeclarationSnippetInsertion);
-            telemetryEventParams.Data["properties"].ToString().Should().BeEquivalentToIgnoringNewlines(@"{
+            telemetryEventParams.ExtensionData.Keys.Count.Should().Be(2);
+            telemetryEventParams.ExtensionData.Keys.Should().Contain("eventName");
+            telemetryEventParams.ExtensionData.Keys.Should().Contain("properties");
+            telemetryEventParams.ExtensionData["eventName"].ToString().Should().Be(TelemetryConstants.EventNames.TopLevelDeclarationSnippetInsertion);
+            telemetryEventParams.ExtensionData["properties"].ToString().Should().BeEquivalentToIgnoringNewlines(@"{
   ""name"": ""res-aks-cluster""
 }");
         }

src/Bicep.LangServer/Completions/BicepCompletionProvider.cs

@@ -95,8 +95,8 @@ private IEnumerable<CompletionItem> GetDeclarationCompletions(BicepCompletionCon
                                                                    resourceSnippet.Detail,
                                                                    resourceSnippet.Text,
                                                                    context.ReplacementRange,
-                                                                   resourceSnippet.CompletionPriority)
-                        .WithCommand(command);
+                                                                   command,
+                                                                   resourceSnippet.CompletionPriority);
                 }
             }
 
@@ -416,9 +416,9 @@ private IEnumerable<CompletionItem> CreateResourceBodyCompletions(SemanticModel
                         snippet.Detail,
                         snippet.Text,
                         context.ReplacementRange,
+                        command,
                         snippet.CompletionPriority,
-                        preselect: true)
-                        .WithCommand(command);
+                        preselect: true);
                 }
             }
         }
@@ -433,19 +433,18 @@ private IEnumerable<CompletionItem> CreateModuleBodyCompletions(SemanticModel mo
                 foreach (Snippet snippet in snippets)
                 {
                     string prefix = snippet.Prefix;
-                    BicepTelemetryEvent telemetryEvent = BicepTelemetryEvent.Create(TelemetryConstants.EventNames.ResourceBodySnippetInsertion);
+                    BicepTelemetryEvent telemetryEvent = BicepTelemetryEvent.Create(TelemetryConstants.EventNames.ModuleBodySnippetInsertion);
                     telemetryEvent.Set("name", prefix);
-                    telemetryEvent.Set("type", typeSymbol.Name);
 
                     Command command = Command.Create(TelemetryConstants.CommandName, telemetryEvent);
 
                     yield return CreateContextualSnippetCompletion(prefix,
                         snippet.Detail,
                         snippet.Text,
                         context.ReplacementRange,
+                        command,
                         snippet.CompletionPriority,
-                        preselect: true)
-                        .WithCommand(command);
+                        preselect: true);
                 }
             }
         }
@@ -998,6 +997,19 @@ private static CompletionItem CreateContextualSnippetCompletion(string label, st
                 .Preselect(preselect)
                 .Build();
 
+        /// <summary>
+        /// Creates a completion with a contextual snippet with command option. This will look like a snippet to the user.
+        /// </summary>
+        private static CompletionItem CreateContextualSnippetCompletion(string label, string detail, string snippet, Range replacementRange, Command command, CompletionPriority priority = CompletionPriority.Medium, bool preselect = false) =>
+            CompletionItemBuilder.Create(CompletionItemKind.Snippet, label)
+                .WithSnippetEdit(replacementRange, snippet)
+                .WithCommand(command)
+                .WithDetail(detail)
+                .WithDocumentation($"```bicep\n{new Snippet(snippet).FormatDocumentation()}\n```")
+                .WithSortText(GetSortText(label, priority))
+                .Preselect(preselect)
+                .Build();
+
         /// <summary>
         /// Creates a completion with a contextual snippet. This will look like a snippet to the user.
         /// </summary>

src/Bicep.LangServer/Handlers/BicepTelemetryHandler.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Bicep.LanguageServer.Telemetry;
-using MediatR;
-using OmniSharp.Extensions.JsonRpc;
+using Newtonsoft.Json.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Workspace;
 
 namespace Bicep.LanguageServer.Handlers
@@ -20,16 +22,28 @@ public class BicepTelemetryHandler : ExecuteCommandHandlerBase<BicepTelemetryEve
     {
         private readonly ITelemetryProvider TelemetryProvider;
 
-        public BicepTelemetryHandler(ITelemetryProvider telemetryProvider, ISerializer serializer)
-            : base(TelemetryConstants.CommandName, serializer)
+        public BicepTelemetryHandler(ITelemetryProvider telemetryProvider)
         {
             TelemetryProvider = telemetryProvider;
         }
 
-        public override Task<Unit> Handle(BicepTelemetryEvent bicepTelemetryEvent, CancellationToken cancellationToken)
+        public override Task<BicepTelemetryEvent> Handle(ExecuteCommandParams<BicepTelemetryEvent> request, CancellationToken cancellationToken)
         {
-            TelemetryProvider.PostEvent(bicepTelemetryEvent);
-            return Unit.Task;
+            JArray? arguments = request.Arguments;
+            if (arguments is not null && arguments.Any() &&
+                arguments[0] is JToken jToken &&
+                jToken.ToObject<BicepTelemetryEvent>() is BicepTelemetryEvent telemetryEvent)
+            {
+                TelemetryProvider.PostEvent(telemetryEvent);
+                return Task.FromResult(telemetryEvent);
+            }
+
+            return Task.FromResult(BicepTelemetryEvent.Create(string.Empty));
         }
+
+        protected override ExecuteCommandRegistrationOptions CreateRegistrationOptions(ExecuteCommandCapability capability, ClientCapabilities clientCapabilities) => new()
+        {
+            Commands = new Container<string>(TelemetryConstants.CommandName)
+        };
     }
 }

src/Bicep.LangServer/Server.cs

@@ -17,8 +17,6 @@
 using Bicep.LanguageServer.Snippets;
 using Bicep.LanguageServer.Telemetry;
 using Microsoft.Extensions.DependencyInjection;
-using OmniSharp.Extensions.LanguageServer.Protocol.Client;
-using OmniSharp.Extensions.LanguageServer.Protocol.Window;
 using OmniSharp.Extensions.LanguageServer.Server;
 using OmnisharpLanguageServer = OmniSharp.Extensions.LanguageServer.Server.LanguageServer;
 
@@ -67,7 +65,6 @@ private Server(CreationOptions creationOptions, Action<LanguageServerOptions> on
                     .WithHandler<BicepDidChangeWatchedFilesHandler>()
                     .WithHandler<BicepSignatureHelpHandler>()
                     .WithHandler<BicepSemanticTokensHandler>()
-#pragma warning restore 0612
                     .WithHandler<BicepTelemetryHandler>()
                     .WithServices(services => RegisterServices(creationOptions, services));
 

src/Bicep.LangServer/Snippets/SnippetsProvider.cs

@@ -130,10 +130,12 @@ private void CacheResourceDeclarationAndDependencies(string template, string man
 
                 if (declaredSymbol.DeclaringSyntax is ResourceDeclarationSyntax resourceDeclarationSyntax)
                 {
-                    string type = declaredSymbol.Type.Name;
-
-                    CacheResourceDeclaration(resourceDeclarationSyntax, type, template, description);
-                    CacheResourceDependencies(kvp.Value, template, type);
+                   if (declaredSymbol.Type is TypeSymbol typeSymbol && typeSymbol.TypeKind != TypeKind.Error)
+                    {
+                        string type = typeSymbol.Name;
+                        CacheResourceDeclaration(resourceDeclarationSyntax, type, template, description);
+                        CacheResourceDependencies(kvp.Value, template, type);
+                    }
                 }
             }
         }

src/Bicep.LangServer/Telemetry/BicepTelemetryEvent.cs

@@ -6,7 +6,7 @@
 
 namespace Bicep.LanguageServer.Telemetry
 {
-    public class BicepTelemetryEvent : TelemetryEventParams
+    public record BicepTelemetryEvent : TelemetryEventParams
     {
         public Dictionary<string, string> Properties { get; set; } = new Dictionary<string, string>();