itdominator/PyLSPClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding defintion and declaration support

Browse Source
This commit is contained in:
yeger 2019-06-18 15:44:46 -04:00
parent 7aea72ed19
commit 622a919e76
4 changed files with 105 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
classes.dot
View File

@ -31,43 +31,47 @@ rankdir=BT
"27" [label="Key", shape="record"]; "27" [label="Key", shape="record"];
"28" [label="LANGUAGE_IDENTIFIER", shape="record"]; "28" [label="LANGUAGE_IDENTIFIER", shape="record"];
"29" [label="Location", shape="record"]; "29" [label="Location", shape="record"];
"30" [label="LspClient", shape="record"]; "30" [label="LocationLink", shape="record"];
"31" [label="LspEndpoint", shape="record"]; "31" [label="LspClient", shape="record"];
"32" [label="Method", shape="record"]; "32" [label="LspEndpoint", shape="record"];
"33" [label="MethodNotFound", shape="record"]; "33" [label="Method", shape="record"];
"34" [label="Module", shape="record"]; "34" [label="MethodNotFound", shape="record"];
"35" [label="MyEncoder", shape="record"]; "35" [label="Module", shape="record"];
"36" [label="Namespace", shape="record"]; "36" [label="MyEncoder", shape="record"];
"37" [label="Null", shape="record"]; "37" [label="Namespace", shape="record"];
"38" [label="Number", shape="record"]; "38" [label="Null", shape="record"];
"39" [label="Object", shape="record"]; "39" [label="Number", shape="record"];
"40" [label="Operator", shape="record"]; "40" [label="Object", shape="record"];
"41" [label="Package", shape="record"]; "41" [label="Operator", shape="record"];
"42" [label="ParameterInformation", shape="record"]; "42" [label="Package", shape="record"];
"43" [label="ParseError", shape="record"]; "43" [label="ParameterInformation", shape="record"];
"44" [label="Position", shape="record"]; "44" [label="ParseError", shape="record"];
"45" [label="Property", shape="record"]; "45" [label="Position", shape="record"];
"46" [label="Range", shape="record"]; "46" [label="Property", shape="record"];
"47" [label="RequestCancelled", shape="record"]; "47" [label="Range", shape="record"];
"48" [fontcolor="red", label="ResponseError", shape="record"]; "48" [label="RequestCancelled", shape="record"];
"49" [label="ServerNotInitialized", shape="record"]; "49" [fontcolor="red", label="ResponseError", shape="record"];
"50" [label="SignatureHelp", shape="record"]; "50" [label="ServerNotInitialized", shape="record"];
"51" [label="SignatureInformation", shape="record"]; "51" [label="SignatureHelp", shape="record"];
"52" [label="String", shape="record"]; "52" [label="SignatureInformation", shape="record"];
"53" [label="Struct", shape="record"]; "53" [label="String", shape="record"];
"54" [label="SymbolInformation", shape="record"]; "54" [label="Struct", shape="record"];
"55" [label="SymbolKind", shape="record"]; "55" [label="SymbolInformation", shape="record"];
"56" [label="TextDocumentIdentifier", shape="record"]; "56" [label="SymbolKind", shape="record"];
"57" [label="TextDocumentItem", shape="record"]; "57" [label="TextDocumentIdentifier", shape="record"];
"58" [label="TextDocumentPositionParams", shape="record"]; "58" [label="TextDocumentItem", shape="record"];
"59" [label="TextEdit", shape="record"]; "59" [label="TextDocumentPositionParams", shape="record"];
"60" [label="TypeParameter", shape="record"]; "60" [label="TextEdit", shape="record"];
"61" [label="UnknownErrorCode", shape="record"]; "61" [label="TypeParameter", shape="record"];
"62" [label="Variable", shape="record"]; "62" [label="UnknownErrorCode", shape="record"];
"63" [label="serverErrorEnd", shape="record"]; "63" [label="Variable", shape="record"];
"64" [label="serverErrorStart", shape="record"]; "64" [label="serverErrorEnd", shape="record"];
"29" -> "54" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="location", style="solid"]; "65" [label="serverErrorStart", shape="record"];
"44" -> "46" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="start", style="solid"]; "29" -> "55" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="location", style="solid"];
"44" -> "46" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="end", style="solid"]; "45" -> "47" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="start", style="solid"];
"46" -> "29" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="range", style="solid"]; "45" -> "47" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="end", style="solid"];
"47" -> "29" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="range", style="solid"];
"47" -> "30" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="originSelectionRange", style="solid"];
"47" -> "30" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="targetRange", style="solid"];
"47" -> "30" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="targetSelectionRange", style="solid"];
} }

