Merge pull request #1984 from PowerShell/andschwa/better-symbols

Integrating class symbol support
PowerShell · Feb 2, 2023 · 2df6d51 · 2df6d51
2 parents 3938982 + 6208b53
commit 2df6d51
Show file tree

Hide file tree

Showing 69 changed files with 2,466 additions and 2,849 deletions.
diff --git a/src/PowerShellEditorServices/Extensions/Api/DocumentSymbolService.cs b/src/PowerShellEditorServices/Extensions/Api/DocumentSymbolService.cs
diff --git a/src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs b/src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs
@@ -42,7 +42,6 @@ internal EditorExtensionServiceProvider(IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
             LanguageServer = new LanguageServerService(_serviceProvider.GetService<ILanguageServerFacade>());
-            //DocumentSymbols = new DocumentSymbolService(_serviceProvider.GetService<SymbolsService>());
             ExtensionCommands = new ExtensionCommandService(_serviceProvider.GetService<ExtensionService>());
             Workspace = new WorkspaceService(_serviceProvider.GetService<InternalServices.WorkspaceService>());
             EditorContext = new EditorContextService(_serviceProvider.GetService<ILanguageServerFacade>());

diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -55,7 +55,6 @@
 
   <!-- TODO: Remove these entirely. -->
   <ItemGroup>
-    <Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
     <Compile Remove="Services\Extension\Templating\**" />
     <EmbeddedResource Remove="Services\Extension\Templating\**" />
     <None Remove="Services\Extension\Templating\**" />

diff --git a/src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs b/src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs
@@ -7,7 +7,6 @@
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.Symbols;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
-using Microsoft.PowerShell.EditorServices.Utility;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
@@ -47,7 +46,7 @@ public PesterCodeLensProvider(ConfigurationService configurationService)
         private static CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile scriptFile)
         {
             string word = pesterSymbol.Command == PesterCommandType.It ? "test" : "tests";
-            CodeLens[] codeLensResults = new CodeLens[]
+            return new CodeLens[]
             {
                 new CodeLens()
                 {
@@ -92,8 +91,6 @@ private static CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, Scri
                     }
                 }
             };
-
-            return codeLensResults;
         }
 
         /// <summary>
@@ -120,7 +117,7 @@ public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile, CancellationToken can
                     continue;
                 }
 
-                // Skip codelense for setup/teardown block
+                // Skip CodeLens for setup/teardown block
                 if (!PesterSymbolReference.IsPesterTestCommand(pesterSymbol.Command))
                 {
                     continue;