aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-05-25 15:00:24 +0100
committerGitHub <[email protected]>2020-05-25 15:00:24 +0100
commit19700b2e31cf7a92fbf9da0db82a092d9dcaca34 (patch)
tree06bb2df01d20d94ab38f2216d88555df03a826c9 /editors/code
parent00172d0b555d22a42a2cbf8785eb7b2592507c4f (diff)
parent0ebb25b29b0988be89f42091fd373ea58d7ff9fb (diff)
Merge #4611
4611: Document `parentModule` experimental LSP request r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/src/commands.ts6
-rw-r--r--editors/code/src/lsp_ext.ts2
2 files changed, 4 insertions, 4 deletions
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 49e3845d5..86302db37 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -138,10 +138,10 @@ export function parentModule(ctx: Ctx): Cmd {
138 ), 138 ),
139 }); 139 });
140 const loc = response[0]; 140 const loc = response[0];
141 if (loc == null) return; 141 if (!loc) return;
142 142
143 const uri = client.protocol2CodeConverter.asUri(loc.uri); 143 const uri = client.protocol2CodeConverter.asUri(loc.targetUri);
144 const range = client.protocol2CodeConverter.asRange(loc.range); 144 const range = client.protocol2CodeConverter.asRange(loc.targetRange);
145 145
146 const doc = await vscode.workspace.openTextDocument(uri); 146 const doc = await vscode.workspace.openTextDocument(uri);
147 const e = await vscode.window.showTextDocument(doc); 147 const e = await vscode.window.showTextDocument(doc);
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts
index 2a0663261..4da12eb30 100644
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -31,7 +31,7 @@ export interface MatchingBraceParams {
31} 31}
32export const matchingBrace = new lc.RequestType<MatchingBraceParams, lc.Position[], void>("experimental/matchingBrace"); 32export const matchingBrace = new lc.RequestType<MatchingBraceParams, lc.Position[], void>("experimental/matchingBrace");
33 33
34export const parentModule = new lc.RequestType<lc.TextDocumentPositionParams, lc.Location[], void>("rust-analyzer/parentModule"); 34export const parentModule = new lc.RequestType<lc.TextDocumentPositionParams, lc.LocationLink[], void>("experimental/parentModule");
35 35
36export interface JoinLinesParams { 36export interface JoinLinesParams {
37 textDocument: lc.TextDocumentIdentifier; 37 textDocument: lc.TextDocumentIdentifier;