diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts
index 830e40e8f9..b2b624b75a 100644
--- a/editors/code/src/commands/analyzer_status.ts
+++ b/editors/code/src/commands/analyzer_status.ts
@@ -1,4 +1,5 @@
 import * as vscode from 'vscode';
+
 import { Ctx, Cmd } from '../ctx';
 // Shows status of rust-analyzer (for debugging)
 
diff --git a/editors/code/src/commands/join_lines.ts b/editors/code/src/commands/join_lines.ts
index e906759c1c..f4f902cf96 100644
--- a/editors/code/src/commands/join_lines.ts
+++ b/editors/code/src/commands/join_lines.ts
@@ -1,4 +1,5 @@
-import { Range, TextDocumentIdentifier } from 'vscode-languageclient';
+import * as lc from 'vscode-languageclient';
+
 import { Ctx, Cmd } from '../ctx';
 import { applySourceChange, SourceChange } from '../source_change';
 
@@ -20,6 +21,6 @@ export function joinLines(ctx: Ctx): Cmd {
 }
 
 interface JoinLinesParams {
-    textDocument: TextDocumentIdentifier;
-    range: Range;
+    textDocument: lc.TextDocumentIdentifier;
+    range: lc.Range;
 }
diff --git a/editors/code/src/commands/matching_brace.ts b/editors/code/src/commands/matching_brace.ts
index a3febc5f42..59c253f886 100644
--- a/editors/code/src/commands/matching_brace.ts
+++ b/editors/code/src/commands/matching_brace.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode';
-import { Position, TextDocumentIdentifier } from 'vscode-languageclient';
+import * as lc from 'vscode-languageclient';
+
 import { Ctx, Cmd } from '../ctx';
 
 export function matchingBrace(ctx: Ctx): Cmd {
@@ -14,7 +15,7 @@ export function matchingBrace(ctx: Ctx): Cmd {
                 ctx.client.code2ProtocolConverter.asPosition(s.active),
             ),
         };
-        const response = await ctx.client.sendRequest<Position[]>(
+        const response = await ctx.client.sendRequest<lc.Position[]>(
             'rust-analyzer/findMatchingBrace',
             request,
         );
@@ -30,6 +31,6 @@ export function matchingBrace(ctx: Ctx): Cmd {
 }
 
 interface FindMatchingBraceParams {
-    textDocument: TextDocumentIdentifier;
-    offsets: Position[];
+    textDocument: lc.TextDocumentIdentifier;
+    offsets: lc.Position[];
 }
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index efc0dfe1d1..8324060e88 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -1,4 +1,5 @@
 import * as lc from 'vscode-languageclient';
+
 import { applySourceChange, SourceChange } from '../source_change';
 import { Cmd, Ctx } from '../ctx';
 
diff --git a/editors/code/src/commands/parent_module.ts b/editors/code/src/commands/parent_module.ts
index d641181fa8..258b61b21f 100644
--- a/editors/code/src/commands/parent_module.ts
+++ b/editors/code/src/commands/parent_module.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
-
 import * as lc from 'vscode-languageclient';
+
 import { Ctx, Cmd } from '../ctx';
 
 export function parentModule(ctx: Ctx): Cmd {