mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-26 13:03:31 +00:00
Remove dead code
This commit is contained in:
Aleksey Kladov
parent
1527feb744
commit
4a013ec62d
4 changed files with 54 additions and 106 deletions
|
|
@ -3,8 +3,7 @@ import * as lc from 'vscode-languageclient';
|
||||||
import * as ra from '../rust-analyzer-api';
|
import * as ra from '../rust-analyzer-api';
|
||||||
|
|
||||||
import { Ctx, Cmd } from '../ctx';
|
import { Ctx, Cmd } from '../ctx';
|
||||||
import * as sourceChange from '../source_change';
|
import { applySnippetWorkspaceEdit } from '../snippets';
|
||||||
import { assert } from '../util';
|
|
||||||
|
|
||||||
export * from './analyzer_status';
|
export * from './analyzer_status';
|
||||||
export * from './matching_brace';
|
export * from './matching_brace';
|
||||||
|
|
@ -55,52 +54,3 @@ export function applySnippetWorkspaceEditCommand(_ctx: Ctx): Cmd {
|
||||||
await applySnippetWorkspaceEdit(edit);
|
await applySnippetWorkspaceEdit(edit);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function applySnippetWorkspaceEdit(edit: vscode.WorkspaceEdit) {
|
|
||||||
assert(edit.entries().length === 1, `bad ws edit: ${JSON.stringify(edit)}`);
|
|
||||||
const [uri, edits] = edit.entries()[0];
|
|
||||||
|
|
||||||
const editor = vscode.window.visibleTextEditors.find((it) => it.document.uri.toString() === uri.toString());
|
|
||||||
if (!editor) return;
|
|
||||||
|
|
||||||
let selection: vscode.Selection | undefined = undefined;
|
|
||||||
let lineDelta = 0;
|
|
||||||
await editor.edit((builder) => {
|
|
||||||
for (const indel of edits) {
|
|
||||||
const parsed = parseSnippet(indel.newText);
|
|
||||||
if (parsed) {
|
|
||||||
const [newText, [placeholderStart, placeholderLength]] = parsed;
|
|
||||||
const prefix = newText.substr(0, placeholderStart);
|
|
||||||
const lastNewline = prefix.lastIndexOf('\n');
|
|
||||||
|
|
||||||
const startLine = indel.range.start.line + lineDelta + countLines(prefix);
|
|
||||||
const startColumn = lastNewline === -1 ?
|
|
||||||
indel.range.start.character + placeholderStart
|
|
||||||
: prefix.length - lastNewline - 1;
|
|
||||||
const endColumn = startColumn + placeholderLength;
|
|
||||||
selection = new vscode.Selection(
|
|
||||||
new vscode.Position(startLine, startColumn),
|
|
||||||
new vscode.Position(startLine, endColumn),
|
|
||||||
);
|
|
||||||
builder.replace(indel.range, newText);
|
|
||||||
} else {
|
|
||||||
lineDelta = countLines(indel.newText) - (indel.range.end.line - indel.range.start.line);
|
|
||||||
builder.replace(indel.range, indel.newText);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (selection) editor.selection = selection;
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseSnippet(snip: string): [string, [number, number]] | undefined {
|
|
||||||
const m = snip.match(/\$(0|\{0:([^}]*)\})/);
|
|
||||||
if (!m) return undefined;
|
|
||||||
const placeholder = m[2] ?? "";
|
|
||||||
const range: [number, number] = [m.index!!, placeholder.length];
|
|
||||||
const insert = snip.replace(m[0], placeholder);
|
|
||||||
return [insert, range];
|
|
||||||
}
|
|
||||||
|
|
||||||
function countLines(text: string): number {
|
|
||||||
return (text.match(/\n/g) || []).length;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import * as vscode from 'vscode';
|
||||||
import * as ra from '../rust-analyzer-api';
|
import * as ra from '../rust-analyzer-api';
|
||||||
|
|
||||||
import { Cmd, Ctx } from '../ctx';
|
import { Cmd, Ctx } from '../ctx';
|
||||||
import { applySnippetWorkspaceEdit } from '.';
|
import { applySnippetWorkspaceEdit } from '../snippets';
|
||||||
|
|
||||||
async function handleKeypress(ctx: Ctx) {
|
async function handleKeypress(ctx: Ctx) {
|
||||||
const editor = ctx.activeRustEditor;
|
const editor = ctx.activeRustEditor;
|
||||||
|
|
|
||||||
52
editors/code/src/snippets.ts
Normal file
52
editors/code/src/snippets.ts
Normal file
|
|
@ -0,0 +1,52 @@
|
||||||
|
import * as vscode from 'vscode';
|
||||||
|
|
||||||
|
import { assert } from './util';
|
||||||
|
|
||||||
|
export async function applySnippetWorkspaceEdit(edit: vscode.WorkspaceEdit) {
|
||||||
|
assert(edit.entries().length === 1, `bad ws edit: ${JSON.stringify(edit)}`);
|
||||||
|
const [uri, edits] = edit.entries()[0];
|
||||||
|
|
||||||
|
const editor = vscode.window.visibleTextEditors.find((it) => it.document.uri.toString() === uri.toString());
|
||||||
|
if (!editor) return;
|
||||||
|
|
||||||
|
let selection: vscode.Selection | undefined = undefined;
|
||||||
|
let lineDelta = 0;
|
||||||
|
await editor.edit((builder) => {
|
||||||
|
for (const indel of edits) {
|
||||||
|
const parsed = parseSnippet(indel.newText);
|
||||||
|
if (parsed) {
|
||||||
|
const [newText, [placeholderStart, placeholderLength]] = parsed;
|
||||||
|
const prefix = newText.substr(0, placeholderStart);
|
||||||
|
const lastNewline = prefix.lastIndexOf('\n');
|
||||||
|
|
||||||
|
const startLine = indel.range.start.line + lineDelta + countLines(prefix);
|
||||||
|
const startColumn = lastNewline === -1 ?
|
||||||
|
indel.range.start.character + placeholderStart
|
||||||
|
: prefix.length - lastNewline - 1;
|
||||||
|
const endColumn = startColumn + placeholderLength;
|
||||||
|
selection = new vscode.Selection(
|
||||||
|
new vscode.Position(startLine, startColumn),
|
||||||
|
new vscode.Position(startLine, endColumn),
|
||||||
|
);
|
||||||
|
builder.replace(indel.range, newText);
|
||||||
|
} else {
|
||||||
|
lineDelta = countLines(indel.newText) - (indel.range.end.line - indel.range.start.line);
|
||||||
|
builder.replace(indel.range, indel.newText);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (selection) editor.selection = selection;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseSnippet(snip: string): [string, [number, number]] | undefined {
|
||||||
|
const m = snip.match(/\$(0|\{0:([^}]*)\})/);
|
||||||
|
if (!m) return undefined;
|
||||||
|
const placeholder = m[2] ?? "";
|
||||||
|
const range: [number, number] = [m.index!!, placeholder.length];
|
||||||
|
const insert = snip.replace(m[0], placeholder);
|
||||||
|
return [insert, range];
|
||||||
|
}
|
||||||
|
|
||||||
|
function countLines(text: string): number {
|
||||||
|
return (text.match(/\n/g) || []).length;
|
||||||
|
}
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
import * as vscode from 'vscode';
|
|
||||||
import * as lc from 'vscode-languageclient';
|
|
||||||
import * as ra from './rust-analyzer-api';
|
|
||||||
|
|
||||||
import { Ctx } from './ctx';
|
|
||||||
|
|
||||||
export async function applySourceChange(ctx: Ctx, change: ra.SourceChange) {
|
|
||||||
const client = ctx.client;
|
|
||||||
if (!client) return;
|
|
||||||
|
|
||||||
const wsEdit = client.protocol2CodeConverter.asWorkspaceEdit(
|
|
||||||
change.workspaceEdit,
|
|
||||||
);
|
|
||||||
let created;
|
|
||||||
let moved;
|
|
||||||
if (change.workspaceEdit.documentChanges) {
|
|
||||||
for (const docChange of change.workspaceEdit.documentChanges) {
|
|
||||||
if (lc.CreateFile.is(docChange)) {
|
|
||||||
created = docChange.uri;
|
|
||||||
} else if (lc.RenameFile.is(docChange)) {
|
|
||||||
moved = docChange.newUri;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const toOpen = created || moved;
|
|
||||||
const toReveal = change.cursorPosition;
|
|
||||||
await vscode.workspace.applyEdit(wsEdit);
|
|
||||||
if (toOpen) {
|
|
||||||
const toOpenUri = vscode.Uri.parse(toOpen);
|
|
||||||
const doc = await vscode.workspace.openTextDocument(toOpenUri);
|
|
||||||
await vscode.window.showTextDocument(doc);
|
|
||||||
} else if (toReveal) {
|
|
||||||
const uri = client.protocol2CodeConverter.asUri(
|
|
||||||
toReveal.textDocument.uri,
|
|
||||||
);
|
|
||||||
const position = client.protocol2CodeConverter.asPosition(
|
|
||||||
toReveal.position,
|
|
||||||
);
|
|
||||||
const editor = vscode.window.activeTextEditor;
|
|
||||||
if (!editor || !editor.selection.isEmpty) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (editor.document.uri !== uri) {
|
|
||||||
const doc = await vscode.workspace.openTextDocument(uri);
|
|
||||||
await vscode.window.showTextDocument(doc);
|
|
||||||
}
|
|
||||||
editor.selection = new vscode.Selection(position, position);
|
|
||||||
editor.revealRange(
|
|
||||||
new vscode.Range(position, position),
|
|
||||||
vscode.TextEditorRevealType.Default,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue