Fixed an issue with refactoring unsaved files (#76)

* Fixed an issue with refactoring unsaved files * Fixed a startup issue
ironmansoftware · Jul 18, 2024 · dea3deb · dea3deb
1 parent 75f4cdf
commit dea3deb
Show file tree

Hide file tree

Showing 21 changed files with 166 additions and 141 deletions.
diff --git a/HostInjection/Models.cs b/HostInjection/Models.cs
@@ -12,7 +12,8 @@ public class TextEdit
         public string Content { get; set; }
         public string FileName { get; set; }
         public TextEditType Type { get; set; }
-
+        public string Uri { get; set; }
+
 
         public static TextEdit None
         {
@@ -30,7 +31,8 @@ public override bool Equals(object obj)
                    EqualityComparer<TextPosition>.Default.Equals(Cursor, edit.Cursor) &&
                    Content == edit.Content &&
                    FileName == edit.FileName &&
-                   Type == edit.Type;
+                   Type == edit.Type &&
+                   Uri == edit.Uri;
         }
 
         public override int GetHashCode()
@@ -41,6 +43,7 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + EqualityComparer<TextPosition>.Default.GetHashCode(Cursor);
             hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Content);
             hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(FileName);
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Uri);
             hashCode = hashCode * -1521134295 + Type.GetHashCode();
             return hashCode;
         }
@@ -62,12 +65,14 @@ public class TextEditorState
         public TextPosition SelectionEnd { get; set; }
         public TextPosition DocumentEnd { get; set; }
         public IPoshToolsServer Server { get; set; }
+        public string Uri { get; set; }
 
         public override bool Equals(object obj)
         {
             return obj is TextEditorState state &&
                    Content == state.Content &&
                    FileName == state.FileName &&
+                   Uri == state.Uri &&
                    EqualityComparer<TextPosition>.Default.Equals(SelectionStart, state.SelectionStart) &&
                    EqualityComparer<TextPosition>.Default.Equals(SelectionEnd, state.SelectionEnd) &&
                    EqualityComparer<TextPosition>.Default.Equals(DocumentEnd, state.DocumentEnd) &&
@@ -82,6 +87,7 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + EqualityComparer<TextPosition>.Default.GetHashCode(SelectionStart);
             hashCode = hashCode * -1521134295 + EqualityComparer<TextPosition>.Default.GetHashCode(SelectionEnd);
             hashCode = hashCode * -1521134295 + EqualityComparer<TextPosition>.Default.GetHashCode(DocumentEnd);
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Uri);
             hashCode = hashCode * -1521134295 + EqualityComparer<IPoshToolsServer>.Default.GetHashCode(Server);
             return hashCode;
         }
@@ -156,7 +162,7 @@ public RefactorInfo() { }
         public RefactorInfo(string name, RefactorType type)
         {
             Name = name;
-            Type = type; 
+            Type = type;
         }
 
         public string Name { get; set; }

diff --git a/HostInjection/Refactoring/ConvertToDollarUnder.cs b/HostInjection/Refactoring/ConvertToDollarUnder.cs
@@ -27,6 +27,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = "$_",
                 FileName = state.FileName,
                 Type = TextEditType.Replace,

diff --git a/HostInjection/Refactoring/ConvertToMultilineCommand.cs b/HostInjection/Refactoring/ConvertToMultilineCommand.cs
@@ -70,6 +70,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString().Trim().TrimEnd('`'),
                 Type = TextEditType.Replace,
                 Start = new TextPosition

diff --git a/HostInjection/Refactoring/ConvertToPsItem.cs b/HostInjection/Refactoring/ConvertToPsItem.cs
@@ -23,9 +23,10 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
             {
                 yield break;
             }
-            
+
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = "$PSItem",
                 FileName = state.FileName,
                 Type = TextEditType.Replace,

diff --git a/HostInjection/Refactoring/ConvertToSplat.cs b/HostInjection/Refactoring/ConvertToSplat.cs
@@ -93,6 +93,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Type = TextEditType.Insert,
                 Start = new TextPosition
@@ -103,9 +104,10 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
                 },
                 FileName = state.FileName
             };
-            
+
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = $"{commandName} @Parameters",
                 Type = TextEditType.Replace,
                 Start = new TextPosition

