feat: 优化了搜索文案入口

alibaba · Apr 16, 2024 · b6ae95d · b6ae95d
1 parent 6e3161a
commit b6ae95d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/kiwi-linter/package.json b/kiwi-linter/package.json
@@ -88,6 +88,10 @@
  "command": "vscode-i18n-linter.findAllI18N",
  "title": "Search inside All Files for I18N Strings"
  },
+ {
+ "command": "vscode-i18n-linter.searchI18N",
+ "title": "Search I18N Strings inside Current File or All Files "
+ },
  {
  "command": "vscode-i18n-linter.kiwigo",
  "title": "Kiwi Go!"

diff --git a/kiwi-linter/src/const.ts b/kiwi-linter/src/const.ts
@@ -62,4 +62,15 @@ const I18N_GLOB = `${LANG_PREFIX}**/*.ts`;
 /** unicode cjk 中日韩文 范围 */
 const DOUBLE_BYTE_REGEX = /[\u4E00-\u9FFF]/g;
 
-export { LANG_PREFIX, I18N_GLOB, DOUBLE_BYTE_REGEX, DIR_ADAPTOR };
+const KiwiSearchTypes = [
+ {
+ label: '在当前文件中搜索',
+ description: 'cmd+ctrl+f'
+ },
+ {
+ label: '全局搜索',
+ description: 'cmd+ctrl+r'
+ }
+];
+
+export { LANG_PREFIX, I18N_GLOB, DOUBLE_BYTE_REGEX, DIR_ADAPTOR, KiwiSearchTypes };
diff --git a/kiwi-linter/src/extension.ts b/kiwi-linter/src/extension.ts
@@ -7,7 +7,7 @@ import * as _ from 'lodash';
 import * as fs from 'fs-extra';
 import { UI } from './ui';
 import { getSuggestLangObj } from './getLangData';
-import { DIR_ADAPTOR } from './const';
+import { DIR_ADAPTOR, KiwiSearchTypes } from './const';
 import { findAllI18N, findI18N } from './findAllI18N';
 import { triggerUpdateDecorations } from './chineseCharDecorations';
 import { TargetStr, TranslateAPiEnum } from './define';
@@ -51,6 +51,16 @@ export function activate(context: vscode.ExtensionContext) {
  }
  });
 
+ vscode.commands.registerCommand('vscode-i18n-linter.searchI18N', () => {
+ vscode.window.showQuickPick(KiwiSearchTypes).then(val => {
+ if (val.label === '在当前文件中搜索') {
+ findI18N();
+ } else {
+ findAllI18N();
+ }
+ });
+ });
+
  console.log('Congratulations, your extension "kiwi-linter" is now active!');
  context.subscriptions.push(vscode.commands.registerCommand('vscode-i18n-linter.findAllI18N', findAllI18N));
  let targetStrs: TargetStr[] = [];

diff --git a/kiwi-linter/src/ui.ts b/kiwi-linter/src/ui.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 
 export class UI {
- /** 全局搜索文案 */
- searchAllBar: vscode.StatusBarItem;
+ /** 文案搜索入口 */
+ searchBar: vscode.StatusBarItem;
  /** 批量提取当前文件中的所有文案 */
  kiwiGoBar: vscode.StatusBarItem;
  /** 切换翻译源 */
@@ -17,19 +17,19 @@ export class UI {
  // 创建状态栏按钮
  this.switchTranslateOriginBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
  this.kiwiGoBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
- this.searchAllBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
+ this.searchBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
  // 为按钮绑定注册的command名称
- this.searchAllBar.command = 'vscode-i18n-linter.findAllI18N';
+ this.searchBar.command = 'vscode-i18n-linter.searchI18N';
  this.kiwiGoBar.command = 'vscode-i18n-linter.kiwigo';
  this.switchTranslateOriginBar.command = 'vscode-i18n-linter.switchTranslateApi';
  }
 
  init = translateApi => {
  // 全局搜索文案
- this.searchAllBar.text = `$(search) KiwiSearch`;
- this.searchAllBar.color = '#fff';
- this.searchAllBar.tooltip = 'Kiwi - 全局搜索中文文案';
- this.searchAllBar.show();
+ this.searchBar.text = `$(search) KiwiSearch`;
+ this.searchBar.color = '#fff';
+ this.searchBar.tooltip = 'Kiwi - 搜索中文文案';
+ this.searchBar.show();
 
  // 批量提取当前文件中的所有文案
  this.kiwiGoBar.text = 'KiwiGo';