From 4a013ec62d2dfacaf6010b08c96947aa38481721 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 25 May 2020 10:59:54 +0200
Subject: Remove dead code

---
 editors/code/src/commands/index.ts    | 52 +----------------------------------
 editors/code/src/commands/on_enter.ts |  2 +-
 2 files changed, 2 insertions(+), 52 deletions(-)

(limited to 'editors/code/src/commands')

diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index c2a232d5f..1ed8258d8 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -3,8 +3,7 @@ import * as lc from 'vscode-languageclient';
 import * as ra from '../rust-analyzer-api';
 
 import { Ctx, Cmd } from '../ctx';
-import * as sourceChange from '../source_change';
-import { assert } from '../util';
+import { applySnippetWorkspaceEdit } from '../snippets';
 
 export * from './analyzer_status';
 export * from './matching_brace';
@@ -55,52 +54,3 @@ export function applySnippetWorkspaceEditCommand(_ctx: Ctx): Cmd {
         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;
-}
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index a7871c31e..0e4769633 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import * as ra from '../rust-analyzer-api';
 
 import { Cmd, Ctx } from '../ctx';
-import { applySnippetWorkspaceEdit } from '.';
+import { applySnippetWorkspaceEdit } from '../snippets';
 
 async function handleKeypress(ctx: Ctx) {
     const editor = ctx.activeRustEditor;
-- 
cgit v1.2.3