diff --git a/HostInjection/Refactoring/ExportModuleMember.cs b/HostInjection/Refactoring/ExportModuleMember.cs
@@ -37,6 +37,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
             {
                 yield return new TextEdit
                 {
+                    Uri = state.Uri,
                     Type = TextEditType.Insert,
                     Content = $"{Environment.NewLine}Export-ModuleMember -Variable '{variableExpression.VariablePath.UserPath}'",
                     Start = new TextPosition
@@ -51,6 +52,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
             {
                 yield return new TextEdit
                 {
+                    Uri = state.Uri,
                     Type = TextEditType.Insert,
                     Content = $"{Environment.NewLine}Export-ModuleMember -Function '{functionDef.Name}'",
                     Start = new TextPosition

diff --git a/HostInjection/Refactoring/ExtractFile.cs b/HostInjection/Refactoring/ExtractFile.cs
@@ -43,6 +43,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = $"& \"$PSScriptRoot\\{fileName}\"",
                 Start = new TextPosition
                 {

diff --git a/HostInjection/Refactoring/ExtractFunction.cs b/HostInjection/Refactoring/ExtractFunction.cs
@@ -75,6 +75,7 @@ m is AssignmentStatementAst assignment &&
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Start = new TextPosition
                 {

diff --git a/HostInjection/Refactoring/ExtractVariable.cs b/HostInjection/Refactoring/ExtractVariable.cs
@@ -75,6 +75,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Start = new TextPosition
                 {

diff --git a/HostInjection/Refactoring/GenerateFunctionFromUsage.cs b/HostInjection/Refactoring/GenerateFunctionFromUsage.cs
@@ -121,6 +121,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Type = TextEditType.Insert,
                 Start = new TextPosition

diff --git a/HostInjection/Refactoring/GenerateProxyFunction.cs b/HostInjection/Refactoring/GenerateProxyFunction.cs
@@ -41,6 +41,7 @@ public  IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerab
 
             edits.Add(new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Type = TextEditType.Insert,
                 Start = new TextPosition

diff --git a/HostInjection/Refactoring/IntroduceUsing.cs b/HostInjection/Refactoring/IntroduceUsing.cs
@@ -51,6 +51,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = $"using namespace {namespaceName}{Environment.NewLine}",
                 FileName = state.FileName,
                 Type = TextEditType.Insert,

diff --git a/HostInjection/Refactoring/Reorder.cs b/HostInjection/Refactoring/Reorder.cs
@@ -82,7 +82,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
             }
 
             if (direction == "Right")
-            {   
+            {
                 if (targetParameterIndex + 1 == currentParameterIndex)
                 {
                     yield break;
@@ -143,6 +143,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Type = TextEditType.Replace,
                 Start = new TextPosition

diff --git a/HostInjection/Refactoring/SplitPipe.cs b/HostInjection/Refactoring/SplitPipe.cs
@@ -47,6 +47,7 @@ public IEnumerable<TextEdit> Refactor(TextEditorState state, Ast ast, IEnumerabl
 
             yield return new TextEdit
             {
+                Uri = state.Uri,
                 Content = stringBuilder.ToString(),
                 Type = TextEditType.Replace,
                 Start = new TextPosition

diff --git a/HostInjection/Variable.cs b/HostInjection/Variable.cs
@@ -234,7 +234,7 @@ public IEnumerable<Variable> GetChildren()
                 yield break;
             }
 
-            if (_propertyInfo.Value == null) yield break;
+            if (_propertyInfo?.Value == null) yield break;
 
             foreach (var item in ProcessObject(_propertyInfo.Value))
             {

diff --git a/PowerShellToolsPro.Cmdlets/PowerShellProTools.psd1 b/PowerShellToolsPro.Cmdlets/PowerShellProTools.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Ironman Software, LLC
 #
-# Generated on: 7/10/2024
+# Generated on: 7/18/2024
 #
 
 @{
@@ -18,7 +18,7 @@ ModuleVersion = '2024.7.0'
 # CompatiblePSEditions = @()
 
 # ID used to uniquely identify this module
-GUID = '67c5dc55-fa45-4f33-856f-fbab0a85e9eb'
+GUID = 'c9ea3714-d2c0-4a2d-9e85-e275d09854cd'
 
 # Author of this module
 Author = 'Ironman Software, LLC'