1
examples/clangd.py
View File

@ -160,6 +160,7 @@ if __name__ == "__main__":
lsp_client.definition(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4)) lsp_client.definition(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4))
lsp_client.signatureHelp(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4)) lsp_client.signatureHelp(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4))
lsp_client.definition(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4))
lsp_client.completion(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4), pylspclient.lsp_structs.CompletionContext(pylspclient.lsp_structs.CompletionTriggerKind.Invoked)) lsp_client.completion(pylspclient.lsp_structs.TextDocumentIdentifier(uri), pylspclient.lsp_structs.Position(14, 4), pylspclient.lsp_structs.CompletionContext(pylspclient.lsp_structs.CompletionTriggerKind.Invoked))
lsp_client.shutdown() lsp_client.shutdown()
lsp_client.exit() lsp_client.exit()

38
pylspclient/lsp_client.py
View File

@ -141,6 +141,42 @@ class LspClient(object):
""" """
result_dict = self.lsp_endpoint.call_method("textDocument/completion", textDocument=textDocument, position=position, context=context) result_dict = self.lsp_endpoint.call_method("textDocument/completion", textDocument=textDocument, position=position, context=context)
if "isIncomplete" in result_dict: if "isIncomplete" in result_dict:
return lsp_structs.CompletionList (**result_dict) return lsp_structs.CompletionList(**result_dict)
return [lsp_structs.CompletionItem(**l) for l in result_dict] return [lsp_structs.CompletionItem(**l) for l in result_dict]
def declaration(self, textDocument, position):
"""
The go to declaration request is sent from the client to the server to resolve the declaration location of a
symbol at a given text document position.
The result type LocationLink[] got introduce with version 3.14.0 and depends in the corresponding client
capability `clientCapabilities.textDocument.declaration.linkSupport`.
:param TextDocumentItem textDocument: The text document.
:param Position position: The position inside the text document.
"""
result_dict = self.lsp_endpoint.call_method("textDocument/declaration", textDocument=textDocument, position=position)
if "uri" in result_dict:
return lsp_structs.Location(**result_dict)
return [lsp_structs.Location(**l) if "uri" in l else lsp_structs.LinkLocation(**l) for l in result_dict]
def definition(self, textDocument, position):
"""
The go to definition request is sent from the client to the server to resolve the declaration location of a
symbol at a given text document position.
The result type LocationLink[] got introduce with version 3.14.0 and depends in the corresponding client
capability `clientCapabilities.textDocument.declaration.linkSupport`.
:param TextDocumentItem textDocument: The text document.
:param Position position: The position inside the text document.
"""
result_dict = self.lsp_endpoint.call_method("textDocument/definition", textDocument=textDocument, position=position)
if "uri" in result_dict:
return lsp_structs.Location(**result_dict)
return [lsp_structs.Location(**l) if "uri" in l else lsp_structs.LinkLocation(**l) for l in result_dict]

25
pylspclient/lsp_structs.py
View File

@ -44,7 +44,7 @@ class Location(object):
""" """
def __init__(self, uri, range): def __init__(self, uri, range):
""" """
Constructs a new Range instance. Constructs a new Location instance.
:param str uri: Resource file. :param str uri: Resource file.
:param Range range: The range inside the file :param Range range: The range inside the file
@ -53,6 +53,29 @@ class Location(object):
self.range = to_type(range, Range) self.range = to_type(range, Range)
class LocationLink(object):
"""
Represents a link between a source and a target location.
"""
def __init__(self, originSelectionRange, targetUri, targetRange, targetSelectionRange):
"""
Constructs a new LocationLink instance.
:param Range originSelectionRange: Span of the origin of this link.
Used as the underlined span for mouse interaction. Defaults to the word range at the mouse position.
:param str targetUri: The target resource identifier of this link.
:param Range targetRange: The full target range of this link. If the target for example is a symbol then target
range is the range enclosing this symbol not including leading/trailing whitespace but everything else
like comments. This information is typically used to highlight the range in the editor.
:param Range targetSelectionRange: The range that should be selected and revealed when this link is being followed,
e.g the name of a function. Must be contained by the the `targetRange`. See also `DocumentSymbol#range`
"""
self.originSelectionRange = to_type(originSelectionRange, Range)
self.targetUri = targetUri
self.targetRange = to_type(targetRange, Range)
self.targetSelectionRange = to_type(targetSelectionRange, Range)
class Diagnostic(object): class Diagnostic(object):
def __init__(self, range, severity, code, source, message, relatedInformation): def __init__(self, range, severity, code, source, message, relatedInformation):
""" """