Merge branch 'shengyfu-pr/842'

microsoft · Aug 7, 2019 · 8d7acab · 8d7acab
2 parents 7ef82fe + 4f4d94b
commit 8d7acab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs
@@ -55,10 +55,20 @@ public enum CompletionItemKind
 
     public class Command
     {
+        /// <summary>
+        /// Title of the command.
+        /// </summary>
+        public string Title { get; set; }
+
         /// <summary>
         /// The identifier of the actual command handler, like `vsintellicode.completionItemSelected`.
         /// </summary>
-        public string CommandStr { get; set; }
+        public string command { get; set; }
+
+        /// <summary>
+        /// A tooltip for the command, when represented in the UI.
+        /// </summary>
+        public string Tooltip { get; set; }
 
         /// <summary>
         /// Arguments that the command handler should be invoked with.

diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/LanguageServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/LanguageServiceTests.cs
@@ -186,7 +186,7 @@ public async void AutoCompleteWithExtension()
                 //Validate the first completion item in the list is preselected
                 Assert.True(completions[0].Preselect.HasValue && completions[0].Preselect.Value, "Preselect is not set properly in the first completion item by the completion extension!");
                 //Validate the Command object attached to the completion item by the extension
-                Assert.True(completions[0].Command != null && completions[0].Command.CommandStr == "vsintellicode.completionItemSelected", "Command is not set properly in the first completion item by the completion extension!");
+                Assert.True(completions[0].Command != null && completions[0].Command.command == "vsintellicode.completionItemSelected", "Command is not set properly in the first completion item by the completion extension!");
             }
             finally
             {

diff --git a/test/Microsoft.SqlTools.Test.CompletionExtension/CompletionExt.cs b/test/Microsoft.SqlTools.Test.CompletionExtension/CompletionExt.cs
@@ -66,7 +66,7 @@ private async Task<CompletionItem[]> Run(CompletionItem[] completions, Cancellat
             {
                 item.Command = new Command
                 {
-                    CommandStr = "vsintellicode.completionItemSelected",
+                    command = "vsintellicode.completionItemSelected",
                     Arguments = new object[] { new Dictionary<string, string> { { "IsCommit", "True" } } }
                 };
             }