reorder tree view cmd items

fix lint

src/cmdTreeView/cmdStore.ts

@@ -26,37 +26,38 @@ export interface IDFCommandDescription {
 }
 
 export enum CommandKeys {
- Setup = "espIdf.setup.start",
  SelectCurrentIdfVersion = "espIdf.selectCurrentIdfVersion",
- Examples = "espIdf.examples.start",
- NewProject = "espIdf.newProject.start",
  pickWorkspace = "espIdf.pickAWorkspaceFolder",
  SelectSerialPort = "espIdf.selectPort",
  SetEspressifTarget = "espIdf.setTarget",
  SDKConfig = "espIdf.menuconfig.start",
  Build = "espIdf.buildDevice",
- Size = "espIdf.size",
  FullClean = "espIdf.fullClean",
  SelectFlashType = "espIdf.selectFlashMethodAndFlash",
  Flash = "espIdf.flashDevice",
- EraseFlash = "espIdf.eraseFlash",
  Monitor = "espIdf.monitorDevice",
  BuildFlashMonitor = "espIdf.buildFlashMonitor",
  Debug = "espIdf.debug",
  OpenOCD = "espIdf.openOCDCommand",
  IDFTerminal = "espIdf.createIdfTerminal",
- DoctorCommand = "espIdf.doctorCommand",
  CustomTask = "espIdf.customTask",
+ QemuServer = "espIdf.qemuCommand",
+ SelectProjectConfiguration = "espIdf.projectConf",
 }
 
 export enum AdvancedCommandKeys {
+ Setup = "espIdf.setup.start",
+ Examples = "espIdf.examples.start",
+ NewProject = "espIdf.newProject.start",
+ Size = "espIdf.size",
+ EraseFlash = "espIdf.eraseFlash",
+ DoctorCommand = "espIdf.doctorCommand",
  CreateFromIDFTemplate = "espIdf.createFiles",
  GetADF = "espIdf.getEspAdf",
  GetMDF = "espIdf.getEspMdf",
  GetEspMatter = "espIdf.getEspMatter",
  GetRainmaker = "espIdf.getEspRainmaker",
  ProjectConfEditor = "espIdf.projectConfigurationEditor",
- SelectProjectConfiguration = "espIdf.projectConf",
  InstallIdfPythonReqs = "espIdf.installPyReqs",
  InstallMatterPythonReqs = "espIdf.installEspMatterPyReqs",
  CreateVscodeFolder = "espIdf.createVsCodeFolder",
@@ -66,14 +67,43 @@ export enum AdvancedCommandKeys {
  UartFlash = "espIdf.flashUart",
  DfuFlash = "espIdf.flashDFU",
  WebsocketMonitor = "espIdf.launchWSServerAndMonitor",
- QemuServer = "espIdf.qemuCommand",
 }
 
 export function createAdvancedCommandDictionary(): Record<
  AdvancedCommandKeys,
  IDFCommandDescription
 > {
  return {
+ [AdvancedCommandKeys.Setup]: {
+ checkboxState: undefined,
+ iconId: "extensions",
+ tooltip: l10n.t("Configure ESP-IDF Extension"),
+ },
+ [AdvancedCommandKeys.Examples]: {
+ checkboxState: undefined,
+ iconId: "book",
+ tooltip: l10n.t("Show Examples"),
+ },
+ [AdvancedCommandKeys.NewProject]: {
+ checkboxState: undefined,
+ iconId: "add",
+ tooltip: l10n.t("New Project Wizard"),
+ },
+ [AdvancedCommandKeys.DoctorCommand]: {
+ checkboxState: undefined,
+ iconId: "bug",
+ tooltip: l10n.t("Doctor Command"),
+ },
+ [AdvancedCommandKeys.Size]: {
+ checkboxState: undefined,
+ iconId: "info",
+ tooltip: l10n.t("ESP-IDF Size"),
+ },
+ [AdvancedCommandKeys.EraseFlash]: {
+ checkboxState: undefined,
+ iconId: "close-all",
+ tooltip: l10n.t("Erase Flash"),
+ },
  [AdvancedCommandKeys.CreateFromIDFTemplate]: {
  checkboxState: undefined,
  iconId: "add",
@@ -104,14 +134,6 @@ export function createAdvancedCommandDictionary(): Record<
  iconId: "project",
  tooltip: l10n.t("Project Configuration editor"),
  },
- [AdvancedCommandKeys.SelectProjectConfiguration]: {
- checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
- AdvancedCommandKeys.SelectProjectConfiguration,
- TreeItemCheckboxState.Checked
- ),
- iconId: "versions",
- tooltip: l10n.t("Select Project Configuration"),
- },
  [AdvancedCommandKeys.InstallIdfPythonReqs]: {
  checkboxState: undefined,
  iconId: "extensions",
@@ -157,14 +179,6 @@ export function createAdvancedCommandDictionary(): Record<
  iconId: "device-desktop",
  tooltip: l10n.t("Launch Websocket server and IDF Monitor"),
  },
- [AdvancedCommandKeys.QemuServer]: {
- checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
- AdvancedCommandKeys.QemuServer,
- TreeItemCheckboxState.Checked
- ),
- iconId: "server-environment",
- tooltip: l10n.t("Start/Stop QEMU Server"),
- },
  };
 }
 
