Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: take into account hierarchical symbols client capability #13

Merged
merged 1 commit into from
Dec 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/crystalline/controller.cr
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,15 @@ class Crystalline::Controller
when LSP::DocumentSymbolsRequest
@documents_lock.synchronize do
file_uri = URI.parse message.params.text_document.uri
workspace.document_symbols(@server, file_uri)
document_symbols = workspace.document_symbols(@server, file_uri)

if @server.client_capabilities.text_document.try &.document_symbol.try &.hierarchical_document_symbol_support
document_symbols
else
document_symbols.try &.reduce([] of LSP::SymbolInformation) { |acc, document_symbol|
acc.concat(document_symbol.to_symbol_information_array(message.params.text_document.uri))
}
end
end
else
nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,31 @@ module LSP

# Children of this symbol, e.g. properties of a class.
property children : Array(DocumentSymbol)?

def to_symbol_information_array(uri : String)
results = [] of LSP::SymbolInformation
deque = Deque(Tuple(LSP::DocumentSymbol, LSP::DocumentSymbol?)){ {self, nil} }

loop do
break if deque.size == 0
symbol, parent = deque.shift
results << LSP::SymbolInformation.new(
name: symbol.name,
kind: symbol.kind,
deprecated: symbol.deprecated,
location: LSP::Location.new(
uri: uri,
range: symbol.range
),
container_name: parent.try &.name
)
symbol.children.try { |children|
deque.concat(children.map { |c| {c, self} })
}
end

results
end
end

# Represents information about programming constructs like variables, classes,
Expand All @@ -67,7 +92,7 @@ module LSP
property name : String

# The kind of this symbol.
property kind : SymbolKind
property kind : LSP::SymbolKind

# Indicates if this symbol is deprecated.
property deprecated : Bool?
Expand Down
3 changes: 3 additions & 0 deletions src/crystalline/lsp/server.cr
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class LSP::Server
getter output : IO
# The broadcasted server capabilites.
getter server_capabilities : LSP::ServerCapabilities
# The lsp client capabilites.
getter! client_capabilities : LSP::ClientCapabilities
# A list of requests that were sent to clients to keep track of the ID and kind.
getter requests_sent : Hash(RequestMessage::RequestId, LSP::Message) = {} of RequestMessage::RequestId => LSP::Message
# Incremental.
Expand Down Expand Up @@ -126,6 +128,7 @@ class LSP::Server
loop do
initialize_message = self.class.read(@input)
if initialize_message.is_a? LSP::InitializeRequest
@client_capabilities = initialize_message.params.capabilities
if controller.responds_to? :on_init
init_result = controller.on_init(initialize_message.params)
else
Expand Down