Refactored use of Context in completers

Author: erwinvanhunen

src/Commands/Base/Completers/ContentTypeCompleter.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using System.Reflection.Metadata;
 using Microsoft.SharePoint.Client;
 
 namespace PnP.PowerShell.Commands.Base.Completers
@@ -13,8 +12,8 @@ public sealed class ContentTypeCompleter : PnPArgumentCompleter
     {
         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();
+            IEnumerable<ContentType> result = ClientContext.LoadQuery(ClientContext.Web.AvailableContentTypes.Include(f => f.Name));
+            ClientContext.ExecuteQueryRetry();
             foreach (var ct in result.Where(l => l.Name.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
                 yield return new CompletionResult(ct.Name);

src/Commands/Base/Completers/FieldInternalNameCompleter.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using System.Reflection.Metadata;
 using Microsoft.SharePoint.Client;
 
 namespace PnP.PowerShell.Commands.Base.Completers
@@ -13,8 +12,8 @@ public sealed class FieldInternalNameCompleter : PnPArgumentCompleter
     {
         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();
+            IEnumerable<Field> result = ClientContext.LoadQuery(PnPConnection.Current.Context.Web.AvailableFields.Include(f => f.InternalName));
+            ClientContext.ExecuteQueryRetry();
             foreach (var field in result.Where(l => l.InternalName.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
                 yield return new CompletionResult(field.InternalName);

src/Commands/Base/Completers/ListNameCompleter.cs

@@ -5,8 +5,6 @@
 using System.Management.Automation;
 using System.Management.Automation.Language;
 using Microsoft.SharePoint.Client;
-using PnP.Framework.Extensions;
-using PnP.Framework.Provisioning.Model.Drive;
 
 namespace PnP.PowerShell.Commands.Base.Completers
 {
@@ -15,8 +13,8 @@ public sealed class ListNameCompleter : PnPArgumentCompleter
         protected override IEnumerable<CompletionResult> GetArguments(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             List<CompletionResult> arguments = new List<CompletionResult>();
-            IEnumerable<List> result = PnPConnection.Current.Context.LoadQuery(PnPConnection.Current.Context.Web.Lists.Include(list => list.Title, list => list.RootFolder.Name));
-            PnPConnection.Current.Context.ExecuteQueryRetry();
+            IEnumerable<List> result = ClientContext.LoadQuery(ClientContext.Web.Lists.Include(list => list.Title, list => list.RootFolder.Name));
+            ClientContext.ExecuteQueryRetry();
             foreach (var list in result.Where(l => l.Title.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase) || l.RootFolder.Name.StartsWith(wordToComplete, StringComparison.InvariantCultureIgnoreCase)))
             {
                 if (list.RootFolder.Name != list.Title)

src/Commands/Base/Completers/PageCompleter.cs

@@ -12,7 +12,7 @@ protected override IEnumerable<CompletionResult> GetArguments(string commandName
         {
             List<CompletionResult> results = new List<CompletionResult>();
             wordToComplete = wordToComplete.Replace('\\', '/');
-            var pages = PnPConnection.Current.PnPContext.Web.GetPages(wordToComplete.TrimStart('/'));
+            var pages = 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;

src/Commands/Base/Completers/PnPArgumentCompleter.cs

@@ -1,14 +1,21 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.SharePoint.Client;
+using PnP.Core.Services;
+using PnP.PowerShell.Commands.Base;
 using PnP.PowerShell.Commands.Extensions;
 
 public abstract class PnPArgumentCompleter : IArgumentCompleter
 {
+    public Microsoft.SharePoint.Client.ClientContext ClientContext => PnPConnection.Current.Context;
+
+    public PnP.Core.Services.PnPContext PnPContext => PnPConnection.Current.PnPContext;
+
     private const int Timeout = 2000;
     public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
     {

src/Commands/Base/Completers/PropertyBagKeyCompleter.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using System.Reflection.Metadata;
 using Microsoft.SharePoint.Client;
 using PnP.Framework.Utilities;
 
@@ -17,17 +16,17 @@ protected override IEnumerable<CompletionResult> GetArguments(string commandName
             IEnumerable<string> keys = null;
             if (fakeBoundParameters["Folder"] == null)
             {
-                PnPConnection.Current.Context.Web.EnsureProperty(w => w.AllProperties);
+                ClientContext.Web.EnsureProperty(w => w.AllProperties);
 
-                keys = PnPConnection.Current.Context.Web.AllProperties.FieldValues.Select(x => x.Key);
+                keys = ClientContext.Web.AllProperties.FieldValues.Select(x => x.Key);
             }
             else
             {
                 var folderName = fakeBoundParameters["Folder"] as string;
-                PnPConnection.Current.Context.Web.EnsureProperty(w => w.ServerRelativeUrl);
+                ClientContext.Web.EnsureProperty(w => w.ServerRelativeUrl);
 
-                var folderUrl = UrlUtility.Combine(PnPConnection.Current.Context.Web.ServerRelativeUrl, folderName);
-                var folder = PnPConnection.Current.Context.Web.GetFolderByServerRelativePath(ResourcePath.FromDecodedUrl(folderUrl));
+                var folderUrl = UrlUtility.Combine(ClientContext.Web.ServerRelativeUrl, folderName);
+                var folder = ClientContext.Web.GetFolderByServerRelativePath(ResourcePath.FromDecodedUrl(folderUrl));
                 folder.EnsureProperty(f => f.Properties);
 
                 keys = folder.Properties.FieldValues.Select(x => x.Key);