From b0bb0719c40bfba4e8bc74060b4f12832970e99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=81=E5=AE=81?= <383514580@qq.com> Date: Sun, 23 Feb 2020 02:37:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0"=F0=9F=A6=95?= =?UTF-8?q?=E5=9B=BE=E8=A7=A3=E6=AD=A3=E5=88=99"=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/showResultMessage.ts | 25 ++++++++++++++----------- src/useCommand.ts | 13 +++++++------ src/useQuickPick.ts | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/showResultMessage.ts b/src/showResultMessage.ts index 3d96e6b..1a5d7e2 100644 --- a/src/showResultMessage.ts +++ b/src/showResultMessage.ts @@ -6,12 +6,15 @@ const BUTTON_FEEDBACK = '🚀反馈问题'; const BUTTON_DIAGRAMMATIZE = '🦕图解正则'; const BUTTON_CANCEL = '关闭'; -export default function (title: string): void { +export default function (title: string, rule: string): void { // window.setStatusBarMessage(`已插入正则: "${title}", 点击查看更多🔥`) - window.showInformationMessage(`已插入正则: "${title}"`, BUTTON_FEEDBACK,BUTTON_CANCEL).then(value => { + window.showInformationMessage(`已插入正则: "${title}"`, BUTTON_DIAGRAMMATIZE, BUTTON_FEEDBACK, BUTTON_CANCEL).then(value => { if (BUTTON_FEEDBACK === value) { const URL = Uri.parse(genGithubIssueURL(title)); env.openExternal(URL); + } else if (BUTTON_DIAGRAMMATIZE === value) { + const URL = Uri.parse(`https://regexper.com/#${rule}`); + env.openExternal(URL); } }); } @@ -19,14 +22,14 @@ export default function (title: string): void { function genGithubIssueURL(title: string): string { const BASE_URL = 'https://github.com/any86/any-rule/issues/new'; const TITLE = `title=[vscode feedback] ${title}`; -// const BODY = `body=### vscode version -// ${version} -// ### extension version -// ${getExtensionVersion()} -// ### code language -// ${getCodeLanguage()} -// ### comment -// 请留言... -// `; + // const BODY = `body=### vscode version + // ${version} + // ### extension version + // ${getExtensionVersion()} + // ### code language + // ${getCodeLanguage()} + // ### comment + // 请留言... + // `; return BASE_URL + '?' + TITLE; } diff --git a/src/useCommand.ts b/src/useCommand.ts index 73cbee7..e05bc2a 100644 --- a/src/useCommand.ts +++ b/src/useCommand.ts @@ -1,10 +1,11 @@ -import {window,commands,Range,ExtensionContext} from "vscode"; +import { window, commands, Range, ExtensionContext } from "vscode"; import { Rule } from './interface'; import insertLog from './insertLog'; import showResultMessage from './showResultMessage'; export default function (context: ExtensionContext, RULES: Rule[]) { RULES.forEach(({ title, rule }, index) => { + const ruleString = String(rule); const disposable = commands.registerCommand(`extension.rule${index}`, () => { const editor = window.activeTextEditor; if (editor) { @@ -14,18 +15,18 @@ export default function (context: ExtensionContext, RULES: Rule[]) { selections.forEach(selection => { const { start, end } = selection; const range = new Range(start, end); - editBuilder.replace(range, String(rule)); + editBuilder.replace(range, ruleString); }); }); - + // 日志 insertLog({ - rule: String(rule), + rule: ruleString, title, method: 'Command' }); - - showResultMessage(title); + + showResultMessage(title, ruleString); } else { window.showWarningMessage('any-rule: 只有在编辑文本的时候才可以使用!'); } diff --git a/src/useQuickPick.ts b/src/useQuickPick.ts index 08cda89..c50384c 100644 --- a/src/useQuickPick.ts +++ b/src/useQuickPick.ts @@ -43,7 +43,7 @@ export default function (context: ExtensionContext, RULES: Rule[]) { title: item.label, method: 'QuickPick' }); - showResultMessage(item.label); + showResultMessage(item.label,item.rule); }); }, 10) return [];