Skip to content

Commit ca984ac

Browse files
committed
Extract CSharpLanguageServer.Roslyn.Symbol functions
1 parent c92cfe9 commit ca984ac

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

src/CSharpLanguageServer/CSharpLanguageServer.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Compile Include="ProgressReporter.fs" />
3030
<Compile Include="Roslyn/WorkspaceServices.fs" />
3131
<Compile Include="Roslyn/Solution.fs" />
32-
<Compile Include="RoslynHelpers.fs" />
32+
<Compile Include="Roslyn/Symbol.fs" />
3333
<Compile Include="DocumentationUtil.fs" />
3434
<Compile Include="Diagnostics.fs" />
3535
<Compile Include="Lsp/Client.fs" />

src/CSharpLanguageServer/Handlers/TextDocumentSync.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ open CSharpLanguageServer
1010
open CSharpLanguageServer.Conversions
1111
open CSharpLanguageServer.State
1212
open CSharpLanguageServer.State.ServerState
13-
open CSharpLanguageServer.RoslynHelpers
13+
open CSharpLanguageServer.Roslyn.Symbol
1414
open CSharpLanguageServer.Roslyn.Solution
1515
open CSharpLanguageServer.Logging
1616

src/CSharpLanguageServer/Handlers/Workspace.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open Microsoft.CodeAnalysis.Text
1111
open CSharpLanguageServer
1212
open CSharpLanguageServer.State
1313
open CSharpLanguageServer.State.ServerState
14-
open CSharpLanguageServer.RoslynHelpers
14+
open CSharpLanguageServer.Roslyn.Symbol
1515
open CSharpLanguageServer.Roslyn.Solution
1616
open CSharpLanguageServer.Logging
1717
open CSharpLanguageServer.Types

src/CSharpLanguageServer/RoslynHelpers.fs renamed to src/CSharpLanguageServer/Roslyn/Symbol.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module CSharpLanguageServer.RoslynHelpers
1+
module CSharpLanguageServer.Roslyn.Symbol
22

33
open System
44
open System.Collections.Generic
@@ -78,14 +78,14 @@ type DocumentSymbolCollectorForMatchingSymbolName(documentUri, sym: ISymbol) =
7878
base.Visit node
7979

8080

81-
let getContainingTypeOrThis (symbol: ISymbol) : INamedTypeSymbol =
81+
let symbolGetContainingTypeOrThis (symbol: ISymbol) : INamedTypeSymbol =
8282
if symbol :? INamedTypeSymbol then
8383
symbol :?> INamedTypeSymbol
8484
else
8585
symbol.ContainingType
8686

8787

88-
let getFullReflectionName (containingType: INamedTypeSymbol) =
88+
let symbolGetFullReflectionName (containingType: INamedTypeSymbol) =
8989
let stack = Stack<string>()
9090
stack.Push containingType.MetadataName
9191
let mutable ns = containingType.ContainingNamespace

src/CSharpLanguageServer/State/ServerRequestContext.fs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ namespace CSharpLanguageServer.State
33
open Microsoft.CodeAnalysis
44
open Microsoft.CodeAnalysis.FindSymbols
55
open Ionide.LanguageServerProtocol.Types
6-
open Microsoft.Extensions.Logging
76

87
open CSharpLanguageServer.State.ServerState
98
open CSharpLanguageServer.Types
10-
open CSharpLanguageServer.RoslynHelpers
9+
open CSharpLanguageServer.Roslyn.Symbol
1110
open CSharpLanguageServer.Roslyn.Solution
1211
open CSharpLanguageServer.Conversions
1312
open CSharpLanguageServer.Util
@@ -64,7 +63,7 @@ type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
6463
let! ct = Async.CancellationToken
6564
let! compilation = project.GetCompilationAsync(ct) |> Async.AwaitTask
6665

67-
let fullName = sym |> getContainingTypeOrThis |> getFullReflectionName
66+
let fullName = sym |> symbolGetContainingTypeOrThis |> symbolGetFullReflectionName
6867

6968
let containingAssemblyName =
7069
l.MetadataModule |> nonNull "l.MetadataModule" |> _.ContainingAssembly.Name

src/CSharpLanguageServer/State/ServerState.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ open Ionide.LanguageServerProtocol.Types
1010
open Ionide.LanguageServerProtocol
1111
open Microsoft.Extensions.Logging
1212

13-
open CSharpLanguageServer.RoslynHelpers
13+
open CSharpLanguageServer.Conversions
14+
open CSharpLanguageServer.Logging
1415
open CSharpLanguageServer.Roslyn.Solution
16+
open CSharpLanguageServer.Roslyn.Symbol
1517
open CSharpLanguageServer.Types
16-
open CSharpLanguageServer.Logging
17-
open CSharpLanguageServer.Conversions
1818
open CSharpLanguageServer.Util
1919

2020
type DecompiledMetadataDocument =

0 commit comments

Comments
 (0)