Merge pull request #364 from PowerShell/rkeithhill/add-completionitemkind-folder

Add CompletionItemKind.Folder.

Author: daviwil

src/PowerShellEditorServices.Protocol/LanguageServer/Completion.cs

@@ -41,11 +41,12 @@ public enum CompletionItemKind
             Snippet = 15,
             Color = 16,
             File = 17,
-            Reference = 18
+            Reference = 18,
+            Folder = 19
     }
 
     [DebuggerDisplay("NewText = {NewText}, Range = {Range.Start.Line}:{Range.Start.Character} - {Range.End.Line}:{Range.End.Character}")]
-    public class TextEdit 
+    public class TextEdit
     {
         public Range Range { get; set; }
 

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -1366,9 +1366,12 @@ private static CompletionItemKind MapCompletionKind(CompletionType completionTyp
                 case CompletionType.ParameterName:
                     return CompletionItemKind.Variable;
 
-                case CompletionType.Path:
+                case CompletionType.File:
                     return CompletionItemKind.File;
 
+                case CompletionType.Folder:
+                    return CompletionItemKind.Folder;
+
                 default:
                     return CompletionItemKind.Text;
             }

src/PowerShellEditorServices/Language/CompletionResults.cs

@@ -20,7 +20,7 @@ public sealed class CompletionResults
         #region Properties
 
         /// <summary>
-        /// Gets the completions that were found during the 
+        /// Gets the completions that were found during the
         /// completion request.
         /// </summary>
         public CompletionDetails[] Completions { get; private set; }
@@ -141,9 +141,14 @@ public enum CompletionType
         Keyword,
 
         /// <summary>
-        /// Identifies a completion for a provider path (like a file system path).
+        /// Identifies a completion for a provider path (like a file system path) to a leaf item.
         /// </summary>
-        Path
+        File,
+
+        /// <summary>
+        /// Identifies a completion for a provider path (like a file system path) to a container.
+        /// </summary>
+        Folder
     }
 
     /// <summary>
@@ -204,7 +209,7 @@ internal static CompletionDetails Create(CompletionResult completionResult)
                 ListItemText = completionResult.ListItemText,
                 ToolTipText = toolTipText,
                 SymbolTypeName = ExtractSymbolTypeNameFromToolTip(completionResult.ToolTip),
-                CompletionType = 
+                CompletionType =
                     ConvertCompletionResultType(
                         completionResult.ResultType)
             };
@@ -306,8 +311,10 @@ private static CompletionType ConvertCompletionResultType(
 #endif
 
                 case CompletionResultType.ProviderContainer:
+                    return CompletionType.Folder;
+
                 case CompletionResultType.ProviderItem:
-                    return CompletionType.Path;
+                    return CompletionType.File;
 
                 default:
                     // TODO: Trace the unsupported CompletionResultType
@@ -322,7 +329,7 @@ private static string ExtractSymbolTypeNameFromToolTip(string toolTipText)
             var matches = Regex.Matches(toolTipText, @"^\[(.+)\]");
 
             if (matches.Count > 0 && matches[0].Groups.Count > 1)
-            {         
+            {
                 // Return the symbol type name
                 return matches[0].Groups[1].Value;
             }