@@ -173,11 +187,6 @@ export function createCommandDictionary(): Record<
  IDFCommandDescription
 > {
  return {
- [CommandKeys.Setup]: {
- checkboxState: undefined,
- iconId: "extensions",
- tooltip: l10n.t("Configure ESP-IDF Extension"),
- },
  [CommandKeys.SelectCurrentIdfVersion]: {
  checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
  CommandKeys.SelectCurrentIdfVersion,
@@ -186,16 +195,6 @@ export function createCommandDictionary(): Record<
  iconId: "octoface",
  tooltip: l10n.t("Select current ESP-IDF version"),
  },
- [CommandKeys.Examples]: {
- checkboxState: undefined,
- iconId: "book",
- tooltip: l10n.t("Show Examples"),
- },
- [CommandKeys.NewProject]: {
- checkboxState: undefined,
- iconId: "add",
- tooltip: l10n.t("New Project Wizard"),
- },
  [CommandKeys.pickWorkspace]: {
  checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
  CommandKeys.pickWorkspace,
@@ -236,11 +235,6 @@ export function createCommandDictionary(): Record<
  iconId: "symbol-property",
  tooltip: l10n.t("Build Project"),
  },
- [CommandKeys.Size]: {
- checkboxState: undefined,
- iconId: "info",
- tooltip: l10n.t("ESP-IDF Size"),
- },
  [CommandKeys.FullClean]: {
  checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
  CommandKeys.FullClean,
@@ -265,11 +259,6 @@ export function createCommandDictionary(): Record<
  iconId: "zap",
  tooltip: l10n.t("Flash Device"),
  },
- [CommandKeys.EraseFlash]: {
- checkboxState: undefined,
- iconId: "close-all",
- tooltip: l10n.t("Erase Flash"),
- },
  [CommandKeys.Monitor]: {
  checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
  CommandKeys.Monitor,
@@ -310,11 +299,6 @@ export function createCommandDictionary(): Record<
  iconId: "terminal",
  tooltip: l10n.t("Open ESP-IDF Terminal"),
  },
- [CommandKeys.DoctorCommand]: {
- checkboxState: undefined,
- iconId: "bug",
- tooltip: l10n.t("Doctor Command"),
- },
  [CommandKeys.CustomTask]: {
  checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
  CommandKeys.CustomTask,
@@ -323,5 +307,21 @@ export function createCommandDictionary(): Record<
  iconId: "diff-renamed",
  tooltip: l10n.t("Execute Custom Task"),
  },
+ [CommandKeys.SelectProjectConfiguration]: {
+ checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
+ CommandKeys.SelectProjectConfiguration,
+ TreeItemCheckboxState.Checked
+ ),
+ iconId: "versions",
+ tooltip: l10n.t("Select Project Configuration"),
+ },
+ [CommandKeys.QemuServer]: {
+ checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
+ CommandKeys.QemuServer,
+ TreeItemCheckboxState.Checked
+ ),
+ iconId: "server-environment",
+ tooltip: l10n.t("Start/Stop QEMU Server"),
+ },
  };
 }

src/extension.ts

@@ -52,10 +52,7 @@ import {
 import { SystemViewResultParser } from "./espIdf/tracing/system-view";
 import { Telemetry } from "./telemetry";
 import { ESPRainMakerTreeDataProvider } from "./rainmaker";
-import {
- CommandItem,
- CommandsProvider,
-} from "./cmdTreeView/cmdTreeDataProvider";
+import { CommandsProvider } from "./cmdTreeView/cmdTreeDataProvider";
 import { RainmakerAPIClient } from "./rainmaker/client";
 import { ESP } from "./config";
 import { PromptUserToLogin } from "./rainmaker/view/login";
@@ -101,7 +98,6 @@ import {
 import { generateConfigurationReport } from "./support";
 import { initializeReportObject } from "./support/initReportObj";
 import { writeTextReport } from "./support/writeReport";
-import { kill } from "process";
 import { getNewProjectArgs } from "./newProject/newProjectInit";
 import { NewProjectPanel } from "./newProject/newProjectPanel";
 import { buildCommand } from "./build/buildCmd";
@@ -160,12 +156,7 @@ import {
  createStatusBarItem,
  statusBarItems,
 } from "./statusBar";
-import {
- AdvancedCommandKeys,
- CommandKeys,
- createAdvancedCommandDictionary,
- createCommandDictionary,
-} from "./cmdTreeView/cmdStore";
+import { CommandKeys, createCommandDictionary } from "./cmdTreeView/cmdStore";
 
 // Global variables shared by commands
 let workspaceRoot: vscode.Uri;
@@ -279,8 +270,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
  openOCDManager = OpenOCDManager.init();
  qemuManager = QemuManager.init();
-
- const advancedCommandDictionary = createAdvancedCommandDictionary();
  const commandDictionary = createCommandDictionary();
 
  // Register Tree Provider for IDF Explorer
@@ -1093,18 +1082,12 @@ export async function activate(context: vscode.ExtensionContext) {
  }
  statusBarItems["projectConf"] = createStatusBarItem(
  `$(${
- advancedCommandDictionary[
- AdvancedCommandKeys.SelectProjectConfiguration
- ].iconId
+ commandDictionary[CommandKeys.SelectProjectConfiguration].iconId
  }) ${option.target}`,
- advancedCommandDictionary[
- AdvancedCommandKeys.SelectProjectConfiguration
- ].tooltip,
- AdvancedCommandKeys.SelectProjectConfiguration,
+ commandDictionary[CommandKeys.SelectProjectConfiguration].tooltip,
+ CommandKeys.SelectProjectConfiguration,
  99,
- advancedCommandDictionary[
- AdvancedCommandKeys.SelectProjectConfiguration
- ].checkboxState
+ commandDictionary[CommandKeys.SelectProjectConfiguration].checkboxState
  );
  await getIdfTargetFromSdkconfig(workspaceRoot, statusBarItems["target"]);
  });

src/qemu/qemuManager.ts

@@ -2,13 +2,13 @@
  * Project: ESP-IDF VSCode Extension
  * File Created: Wednesday, 30th June 2021 6:53:16 pm
  * Copyright 2021 Espressif Systems (Shanghai) CO LTD
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,8 +33,8 @@ import { Logger } from "../logger/logger";
 import { appendIdfAndToolsToPath, isBinInPath, PreCheck } from "../utils";
 import { statusBarItems } from "../statusBar";
 import {
- AdvancedCommandKeys,
- createAdvancedCommandDictionary,
+ CommandKeys,
+ createCommandDictionary,
 } from "../cmdTreeView/cmdStore";
 
 export interface IQemuOptions {
@@ -241,12 +241,12 @@ export class QemuManager extends EventEmitter {
  1005
  );
  this._statusBarItem.text = "[ESP-IDF: QEMU]";
- const advancedCommandDictionary = createAdvancedCommandDictionary();
+ const commandDictionary = createCommandDictionary();
  this._statusBarItem.tooltip =
- advancedCommandDictionary[AdvancedCommandKeys.QemuServer].tooltip;
- this._statusBarItem.command = AdvancedCommandKeys.QemuServer;
+ commandDictionary[CommandKeys.QemuServer].tooltip;
+ this._statusBarItem.command = CommandKeys.QemuServer;
  if (
- advancedCommandDictionary[AdvancedCommandKeys.QemuServer]
+ commandDictionary[CommandKeys.QemuServer]
  .checkboxState === TreeItemCheckboxState.Checked
  ) {
  this._statusBarItem.show();

src/statusBar/index.ts

@@ -28,12 +28,7 @@ import { getCurrentIdfSetup } from "../versionSwitcher";
 import { readParameter } from "../idfConfiguration";
 import { ESP } from "../config";
 import { CommandItem } from "../cmdTreeView/cmdTreeDataProvider";
-import {
- AdvancedCommandKeys,
- CommandKeys,
- createAdvancedCommandDictionary,
- createCommandDictionary,
-} from "../cmdTreeView/cmdStore";
+import { CommandKeys, createCommandDictionary } from "../cmdTreeView/cmdStore";
 
 export const statusBarItems: { [key: string]: StatusBarItem } = {};
 
@@ -53,7 +48,6 @@ export function updateStatusBarItemVisibility(cmdItem: CommandItem) {
 }
 
 export async function createCmdsStatusBarItems(workspaceFolder: Uri) {
- const advancedCommandDictionary = createAdvancedCommandDictionary();
  const commandDictionary = createCommandDictionary();
  const enableStatusBar = readParameter("idf.enableStatusBar") as boolean;
  if (!enableStatusBar) {
@@ -99,15 +93,12 @@ export async function createCmdsStatusBarItems(workspaceFolder: Uri) {
  if (projectConf) {
  statusBarItems["projectConf"] = createStatusBarItem(
  `$(${
- advancedCommandDictionary[
- AdvancedCommandKeys.SelectProjectConfiguration
- ].iconId
+ commandDictionary[CommandKeys.SelectProjectConfiguration].iconId
  }) ${projectConf}`,
- advancedCommandDictionary[AdvancedCommandKeys.SelectProjectConfiguration]
- .tooltip,
- AdvancedCommandKeys.SelectProjectConfiguration,
+ commandDictionary[CommandKeys.SelectProjectConfiguration].tooltip,
+ CommandKeys.SelectProjectConfiguration,
  99,
- advancedCommandDictionary[AdvancedCommandKeys.SelectProjectConfiguration].checkboxState
+ commandDictionary[CommandKeys.SelectProjectConfiguration].checkboxState
  );
  }