A few minor fixes

- Fix an issue with parameter set resolution in ConvertTo-ScriptExtent.

- Fix importing editor commands from a module that is in the middle of
  being imported.

- Add parameter validation to FullScriptExtent constructors.

Author: SeeminglyScience

module/PowerShellEditorServices/Commands/Public/ConvertTo-ScriptExtent.ps1

@@ -5,6 +5,16 @@ function ConvertTo-ScriptExtent {
     [CmdletBinding()]
     [OutputType([System.Management.Automation.Language.IScriptExtent])]
     param(
+        [Parameter(Mandatory, ValueFromPipelineByPropertyName, ParameterSetName='ByOffset')]
+        [Alias('StartOffset', 'Offset')]
+        [int]
+        $StartOffsetNumber,
+
+        [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByOffset')]
+        [Alias('EndOffset')]
+        [int]
+        $EndOffsetNumber,
+
         [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByPosition')]
         [Alias('StartLine', 'Line')]
         [int]
@@ -25,16 +35,6 @@ function ConvertTo-ScriptExtent {
         [int]
         $EndColumnNumber,
 
-        [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByOffset')]
-        [Alias('StartOffset', 'Offset')]
-        [int]
-        $StartOffsetNumber,
-
-        [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByOffset')]
-        [Alias('EndOffset')]
-        [int]
-        $EndOffsetNumber,
-
         [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByPosition')]
         [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByOffset')]
         [Parameter(ValueFromPipelineByPropertyName, ParameterSetName='ByBuffer')]
@@ -52,7 +52,10 @@ function ConvertTo-ScriptExtent {
         [Microsoft.PowerShell.EditorServices.BufferPosition]
         $EndBuffer,
 
-        [Parameter(ValueFromPipeline)]
+        [Parameter(Mandatory,
+                   ValueFromPipeline,
+                   ValueFromPipelineByPropertyName,
+                   ParameterSetName='ByExtent')]
         [System.Management.Automation.Language.IScriptExtent]
         $Extent
     )

module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1

@@ -35,10 +35,10 @@ function Import-EditorCommand {
             process {
                 if (-not $ModuleToSearch) { return }
 
-                $caller = (Get-PSCallStack)[1]
+                $caller = (Get-PSCallStack)[2]
 
-                if ($caller.InvocationInfo.MyCommand.Module.Name -eq $ModuleToSearch) {
-                    $moduleInfo = $caller.InvocationInfo.MyCommand.Module
+                if ($caller.InvocationInfo.MyCommand.ScriptBlock.Module.Name -eq $ModuleToSearch) {
+                    $moduleInfo = $caller.InvocationInfo.MyCommand.ScriptBlock.Module
 
                     return $moduleInfo.Invoke(
                         {

src/PowerShellEditorServices/Language/FullScriptExtent.cs

@@ -1,5 +1,6 @@
 using System.Management.Automation.Language;
 using Microsoft.PowerShell.EditorServices.Extensions;
+using Microsoft.PowerShell.EditorServices.Utility;
 
 namespace Microsoft.PowerShell.EditorServices
 {
@@ -116,6 +117,9 @@ public string Text
         /// <param name="bufferRange">The buffer range this extent is located at.</param>
         public FullScriptExtent(FileContext fileContext, BufferRange bufferRange)
         {
+            Validate.IsNotNull(nameof(fileContext), fileContext);
+            Validate.IsNotNull(nameof(bufferRange), bufferRange);
+
             BufferRange = bufferRange;
             FileContext = fileContext;
 
@@ -136,6 +140,10 @@ public FullScriptExtent(FileContext fileContext, BufferRange bufferRange)
         /// <param name="endOffset">The zero based offset this extent ends at.</param>
         public FullScriptExtent(FileContext fileContext, int startOffset, int endOffset)
         {
+            Validate.IsNotNull(nameof(fileContext), fileContext);
+            Validate.IsNotNull(nameof(startOffset), startOffset);
+            Validate.IsNotNull(nameof(endOffset), endOffset);
+
             FileContext = fileContext;
             StartOffset = startOffset;
             EndOffset = endOffset;
@@ -146,6 +154,9 @@ public FullScriptExtent(FileContext fileContext, int startOffset, int endOffset)
 
         #region Public Methods
 
+        /// <summary>
+        /// Return the text this extent refers to.
+        /// </summary>
         public override string ToString()
         {
             return Text;