Fix more breaking changes (#60)

* Fix more breaking changes

Also add case type setting to splat refactor

* fix for PowerShell preview 3+

Author: SeeminglyScience

module/EditorServicesCommandSuite.psd1

@@ -92,7 +92,7 @@ PrivateData = @{
 '@
 
         # Prerelease string of this module
-        Prerelease = 'beta2'
+        Prerelease = 'beta3'
 
     } # End of PSData hashtable
 

module/EditorServicesCommandSuite.psm1

@@ -4,11 +4,11 @@ Update-FormatData -AppendPath $PSScriptRoot/EditorServicesCommandSuite.format.ps
 
 if ($null -ne $psEditor) {
     if ($PSVersionTable.PSVersion.Major -ge 6) {
-        $extensionService = [Microsoft.PowerShell.EditorServices.Extensions.EditorObjectExtensions, Microsoft.PowerShell.EditorServices]::
-            GetExtensionServiceProvider($psEditor)
+        $psesAlc = [System.Runtime.Loader.AssemblyLoadContext]::GetLoadContext(
+            [Microsoft.PowerShell.EditorServices.Extensions.EditorObjectExtensions, Microsoft.PowerShell.EditorServices].Assembly)
 
-        $assembly = $extensionService.LoadAssemblyInPsesLoadContext((
-            Join-Path $PSScriptRoot -ChildPath 'EditorServicesCommandSuite.EditorServices.dll'))
+        $assembly = $psesAlc.LoadFromAssemblyPath((
+            Join-Path $PSScriptRoot -ChildPath EditorServicesCommandSuite.EditorServices.dll))
 
         $type = $assembly.GetType('EditorServicesCommandSuite.EditorServices.Internal.CommandSuite')
     } else {

src/EditorServicesCommandSuite.Common.props

@@ -12,7 +12,7 @@
   <ItemGroup>
     <AdditionalFiles Include="..\EditorServicesCommandSuite\stylecop.json" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-04" PrivateAssets="All" />

src/EditorServicesCommandSuite.EditorServices/DocumentService.cs

@@ -8,6 +8,7 @@
 using EditorServicesCommandSuite.Internal;
 using Microsoft.PowerShell.EditorServices.Extensions;
 using Microsoft.PowerShell.EditorServices.Extensions.Services;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace EditorServicesCommandSuite.EditorServices
@@ -76,7 +77,7 @@ public async Task WriteDocumentEditsAsync(IEnumerable<DocumentEdit> edits, Cance
 
                 var versionedIdentifier = new VersionedTextDocumentIdentifier
                 {
-                    Uri = editGroup.Key ?? context.Uri,
+                    Uri = DocumentUri.From(editGroup.Key ?? context.Uri),
                     Version = default,
                 };
 

src/EditorServicesCommandSuite.EditorServices/EditorServicesCommandSuite.EditorServices.csproj

@@ -1,7 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\EditorServicesCommandSuite.Common.props" />
+  <PropertyGroup>
+    <RestoreAdditionalProjectSources>
+      $(RestoreAdditionalProjectSources)
+      https://www.myget.org/F/omnisharp/api/v3/index.json
+    </RestoreAdditionalProjectSources>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.16.0" PrivateAssets="all" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.17.0-*" PrivateAssets="all" />
     <ProjectReference Include="..\EditorServicesCommandSuite\EditorServicesCommandSuite.csproj" />
     <Reference Include="Microsoft.PowerShell.EditorServices">
       <HintPath>..\..\lib\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.dll</HintPath>

src/EditorServicesCommandSuite.EditorServices/LspPosition.cs

@@ -4,14 +4,14 @@ namespace EditorServicesCommandSuite.EditorServices
 {
     internal class LspPosition : ILspFilePosition
     {
-        public LspPosition(long line, long character)
+        public LspPosition(int line, int character)
         {
             Line = line;
             Character = character;
         }
 
-        public long Line { get; }
+        public int Line { get; }
 
-        public long Character { get; }
+        public int Character { get; }
     }
 }

src/EditorServicesCommandSuite.PSReadLine/EditorServicesCommandSuite.PSReadLine.csproj

@@ -8,6 +8,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Buffers" Version="4.4.0" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
   </ItemGroup>
 </Project>

src/EditorServicesCommandSuite/CodeGeneration/Refactors/CommandSplatRefactor.cs

@@ -71,9 +71,10 @@ public override async Task Invoke(DocumentContextBase context)
                 return;
             }
 
+            var config = context.GetConfiguration<CommandSplatRefactorSettings>();
             await ProcessActionForInvoke(
                 context,
-                CreateCodeAction(command, AdditionalParameterTypes.None))
+                CreateCodeAction(command, config.AdditionalParameters))
                 .ConfigureAwait(false);
         }
 
@@ -123,7 +124,7 @@ internal static async Task SplatCommandAsync(
 
             var config = context.GetConfiguration<CommandSplatRefactorSettings>();
             string splatVariable = string.IsNullOrWhiteSpace(config.VariableName)
-                ? GetSplatVariableName(command.CommandElements[0])
+                ? GetSplatVariableName(command.CommandElements[0], config.CaseType)
                 : config.VariableName;
 
             IEnumerable<DocumentEdit> edits = await GetEdits(
@@ -135,8 +136,9 @@ internal static async Task SplatCommandAsync(
                     splatVariable,
                     parameterTypes,
                     config.ExcludeHints,
-                    config.NewLineAfterHashtable,
-                    context.CancellationToken))
+                    config.NoNewLineAfterHashtable,
+                    context.CancellationToken,
+                    config.CaseType))
                     .ConfigureAwait(false);
 
             await context.RegisterWorkspaceChangeAsync(
@@ -389,7 +391,7 @@ await args.UI.ShowWarningMessageAsync(
 
             splatWriter.CloseHashtable();
 
-            if (args.NewLineAfterHashtable)
+            if (!args.NoNewLineAfterHashtable)
             {
                 splatWriter.WriteLine();
             }
@@ -527,7 +529,7 @@ private static bool TryGetDefaultParameterSet(CommandInfo commandInfo, out strin
             return false;
         }
 
-        private static string GetSplatVariableName(CommandElementAst element)
+        private static string GetSplatVariableName(CommandElementAst element, CaseType caseType)
         {
             var nameConstant = element as StringConstantExpressionAst;
             if (element == null)
@@ -549,14 +551,24 @@ private static string GetSplatVariableName(CommandElementAst element)
                     .Replace(Symbols.Dash.ToString(), string.Empty)
                     + SplatVariableSuffix;
 
-            if (!char.IsUpper(variableName[0]))
+            bool isFirstLetterCap = char.IsUpper(variableName[0]);
+            bool isPascalCase = caseType == CaseType.PascalCase;
+            if (isPascalCase)
+            {
+                if (isFirstLetterCap)
+                {
+                    return variableName;
+                }
+
+                return char.ToUpperInvariant(variableName[0]) + variableName.Substring(1);
+            }
+
+            if (!isFirstLetterCap)
             {
                 return variableName;
             }
 
-            return
-                char.ToLower(variableName[0])
-                + variableName.Substring(1);
+            return char.ToLowerInvariant(variableName[0]) + variableName.Substring(1);
         }
 
         private CodeAction CreateCodeAction(
@@ -594,7 +606,9 @@ private struct CommandSplatArguments
 
             internal readonly bool ExcludeHints;
 
-            internal readonly bool NewLineAfterHashtable;
+            internal readonly bool NoNewLineAfterHashtable;
+
+            internal readonly CaseType CaseType;
 
             internal CommandSplatArguments(
                 ThreadController pipelineThread,
@@ -604,8 +618,9 @@ internal CommandSplatArguments(
                 string variableName,
                 AdditionalParameterTypes includedParameterTypes,
                 bool excludeHints,
-                bool newLineAfterHashtable,
-                CancellationToken cancellationToken)
+                bool noNewLineAfterHashtable,
+                CancellationToken cancellationToken,
+                CaseType caseType)
             {
                 PipelineThread = pipelineThread;
                 UI = ui;
@@ -614,8 +629,9 @@ internal CommandSplatArguments(
                 VariableName = variableName;
                 IncludedTypes = includedParameterTypes;
                 ExcludeHints = excludeHints;
-                NewLineAfterHashtable = newLineAfterHashtable;
+                NoNewLineAfterHashtable = noNewLineAfterHashtable;
                 CancellationToken = cancellationToken;
+                CaseType = caseType;
             }
         }
     }

src/EditorServicesCommandSuite/CodeGeneration/Refactors/CommandSplatRefactorSettings.cs

@@ -1,4 +1,5 @@
 using System.Management.Automation;
+using EditorServicesCommandSuite.Language;
 
 namespace EditorServicesCommandSuite.CodeGeneration.Refactors
 {
@@ -10,15 +11,19 @@ internal class CommandSplatRefactorSettings : RefactorConfiguration
         public string VariableName { get; set; }
 
         [Parameter]
-        [DefaultFromSetting("CommandSplatRefactor.NewLineAfterHashtable", Default = "$true")]
-        public SwitchParameter NewLineAfterHashtable { get; set; }
+        [DefaultFromSetting("CommandSplatRefactor.NoNewLineAfterHashtable", Default = "$false")]
+        public SwitchParameter NoNewLineAfterHashtable { get; set; }
 
         [Parameter]
-        [DefaultFromSetting("CommandSplatRefactor.AdditionalParameters", Default = "\"None\"")]
+        [DefaultFromSetting("CommandSplatRefactor.AdditionalParameters", Default = "\'None\'")]
         public AdditionalParameterTypes AdditionalParameters { get; set; }
 
         [Parameter]
         [DefaultFromSetting("CommandSplatRefactor.ExcludeHints", Default = "$false")]
         public SwitchParameter ExcludeHints { get; set; }
+
+        [Parameter]
+        [DefaultFromSetting("CommandSplatRefactor.VariableCaseType", Default = "\'CamelCase\'")]
+        public CaseType CaseType { get; set; }
     }
 }

src/EditorServicesCommandSuite/EditorServicesCommandSuite.csproj

@@ -1,10 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\EditorServicesCommandSuite.Common.props" />
+  <PropertyGroup>
+    <RestoreAdditionalProjectSources>
+      $(RestoreAdditionalProjectSources)
+      https://www.myget.org/F/omnisharp/api/v3/index.json
+    </RestoreAdditionalProjectSources>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="System.Buffers" Version="4.4.0" />
-    <PackageReference Include="System.Memory" Version="4.5.2" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.16.0" PrivateAssets="all" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.17.0-*" PrivateAssets="all" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
   </ItemGroup>
 </Project>

src/EditorServicesCommandSuite/Language/CaseType.cs

@@ -1,9 +1,24 @@
 namespace EditorServicesCommandSuite.Language
 {
-    internal enum CaseType
+    /// <summary>
+    /// Represents a style of capitalization for identifiers.
+    /// </summary>
+    public enum CaseType
     {
-        PascalCase,
+        /// <summary>
+        /// Case style will default based on the action taken.
+        /// </summary>
+        Default = 0,
 
-        CamelCase,
+        /// <summary>
+        /// The first letter of each word in the identifier will be capitalized.
+        /// </summary>
+        PascalCase = 1,
+
+        /// <summary>
+        /// The first letter of each word in the identifier will be capitalized,
+        /// except for the first word which will be all lowercase.
+        /// </summary>
+        CamelCase = 2,
     }
 }

src/EditorServicesCommandSuite/resources/SettingsStrings.resx

@@ -153,21 +153,26 @@
   <data name="CommandSplatRefactor_VariableNameDescription" xml:space="preserve">
     <value>The variable name to use when creating the splat expression variable. The default behavior is to name the string similar to "getCommandNameHereSplat". Setting this to $null will enforce the default behavior.</value>
   </data>
-  <data name="CommandSplatRefactor_NewLineAfterHashtableDescription" xml:space="preserve">
+  <data name="CommandSplatRefactor_NoNewLineAfterHashtableDescription" xml:space="preserve">
     <value>Specifies whether a new line should be placed between the hashtable and the original command expression.</value>
   </data>
   <data name="CommandSplatRefactor_AdditionalParametersDescription" xml:space="preserve">
     <value>Specifies if additional parameters that have not been should be added to the splat expression. The following options are available:
-    "None" - Only bound parameters. This is the default.
-    "Mandatory" - Mandatory parameters that have not yet been bound will be added.
-    "All" - All resolved parameters will be added.</value>
+    'None' - Only bound parameters. This is the default.
+    'Mandatory' - Mandatory parameters that have not yet been bound will be added.
+    'All' - All resolved parameters will be added.</value>
   </data>
   <data name="CommandSplatRefactor_ExcludeHintsDescription" xml:space="preserve">
     <value>Specifies whether the value for additional unbound parameters should be a variable of the same name as the parameter, or if it should be decorated with mandatoriness and parameter type.
     $true - Path = $path
     $false - Path = $mandatoryStringPath</value>
   </data>
-  <data name="ExpandMemberExpression_AllowNonPublicMembers" xml:space="preserve">
+  <data name="CommandSplatRefactor_VariableCaseTypeDescription" xml:space="preserve">
+    <value>Specifies the case style to use for generated variable names.
+    'CamelCase' - $getChildItemSplat. This is the default.
+    'PascalCase' - $GetChildItemSplat</value>
+  </data>
+  <data name="ExpandMemberExpression_AllowNonPublicMembersDescription" xml:space="preserve">
     <value>Specifies whether non-public members should be included in the list of resolved members. If a non-public member is selected, an expression utilizing reflection will be generated to access the member.</value>
   </data>
   <data name="UsingStatements_SeparateGroupsWithNewLineDescription" xml:space="preserve">

test/EditorServicesCommandSuite.Tests/CommandSplatTests.cs

@@ -396,7 +396,7 @@ await GetRefactoredTextAsync(
         private async Task<string> GetRefactoredTextAsync(
             string testString,
             string variableName = "splat",
-            bool newLineAfterHashtable = false,
+            bool noNewLineAfterHashtable = true,
             bool allParameters = false,
             bool mandatoryParameters = false,
             bool noHints = false,
@@ -411,7 +411,7 @@ private async Task<string> GetRefactoredTextAsync(
             {
                 AdditionalParameters = includedTypes,
                 ExcludeHints = noHints,
-                NewLineAfterHashtable = newLineAfterHashtable,
+                NoNewLineAfterHashtable = noNewLineAfterHashtable,
                 VariableName = variableName,
             };
 

tools/AssertPSES.ps1

@@ -1,7 +1,7 @@
 [CmdletBinding()]
 param(
     [ValidateNotNull()]
-    [string] $RequiredVersion = '2.1.0'
+    [string] $RequiredVersion = '2.2.0'
 )
 begin {
     Add-Type -AssemblyName System.IO.Compression