aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/code/src/commands/analyzer_status.ts1
-rw-r--r--editors/code/src/commands/join_lines.ts7
-rw-r--r--editors/code/src/commands/matching_brace.ts9
-rw-r--r--editors/code/src/commands/on_enter.ts1
-rw-r--r--editors/code/src/commands/parent_module.ts2
5 files changed, 12 insertions, 8 deletions
diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts
index 830e40e8f..b2b624b75 100644
--- a/editors/code/src/commands/analyzer_status.ts
+++ b/editors/code/src/commands/analyzer_status.ts
@@ -1,4 +1,5 @@
1import * as vscode from 'vscode'; 1import * as vscode from 'vscode';
2
2import { Ctx, Cmd } from '../ctx'; 3import { Ctx, Cmd } from '../ctx';
3// Shows status of rust-analyzer (for debugging) 4// Shows status of rust-analyzer (for debugging)
4 5
diff --git a/editors/code/src/commands/join_lines.ts b/editors/code/src/commands/join_lines.ts
index e906759c1..f4f902cf9 100644
--- a/editors/code/src/commands/join_lines.ts
+++ b/editors/code/src/commands/join_lines.ts
@@ -1,4 +1,5 @@
1import { Range, TextDocumentIdentifier } from 'vscode-languageclient'; 1import * as lc from 'vscode-languageclient';
2
2import { Ctx, Cmd } from '../ctx'; 3import { Ctx, Cmd } from '../ctx';
3import { applySourceChange, SourceChange } from '../source_change'; 4import { applySourceChange, SourceChange } from '../source_change';
4 5
@@ -20,6 +21,6 @@ export function joinLines(ctx: Ctx): Cmd {
20} 21}
21 22
22interface JoinLinesParams { 23interface JoinLinesParams {
23 textDocument: TextDocumentIdentifier; 24 textDocument: lc.TextDocumentIdentifier;
24 range: Range; 25 range: lc.Range;
25} 26}
diff --git a/editors/code/src/commands/matching_brace.ts b/editors/code/src/commands/matching_brace.ts
index a3febc5f4..59c253f88 100644
--- a/editors/code/src/commands/matching_brace.ts
+++ b/editors/code/src/commands/matching_brace.ts
@@ -1,5 +1,6 @@
1import * as vscode from 'vscode'; 1import * as vscode from 'vscode';
2import { Position, TextDocumentIdentifier } from 'vscode-languageclient'; 2import * as lc from 'vscode-languageclient';
3
3import { Ctx, Cmd } from '../ctx'; 4import { Ctx, Cmd } from '../ctx';
4 5
5export function matchingBrace(ctx: Ctx): Cmd { 6export function matchingBrace(ctx: Ctx): Cmd {
@@ -14,7 +15,7 @@ export function matchingBrace(ctx: Ctx): Cmd {
14 ctx.client.code2ProtocolConverter.asPosition(s.active), 15 ctx.client.code2ProtocolConverter.asPosition(s.active),
15 ), 16 ),
16 }; 17 };
17 const response = await ctx.client.sendRequest<Position[]>( 18 const response = await ctx.client.sendRequest<lc.Position[]>(
18 'rust-analyzer/findMatchingBrace', 19 'rust-analyzer/findMatchingBrace',
19 request, 20 request,
20 ); 21 );
@@ -30,6 +31,6 @@ export function matchingBrace(ctx: Ctx): Cmd {
30} 31}
31 32
32interface FindMatchingBraceParams { 33interface FindMatchingBraceParams {
33 textDocument: TextDocumentIdentifier; 34 textDocument: lc.TextDocumentIdentifier;
34 offsets: Position[]; 35 offsets: lc.Position[];
35} 36}
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index efc0dfe1d..8324060e8 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -1,4 +1,5 @@
1import * as lc from 'vscode-languageclient'; 1import * as lc from 'vscode-languageclient';
2
2import { applySourceChange, SourceChange } from '../source_change'; 3import { applySourceChange, SourceChange } from '../source_change';
3import { Cmd, Ctx } from '../ctx'; 4import { Cmd, Ctx } from '../ctx';
4 5
diff --git a/editors/code/src/commands/parent_module.ts b/editors/code/src/commands/parent_module.ts
index d641181fa..258b61b21 100644
--- a/editors/code/src/commands/parent_module.ts
+++ b/editors/code/src/commands/parent_module.ts
@@ -1,6 +1,6 @@
1import * as vscode from 'vscode'; 1import * as vscode from 'vscode';
2
3import * as lc from 'vscode-languageclient'; 2import * as lc from 'vscode-languageclient';
3
4import { Ctx, Cmd } from '../ctx'; 4import { Ctx, Cmd } from '../ctx';
5 5
6export function parentModule(ctx: Ctx): Cmd { 6export function parentModule(ctx: Ctx): Cmd {