Skip to content

Commit 2df6d51

Browse files
Merge pull request #1984 from PowerShell/andschwa/better-symbols
Integrating class symbol support
2 parents 3938982 + 6208b53 commit 2df6d51

File tree

69 files changed

+2466
-2849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2466
-2849
lines changed

src/PowerShellEditorServices/Extensions/Api/DocumentSymbolService.cs

-277
This file was deleted.

src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ internal EditorExtensionServiceProvider(IServiceProvider serviceProvider)
4242
{
4343
_serviceProvider = serviceProvider;
4444
LanguageServer = new LanguageServerService(_serviceProvider.GetService<ILanguageServerFacade>());
45-
//DocumentSymbols = new DocumentSymbolService(_serviceProvider.GetService<SymbolsService>());
4645
ExtensionCommands = new ExtensionCommandService(_serviceProvider.GetService<ExtensionService>());
4746
Workspace = new WorkspaceService(_serviceProvider.GetService<InternalServices.WorkspaceService>());
4847
EditorContext = new EditorContextService(_serviceProvider.GetService<ILanguageServerFacade>());

src/PowerShellEditorServices/PowerShellEditorServices.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656
<!-- TODO: Remove these entirely. -->
5757
<ItemGroup>
58-
<Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
5958
<Compile Remove="Services\Extension\Templating\**" />
6059
<EmbeddedResource Remove="Services\Extension\Templating\**" />
6160
<None Remove="Services\Extension\Templating\**" />

src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.PowerShell.EditorServices.Services;
88
using Microsoft.PowerShell.EditorServices.Services.Symbols;
99
using Microsoft.PowerShell.EditorServices.Services.TextDocument;
10-
using Microsoft.PowerShell.EditorServices.Utility;
1110
using Newtonsoft.Json.Linq;
1211
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
1312
using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
@@ -47,7 +46,7 @@ public PesterCodeLensProvider(ConfigurationService configurationService)
4746
private static CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile scriptFile)
4847
{
4948
string word = pesterSymbol.Command == PesterCommandType.It ? "test" : "tests";
50-
CodeLens[] codeLensResults = new CodeLens[]
49+
return new CodeLens[]
5150
{
5251
new CodeLens()
5352
{
@@ -92,8 +91,6 @@ private static CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, Scri
9291
}
9392
}
9493
};
95-
96-
return codeLensResults;
9794
}
9895

9996
/// <summary>
@@ -120,7 +117,7 @@ public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile, CancellationToken can
120117
continue;
121118
}
122119

123-
// Skip codelense for setup/teardown block
120+
// Skip CodeLens for setup/teardown block
124121
if (!PesterSymbolReference.IsPesterTestCommand(pesterSymbol.Command))
125122
{
126123
continue;

0 commit comments

Comments
 (0)