Skip to content

Commit 1be0085

Browse files
github0nullgithub0null
committed
move some cmds to submenu
1 parent b957d89 commit 1be0085

4 files changed

Lines changed: 57 additions & 36 deletions

File tree

‎package.json‎

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -673,12 +673,12 @@
673673
"title": "Show All Symbols"
674674
},
675675
{
676-
"command": "_cl.eide.project.cppcheck.check_all",
677-
"title": "%eide.project.run.cppcheck%"
676+
"command": "_cl.eide.project.static-check.cppcheck",
677+
"title": "%eide.prj.menus.sub.static-check.cppcheck%"
678678
},
679679
{
680-
"command": "_cl.eide.project.cppcheck.clear_all",
681-
"title": "%eide.project.clear.cppcheck%"
680+
"command": "_cl.eide.project.static-check.clear",
681+
"title": "%eide.prj.menus.sub.static-check.clear%"
682682
},
683683
{
684684
"command": "_cl.eide.project.source.modify.exclude_list",
@@ -1074,11 +1074,21 @@
10741074
"when": "cl.eide.projectActived && !isInDiffEditor"
10751075
},
10761076
{
1077-
"command": "_cl.eide.project.cppcheck.check_all",
1077+
"command": "_cl.eide.project.static-check.cppcheck",
10781078
"key": "ctrl+alt+c",
10791079
"when": "cl.eide.projectActived"
10801080
}
10811081
],
1082+
"submenus": [
1083+
{
1084+
"id": "_cl.eide.menu/ui/project/static-check",
1085+
"label": "%eide.prj.menus.main.static-check%"
1086+
},
1087+
{
1088+
"id": "_cl.eide.menu/ui/project/export",
1089+
"label": "%eide.prj.menus.main.export%"
1090+
}
1091+
],
10821092
"menus": {
10831093
"view/title": [
10841094
{
@@ -1264,25 +1274,13 @@
12641274
"group": "6_group"
12651275
},
12661276
{
1267-
"command": "_cl.eide.project.exportAsTemplate",
1268-
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1277+
"submenu": "_cl.eide.menu/ui/project/export",
12691278
"group": "9_group"
12701279
},
12711280
{
1272-
"command": "_cl.eide.project.exportXml",
1273-
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1274-
"group": "9_group"
1275-
},
1276-
{
1277-
"command": "_cl.eide.project.cppcheck.check_all",
1278-
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1281+
"submenu": "_cl.eide.menu/ui/project/static-check",
12791282
"group": "z_group0@0"
12801283
},
1281-
{
1282-
"command": "_cl.eide.project.cppcheck.clear_all",
1283-
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1284-
"group": "z_group0@1"
1285-
},
12861284

12871285

12881286
{
@@ -1540,6 +1538,30 @@
15401538
"group": "inline",
15411539
"when": "viewItem == ACTIVED_GROUP && view == cl.eide.view.projects"
15421540
}
1541+
],
1542+
"_cl.eide.menu/ui/project/export": [
1543+
{
1544+
"command": "_cl.eide.project.exportAsTemplate",
1545+
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1546+
"group": "9_group"
1547+
},
1548+
{
1549+
"command": "_cl.eide.project.exportXml",
1550+
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1551+
"group": "9_group"
1552+
}
1553+
],
1554+
"_cl.eide.menu/ui/project/static-check": [
1555+
{
1556+
"command": "_cl.eide.project.static-check.cppcheck",
1557+
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1558+
"group": "z_group0@0"
1559+
},
1560+
{
1561+
"command": "_cl.eide.project.static-check.clear",
1562+
"when": "viewItem == SOLUTION && view == cl.eide.view.projects",
1563+
"group": "z_group1@1"
1564+
}
15431565
]
15441566
},
15451567
"snippets": [

‎package.nls.json‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"eide.project.save.all": "Save All Projects",
2121
"eide.project.active": "Active Project",
2222
"eide.project.close": "Close Project",
23-
"eide.project.export.template": "Export Eide Project Template",
24-
"eide.project.export.keil": "Export Keil Project",
23+
"eide.project.export.template": "Eide Project Template",
24+
"eide.project.export.keil": "Keil Project",
2525
"eide.project.show.commands": "Show Compiler CommandLine",
2626
"eide.project.switch.target": "Switch Target",
2727
"eide.project.build": "Build",
@@ -34,12 +34,11 @@
3434
"eide.project.import.ext.project.src.struct": "Import SourceFile Tree From Other Project",
3535
"eide.project.generate_builder_params": "Generate builder.params",
3636

37-
"eide.prj.menus.main.cppcheck": "Static Check",
38-
"eide.prj.menus.sub.cppcheck.run": "Check Project by Cppcheck",
39-
"eide.prj.menus.sub.cppcheck.clear": "Clear Cppcheck Diagnostic Informations",
37+
"eide.prj.menus.main.static-check": "Static Check",
38+
"eide.prj.menus.sub.static-check.cppcheck": "Run Cppcheck",
39+
"eide.prj.menus.sub.static-check.clear": "Clear Diagnostic Informations",
40+
4041
"eide.prj.menus.main.export": "Export As ...",
41-
"eide.prj.menus.main.export.keil": "Keil Project",
42-
"eide.prj.menus.main.export.eide": "Eide Project Template",
4342

4443
"eide.workspace.build": "Build All",
4544
"eide.workspace.rebuild": "Rebuild All",
@@ -73,9 +72,6 @@
7372

7473
"eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
7574
"eide.source.show.disassembly": "Show Disassembly",
76-
"eide.source.run.cppcheck": "Cppcheck This File",
77-
"eide.project.run.cppcheck": "Cppcheck Project",
78-
"eide.project.clear.cppcheck": "Clear Cppcheck Diagnostic Informations",
7975

8076
"eide.package.install": "Install CMSIS Chip Package",
8177
"eide.package.install.cmsis": "Install CMSIS Header Files",

‎package.nls.zh-CN.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"eide.project.save.all": "保存所有项目",
2121
"eide.project.active": "设为活动",
2222
"eide.project.close": "关闭项目",
23-
"eide.project.export.template": "导出 EIDE 模板",
24-
"eide.project.export.keil": "导出 Keil 项目",
23+
"eide.project.export.template": "EIDE 模板",
24+
"eide.project.export.keil": "Keil 项目",
2525
"eide.project.show.commands": "查看生成的编译器命令行",
2626
"eide.project.switch.target": "切换目标",
2727
"eide.project.build": "构建",
@@ -34,6 +34,12 @@
3434
"eide.project.import.ext.project.src.struct": "从其他 IDE 的项目中导入源文件树",
3535
"eide.project.generate_builder_params": "生成 builder.params",
3636

37+
"eide.prj.menus.main.static-check": "静态检查",
38+
"eide.prj.menus.sub.static-check.cppcheck": "执行 Cppcheck",
39+
"eide.prj.menus.sub.static-check.clear": "清除诊断结果",
40+
41+
"eide.prj.menus.main.export": "导出为 ...",
42+
3743
"eide.workspace.build": "构建所有项目",
3844
"eide.workspace.rebuild": "重新构建所有项目",
3945
"eide.workspace.open.config": "打开工作区配置",
@@ -66,9 +72,6 @@
6672

6773
"eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
6874
"eide.source.show.disassembly": "查看反汇编",
69-
"eide.source.run.cppcheck": "使用 Cppcheck 进行检查",
70-
"eide.project.run.cppcheck": "使用 Cppcheck 检查项目",
71-
"eide.project.clear.cppcheck": "清除 Cppcheck 诊断信息",
7275

7376
"eide.package.install": "安装 CMSIS 芯片支持包",
7477
"eide.package.install.cmsis": "安装 CMSIS 头文件",

‎src/extension.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ export async function activate(context: vscode.ExtensionContext) {
249249
// other project tools
250250
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.show_disassembly', (url) => projectExplorer.showDisassembly(url)));
251251
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.show_cmsis_config_wizard', (url) => projectExplorer.showCmsisConfigWizard(url)));
252-
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.cppcheck.check_all', (item) => projectExplorer.cppcheckProject(item)));
253-
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.cppcheck.clear_all', (item) => projectExplorer.clearCppcheckDiagnostic()));
252+
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.static-check.cppcheck', (item) => projectExplorer.cppcheckProject(item)));
253+
subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.static-check.clear', (item) => projectExplorer.clearCppcheckDiagnostic()));
254254
//subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.cppcheck.check_file', (url) => projectExplorer.cppcheckFile(url)));
255255

256256
operationExplorer.on('request_open_project', (fsPath) => projectExplorer.emit('request_open_project', fsPath));

0 commit comments

Comments
 (0)