Skip to content

Commit 28761bf

Browse files
Razmo99JustinGrote
authored andcommitted
Passing through shouldGenerateAlias to VariableVisitor Class
1 parent 3093101 commit 28761bf

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Diff for: src/PowerShellEditorServices/Services/PowerShell/Handlers/RenameSymbol.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,12 @@ internal static ModifiedFileResponse RenameVariable(Ast symbol, Ast scriptAst, R
106106
{
107107
if (symbol is VariableExpressionAst or ParameterAst or CommandParameterAst or StringConstantExpressionAst)
108108
{
109+
109110
IterativeVariableRename visitor = new(request.RenameTo,
110111
symbol.Extent.StartLineNumber,
111112
symbol.Extent.StartColumnNumber,
112-
scriptAst);
113+
scriptAst,
114+
request.Options ?? null);
113115
visitor.Visit(scriptAst);
114116
ModifiedFileResponse FileModifications = new(request.FileName)
115117
{

Diff for: src/PowerShellEditorServices/Services/PowerShell/Refactoring/IterativeVariableVisitor.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ internal class IterativeVariableRename
2323
internal bool isParam;
2424
internal bool AliasSet;
2525
internal FunctionDefinitionAst TargetFunction;
26+
internal RenameSymbolOptions options;
2627

27-
public IterativeVariableRename(string NewName, int StartLineNumber, int StartColumnNumber, Ast ScriptAst)
28+
public IterativeVariableRename(string NewName, int StartLineNumber, int StartColumnNumber, Ast ScriptAst,RenameSymbolOptions options = null)
2829
{
2930
this.NewName = NewName;
3031
this.StartLineNumber = StartLineNumber;
3132
this.StartColumnNumber = StartColumnNumber;
3233
this.ScriptAst = ScriptAst;
34+
this.options = options ?? new RenameSymbolOptions { ShouldGenerateAlias = true };
3335

3436
VariableExpressionAst Node = (VariableExpressionAst)GetVariableTopAssignment(StartLineNumber, StartColumnNumber, ScriptAst);
3537
if (Node != null)
@@ -366,7 +368,8 @@ private void ProcessVariableExpressionAst(VariableExpressionAst variableExpressi
366368
EndColumn = variableExpressionAst.Extent.StartColumnNumber + OldName.Length,
367369
};
368370
// If the variables parent is a parameterAst Add a modification
369-
if (variableExpressionAst.Parent is ParameterAst paramAst && !AliasSet)
371+
if (variableExpressionAst.Parent is ParameterAst paramAst && !AliasSet &&
372+
options.ShouldGenerateAlias)
370373
{
371374
TextChange aliasChange = NewParameterAliasChange(variableExpressionAst, paramAst);
372375
Modifications.Add(aliasChange);

0 commit comments

Comments
 (0)