simplified completer quote escaping

Author: erwinvanhunen

src/Commands/Base/Completers/ContentTypeCompleter.cs

@@ -11,13 +11,13 @@ namespace PnP.PowerShell.Commands.Base.Completers
 {
     public sealed class ContentTypeCompleter : PnPArgumentCompleter
     {
-        public override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters, char quoteChar)
+        protected override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             IEnumerable<ContentType> result = PnPConnection.Current.Context.LoadQuery(PnPConnection.Current.Context.Web.AvailableContentTypes.Include(f => f.Name));
             PnPConnection.Current.Context.ExecuteQueryRetry();
             foreach (var ct in result.Where(l => l.Name.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
-                yield return new CompletionResult($"{quoteChar}{ct.Name}{quoteChar}");
+                yield return new CompletionResult(ct.Name);
             }
         }
     }

src/Commands/Base/Completers/FieldInternalNameCompleter.cs

@@ -11,13 +11,13 @@ namespace PnP.PowerShell.Commands.Base.Completers
 {
     public sealed class FieldInternalNameCompleter : PnPArgumentCompleter
     {
-        public override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters, char quoteChar)
+        protected override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             IEnumerable<Field> result = PnPConnection.Current.Context.LoadQuery(PnPConnection.Current.Context.Web.AvailableFields.Include(f => f.InternalName));
             PnPConnection.Current.Context.ExecuteQueryRetry();
             foreach (var field in result.Where(l => l.InternalName.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
-                yield return new CompletionResult($"{quoteChar}{field.InternalName}{quoteChar}");
+                yield return new CompletionResult(field.InternalName);
             }
         }
     }

src/Commands/Base/Completers/ListNameCompleter.cs

@@ -10,18 +10,14 @@ namespace PnP.PowerShell.Commands.Base.Completers
 {
     public sealed class ListNameCompleter : PnPArgumentCompleter
     {
-        public override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters, char quoteChar)
+        protected override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             IEnumerable<List> result = PnPConnection.Current.Context.LoadQuery(PnPConnection.Current.Context.Web.Lists.Include(list => list.Title));
             PnPConnection.Current.Context.ExecuteQueryRetry();
             foreach (var list in result.Where(l => l.Title.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
-                var listTitle = list.Title;
-                if(quoteChar == '"')
-                {
-                   listTitle = list.Title.Replace("\"","`\"");
-                }
-                yield return new CompletionResult($"{quoteChar}{listTitle}{quoteChar}");
+                yield return new CompletionResult(list.Title);
+              
             }
 
         }

src/Commands/Base/Completers/PageCompleter.cs

@@ -16,15 +16,15 @@ namespace PnP.PowerShell.Commands.Base.Completers
 {
     public sealed class PageCompleter : PnPArgumentCompleter
     {
-        public override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters, char quoteChar)
+        protected override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             List<CompletionResult> results = new List<CompletionResult>();
             wordToComplete = wordToComplete.Replace('\\', '/');
             var pages = PnPConnection.Current.PnPContext.Web.GetPages(wordToComplete.TrimStart('/'));
             foreach (var page in pages.OrderBy(p => p.Name))
             {
                 var result = string.IsNullOrEmpty(page.Folder) ? page.Name : page.Folder + "/" + page.Name;
-                results.Add(new CompletionResult($"{quoteChar}{result}{quoteChar}"));
+                results.Add(new CompletionResult(result));
             }
             return results;
         }

src/Commands/Base/Completers/PnPArgumentCompleter.cs

@@ -18,11 +18,27 @@ public IEnumerable<CompletionResult> CompleteArgument(string commandName, string
             quoteChar = '\'';
         }
         wordToComplete = wordToComplete.Trim(['"', '\'']);
-        var task = Task.Run(() => GetArguments(commandName, parameterName, wordToComplete, commandAst, fakeBoundParameters, quoteChar));
-        return task.TimeoutAfter(TimeSpan.FromMilliseconds(GetTimeOut())).GetAwaiter().GetResult();
+        var task = Task.Run(() => GetArguments(commandName, parameterName, wordToComplete, commandAst, fakeBoundParameters));
+        
+        var results = task.TimeoutAfter(TimeSpan.FromMilliseconds(GetTimeOut())).GetAwaiter().GetResult();
+        foreach(var result in results)
+        {
+            var completionText = result.CompletionText;
+            if(quoteChar == '"')
+            {
+                  completionText = completionText.Replace("\"","`\"");
+            } else if(quoteChar == '\'')
+            {
+                completionText = completionText.Replace("'","`'");
+            }
+            yield return new CompletionResult($"{quoteChar}{completionText}{quoteChar}",result.ListItemText,result.ResultType,result.ToolTip);
+        }
     }
 
-    public abstract IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters, char quoteChar);
+    protected virtual IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
+    {
+        return null;
+    }
 
     private Int32 GetTimeOut()
     {

src/Commands/Base/Completers/PropertyBagKeyCompleter.cs

@@ -12,7 +12,7 @@ namespace PnP.PowerShell.Commands.Base.Completers
 {
     public sealed class PropertyBagKeyCompleter : PnPArgumentCompleter
     {
-        public override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters, char quoteChar)
+        protected override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             IEnumerable<string> keys = null;
             if (fakeBoundParameters["Folder"] == null)
@@ -36,7 +36,7 @@ public override IEnumerable<CompletionResult> GetArguments(string commandName, s
 
             foreach (var key in keys.Where(k => k.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
-                yield return new CompletionResult($"{quoteChar}{key}{quoteChar}");
+                yield return new CompletionResult(key);
             }
         }
     }