Minor clean-ups

Author: andyleejordan

src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs

@@ -107,7 +107,6 @@ public async Task<CodeLens> ResolveCodeLens(
             List<SymbolReference> referencesResult = await _symbolsService.FindReferencesOfSymbol(
                     foundSymbol,
                     references,
-                    _workspaceService,
                     cancellationToken).ConfigureAwait(false);
 
             Location[] referenceLocations;

src/PowerShellEditorServices/Services/Symbols/ReferenceTable.cs

@@ -26,17 +26,19 @@ internal sealed class ReferenceTable
     public ReferenceTable(ScriptFile parent) => _parent = parent;
 
     /// <summary>
-    /// Clears the reference table causing it to rescan the source AST when queried.
+    /// Clears the reference table causing it to re-scan the source AST when queried.
     /// </summary>
     public void TagAsChanged()
     {
         _symbolReferences.Clear();
         _isInited = false;
     }
 
-    // Prefer checking if the dictionary has contents to determine if initialized. The field
-    // `_isInited` is to guard against rescanning files with no command references, but will
-    // generally be less reliable of a check.
+    /// <summary>
+    /// Prefer checking if the dictionary has contents to determine if initialized. The field
+    /// `_isInited` is to guard against re-scanning files with no command references, but will
+    /// generally be less reliable of a check.
+    /// </summary>
     private bool IsInitialized => !_symbolReferences.IsEmpty || _isInited;
 
     internal bool TryGetReferences(string command, out ConcurrentBag<IScriptExtent>? references)
@@ -73,6 +75,22 @@ private sealed class ReferenceVisitor : AstVisitor
 
         public ReferenceVisitor(ReferenceTable references) => _references = references;
 
+        private static string? GetCommandName(CommandAst commandAst)
+        {
+            string commandName = commandAst.GetCommandName();
+            if (!string.IsNullOrEmpty(commandName))
+            {
+                return commandName;
+            }
+
+            if (commandAst.CommandElements[0] is not ExpandableStringExpressionAst expandableStringExpressionAst)
+            {
+                return null;
+            }
+
+            return AstOperations.TryGetInferredValue(expandableStringExpressionAst, out string value) ? value : null;
+        }
+
         public override AstVisitAction VisitCommand(CommandAst commandAst)
         {
             string? commandName = GetCommandName(commandAst);
@@ -86,22 +104,6 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                 commandAst.CommandElements[0].Extent);
 
             return AstVisitAction.Continue;
-
-            static string? GetCommandName(CommandAst commandAst)
-            {
-                string commandName = commandAst.GetCommandName();
-                if (!string.IsNullOrEmpty(commandName))
-                {
-                    return commandName;
-                }
-
-                if (commandAst.CommandElements[0] is not ExpandableStringExpressionAst expandableStringExpressionAst)
-                {
-                    return null;
-                }
-
-                return AstOperations.TryGetInferredValue(expandableStringExpressionAst, out string value) ? value : null;
-            }
         }
 
         public override AstVisitAction VisitVariableExpression(VariableExpressionAst variableExpressionAst)

src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs

