add codelens for class and enum

Author: fflaten

src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs

@@ -55,14 +55,17 @@ public ReferencesCodeLensProvider(WorkspaceService workspaceService, SymbolsServ
         /// </summary>
         /// <param name="scriptFile">The PowerShell script file to get code lenses for.</param>
         /// <param name="cancellationToken"></param>
-        /// <returns>An array of CodeLenses describing all functions in the given script file.</returns>
+        /// <returns>An array of CodeLenses describing all functions, classes and enums in the given script file.</returns>
         public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile, CancellationToken cancellationToken)
         {
             List<CodeLens> acc = new();
             foreach (SymbolReference sym in _symbolProvider.ProvideDocumentSymbols(scriptFile))
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                if (sym.SymbolType == SymbolType.Function)
+                if (sym.SymbolType is
+                    SymbolType.Function or
+                    SymbolType.Class or
+                    SymbolType.Enum)
                 {
                     acc.Add(new CodeLens
                     {
@@ -94,7 +97,7 @@ public async Task<CodeLens> ResolveCodeLens(
             ScriptFile[] references = _workspaceService.ExpandScriptReferences(
                 scriptFile);
 
-            SymbolReference foundSymbol = SymbolsService.FindFunctionDefinitionAtLocation(
+            SymbolReference foundSymbol = SymbolsService.FindSymbolDefinitionAtLocation(
                 scriptFile,
                 codeLens.Range.Start.Line + 1,
                 codeLens.Range.Start.Character + 1);

src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs

@@ -269,15 +269,15 @@ public static IReadOnlyList<SymbolReference> FindOccurrencesInFile(
         }
 
         /// <summary>
-        /// Finds a function definition in the script given a file location
+        /// Finds a function, class or enum definition in the script given a file location
         /// </summary>
         /// <param name="scriptFile">The details and contents of a open script file</param>
         /// <param name="lineNumber">The line number of the cursor for the given script</param>
         /// <param name="columnNumber">The column number of the cursor for the given script</param>
         /// <returns>A SymbolReference of the symbol found at the given location
         /// or null if there is no symbol at that location
         /// </returns>
-        public static SymbolReference FindFunctionDefinitionAtLocation(
+        public static SymbolReference FindSymbolDefinitionAtLocation(
             ScriptFile scriptFile,
             int lineNumber,
             int columnNumber)
@@ -287,7 +287,7 @@ public static SymbolReference FindFunctionDefinitionAtLocation(
                     scriptFile.ScriptAst,
                     lineNumber,
                     columnNumber,
-                    includeFunctionDefinitions: true);
+                    includeDefinitions: true);
 
             if (symbolReference != null)
             {

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

@@ -146,19 +146,19 @@ await executionService.ExecuteDelegateAsync(
         /// <param name="scriptAst">The abstract syntax tree of the given script</param>
         /// <param name="lineNumber">The line number of the cursor for the given script</param>
         /// <param name="columnNumber">The column number of the cursor for the given script</param>
-        /// <param name="includeFunctionDefinitions">Includes full function definition ranges in the search.</param>
+        /// <param name="includeDefinitions">Includes full symbol definition ranges in the search.</param>
         /// <returns>SymbolReference of found symbol</returns>
         public static SymbolReference FindSymbolAtPosition(
             Ast scriptAst,
             int lineNumber,
             int columnNumber,
-            bool includeFunctionDefinitions = false)
+            bool includeDefinitions = false)
         {
             FindSymbolVisitor symbolVisitor =
                 new(
                     lineNumber,
                     columnNumber,
-                    includeFunctionDefinitions);
+                    includeDefinitions);
 
             scriptAst.Visit(symbolVisitor);
 

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

@@ -13,18 +13,18 @@ internal class FindSymbolVisitor : AstVisitor2
     {
         private readonly int lineNumber;
         private readonly int columnNumber;
-        private readonly bool includeFunctionDefinitions;
+        private readonly bool includeDefinitions;
 
         public SymbolReference FoundSymbolReference { get; private set; }
 
         public FindSymbolVisitor(
             int lineNumber,
             int columnNumber,
-            bool includeFunctionDefinitions)
+            bool includeDefinitions)
         {
             this.lineNumber = lineNumber;
             this.columnNumber = columnNumber;
-            this.includeFunctionDefinitions = includeFunctionDefinitions;
+            this.includeDefinitions = includeDefinitions;
         }
 
         /// <summary>
@@ -63,7 +63,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
             int endLineNumber = functionDefinitionAst.Extent.EndLineNumber;
             int endColumnNumber = functionDefinitionAst.Extent.EndColumnNumber;
 
-            if (!includeFunctionDefinitions)
+            if (!includeDefinitions)
             {
                 // We only want the function name
                 (int startColumn, int startLine) = VisitorUtils.GetNameStartColumnAndLineNumbersFromAst(functionDefinitionAst);
@@ -196,18 +196,29 @@ public override AstVisitAction VisitFunctionMember(FunctionMemberAst functionMem
         /// or a decision to continue if it wasn't found</returns>
         public override AstVisitAction VisitTypeDefinition(TypeDefinitionAst typeDefinitionAst)
         {
-            // Show only type name. Offset by StartColumn to include indentation etc.
-            int startColumnNumber =
-                typeDefinitionAst.Extent.StartColumnNumber +
-                typeDefinitionAst.Extent.Text.IndexOf(typeDefinitionAst.Name);
+            int startLineNumber = typeDefinitionAst.Extent.StartLineNumber;
+            int startColumnNumber = typeDefinitionAst.Extent.StartColumnNumber;
+            int endLineNumber = typeDefinitionAst.Extent.EndLineNumber;
+            int endColumnNumber = typeDefinitionAst.Extent.EndColumnNumber;
+
+            if (!includeDefinitions)
+            {
+                // We only want the function name
+                startColumnNumber =
+                    typeDefinitionAst.Extent.StartColumnNumber +
+                    typeDefinitionAst.Extent.Text.IndexOf(typeDefinitionAst.Name);
+                startLineNumber = typeDefinitionAst.Extent.StartLineNumber;
+                endColumnNumber = startColumnNumber + typeDefinitionAst.Name.Length;
+                endLineNumber = typeDefinitionAst.Extent.StartLineNumber;
+            }
 
             IScriptExtent nameExtent = new ScriptExtent()
             {
                 Text = typeDefinitionAst.Name,
-                StartLineNumber = typeDefinitionAst.Extent.StartLineNumber,
-                EndLineNumber = typeDefinitionAst.Extent.StartLineNumber,
+                StartLineNumber = startLineNumber,
+                EndLineNumber = endLineNumber,
                 StartColumnNumber = startColumnNumber,
-                EndColumnNumber = startColumnNumber + typeDefinitionAst.Name.Length,
+                EndColumnNumber = endColumnNumber,
                 File = typeDefinitionAst.Extent.File
             };