Skip to content

Commit bdabcb0

Browse files
committed
Fixed erroneous PSUseDeclaredVarsMoreThanAssignments for some globals.
1 parent ae898e7 commit bdabcb0

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

Engine/Helper.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -870,19 +870,13 @@ public bool IsUninitialized(VariableExpressionAst varAst, Ast ast)
870870
}
871871

872872
/// <summary>
873-
/// Returns true if varaible is either a global variable or an environment variable
873+
/// Returns true if variable is either a global variable or an environment variable
874874
/// </summary>
875875
/// <param name="varAst"></param>
876-
/// <param name="ast"></param>
877876
/// <returns></returns>
878-
public bool IsVariableGlobalOrEnvironment(VariableExpressionAst varAst, Ast ast)
877+
public bool IsVariableGlobalOrEnvironment(VariableExpressionAst varAst)
879878
{
880-
if (!VariableAnalysisDictionary.ContainsKey(ast) || VariableAnalysisDictionary[ast] == null)
881-
{
882-
return false;
883-
}
884-
885-
return VariableAnalysisDictionary[ast].IsGlobalOrEnvironment(varAst);
879+
return VariableAnalysis.IsGlobalOrEnvironment(varAst);
886880
}
887881

888882

Engine/VariableAnalysis.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public bool IsUninitialized(VariableExpressionAst varTarget)
375375
/// </summary>
376376
/// <param name="varTarget"></param>
377377
/// <returns></returns>
378-
public bool IsGlobalOrEnvironment(VariableExpressionAst varTarget)
378+
public static bool IsGlobalOrEnvironment(VariableExpressionAst varTarget)
379379
{
380380
if (varTarget != null)
381381
{

Rules/UseDeclaredVarsMoreThanAssignments.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private IEnumerable<DiagnosticRecord> AnalyzeScriptBlockAst(ScriptBlockAst scrip
143143
if (assignmentVarAst != null)
144144
{
145145
// Ignore if variable is global or environment variable or scope is drive qualified variable
146-
if (!Helper.Instance.IsVariableGlobalOrEnvironment(assignmentVarAst, scriptBlockAst)
146+
if (!Helper.Instance.IsVariableGlobalOrEnvironment(assignmentVarAst)
147147
&& !assignmentVarAst.VariablePath.IsScript
148148
&& assignmentVarAst.VariablePath.DriveName == null)
149149
{

0 commit comments

Comments
 (0)