@@ -161,13 +161,11 @@ public static SymbolReference FindSymbolAtLocation(
         /// </summary>
         /// <param name="foundSymbol">The symbol to find all references for</param>
         /// <param name="referencedFiles">An array of scriptFiles too search for references in</param>
-        /// <param name="workspace">The workspace that will be searched for symbols</param>
         /// <param name="cancellationToken"></param>
         /// <returns>FindReferencesResult</returns>
         public async Task<List<SymbolReference>> FindReferencesOfSymbol(
             SymbolReference foundSymbol,
             ScriptFile[] referencedFiles,
-            WorkspaceService workspace,
             CancellationToken cancellationToken = default)
         {
             if (foundSymbol == null)

src/PowerShellEditorServices/Services/Symbols/Vistors/AstOperations.cs

@@ -189,9 +189,9 @@ public static SymbolReference FindCommandAtPosition(Ast scriptAst, int lineNumbe
         /// </summary>
         /// <param name="scriptAst">The abstract syntax tree of the given script</param>
         /// <param name="symbolReference">The symbol that we are looking for references of</param>
-        /// <param name="cmdletToAliasDictionary">Dictionary maping cmdlets to aliases for finding alias references</param>
-        /// <param name="aliasToCmdletDictionary">Dictionary maping aliases to cmdlets for finding alias references</param>
-        /// <returns></returns>
+        /// <param name="cmdletToAliasDictionary">Dictionary mapping cmdlets to aliases for finding alias references</param>
+        /// <param name="aliasToCmdletDictionary">Dictionary mapping aliases to cmdlets for finding alias references</param>
+        /// <returns>The found symbol references as an enumerable</returns>
         public static IEnumerable<SymbolReference> FindReferencesOfSymbol(
             Ast scriptAst,
             SymbolReference symbolReference,

src/PowerShellEditorServices/Services/Symbols/Vistors/FindReferencesVisitor.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System;
@@ -25,8 +25,8 @@ internal class FindReferencesVisitor : AstVisitor2
         /// Constructor used when searching for aliases is needed
         /// </summary>
         /// <param name="symbolReference">The found symbolReference that other symbols are being compared to</param>
-        /// <param name="cmdletToAliasDictionary">Dictionary maping cmdlets to aliases for finding alias references</param>
-        /// <param name="aliasToCmdletDictionary">Dictionary maping aliases to cmdlets for finding alias references</param>
+        /// <param name="cmdletToAliasDictionary">Dictionary mapping cmdlets to aliases for finding alias references</param>
+        /// <param name="aliasToCmdletDictionary">Dictionary mapping aliases to cmdlets for finding alias references</param>
         public FindReferencesVisitor(
             SymbolReference symbolReference,
             IDictionary<string, List<string>> cmdletToAliasDictionary = default,
@@ -49,11 +49,7 @@ public FindReferencesVisitor(
             // exists (if the symbol isn't an alias to a command) set symbolRefCommandName to an
             // empty string.
             aliasToCmdletDictionary.TryGetValue(symbolReference.ScriptRegion.Text, out _symbolRefCommandName);
-
-            if (_symbolRefCommandName == null)
-            {
-                _symbolRefCommandName = string.Empty;
-            }
+            _symbolRefCommandName ??= string.Empty;
         }
 
         /// <summary>
@@ -81,8 +77,8 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                     // set aliases to an empty List<string>
                     _cmdletToAliasDictionary.TryGetValue(commandName, out List<string> aliases);
                     _aliasToCmdletDictionary.TryGetValue(commandName, out string command);
-                    if (aliases == null) { aliases = new List<string>(); }
-                    if (command == null) { command = string.Empty; }
+                    aliases ??= new List<string>();
+                    command ??= string.Empty;
 
                     // Check if the found symbol's name is the same as the commandAst's name OR
                     // if the symbol's name is an alias for this commandAst's name (commandAst is a cmdlet) OR

src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs

@@ -45,7 +45,6 @@ public override async Task<LocationContainer> Handle(ReferenceParams request, Ca
                 await _symbolsService.FindReferencesOfSymbol(
                     foundSymbol,
                     _workspaceService.ExpandScriptReferences(scriptFile),
-                    _workspaceService,
                     cancellationToken).ConfigureAwait(false);
 
             List<Location> locations = new();

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

@@ -94,8 +94,7 @@ private Task<List<SymbolReference>> GetReferences(ScriptRegion scriptRegion)
 
             return symbolsService.FindReferencesOfSymbol(
                 symbolReference,
-                workspace.ExpandScriptReferences(scriptFile),
-                workspace);
+                workspace.ExpandScriptReferences(scriptFile));
         }
 
         private IReadOnlyList<SymbolReference> GetOccurrences(ScriptRegion scriptRegion)
@@ -257,9 +256,7 @@ public async Task FindsReferencesOnCommandWithAlias()
         {
             List<SymbolReference> referencesResult = await GetReferences(FindsReferencesOnBuiltInCommandWithAliasData.SourceDetails).ConfigureAwait(true);
             Assert.Equal(4, referencesResult.Count);
-            Assert.Equal("Get-ChildItem", referencesResult[1].SymbolName);
-            Assert.Equal("Get-ChildItem", referencesResult[2].SymbolName);
-            Assert.Equal("Get-ChildItem", referencesResult[referencesResult.Count - 1].SymbolName);
+            Assert.All(referencesResult, (i) => Assert.Equal("Get-ChildItem", i.SymbolName));
         }
 
         [Fact]