Skip to content
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
1d94f5b
menuconfig test new vscode tree
brianignacio5 May 16, 2025
2c0d571
refactor checkbox
brianignacio5 Jun 10, 2025
7e486ec
add select component
brianignacio5 Jun 11, 2025
9bef262
update checkbox smaller code
brianignacio5 Jun 11, 2025
9027af0
add int component
brianignacio5 Jun 11, 2025
8e37272
add string and hex components
brianignacio5 Jun 11, 2025
bbcf648
update menu title style
brianignacio5 Jun 11, 2025
891d1de
add settings tree rm vscode elements dependency
brianignacio5 Jun 13, 2025
de892d7
update menuconfig search bar
brianignacio5 Jun 16, 2025
8f03c05
add vscode style in new project wizard
brianignacio5 Jun 16, 2025
a8d13f1
update troubleshoot form
brianignacio5 Jun 16, 2025
e377f2b
project config editor updates
brianignacio5 Jun 16, 2025
41dca28
update cmakelists editor ui
brianignacio5 Jun 16, 2025
c0e4fa0
tracing
brianignacio5 Jun 17, 2025
099558c
size changes
brianignacio5 Jun 17, 2025
2e99a1b
partition table
brianignacio5 Jun 17, 2025
2c7a955
nvs partition table
brianignacio5 Jun 18, 2025
33beba4
update welcome page
brianignacio5 Jun 19, 2025
0010d2e
rm examples
brianignacio5 Jun 19, 2025
936eacf
remove example panel
brianignacio5 Jun 20, 2025
0c72d62
fix welcome panel replace description
brianignacio5 Jun 20, 2025
02f9808
fix sanitize html input
brianignacio5 Jun 20, 2025
acee60c
rm examples ui code
brianignacio5 Jun 20, 2025
511dfc2
fix ui create project test
brianignacio5 Jun 20, 2025
13139f2
update extractPlainText
brianignacio5 Jun 20, 2025
9890bfc
fix data config id in string input
brianignacio5 Jun 20, 2025
fbcea6b
add missing data-config-id tags
brianignacio5 Jun 20, 2025
760129b
add open folder in create test component test
brianignacio5 Jun 20, 2025
9c7ce6f
dismiss notifications test component
brianignacio5 Jun 23, 2025
7a872ac
increase timeout
brianignacio5 Jun 23, 2025
b908b78
test using notification action
brianignacio5 Jun 23, 2025
0dbf10c
update ui workflow to see screenshots
brianignacio5 Jun 24, 2025
b58c24c
update vscode extension tester
brianignacio5 Jun 24, 2025
83777c3
use specific vscode version
brianignacio5 Jun 24, 2025
1124129
update advanced configured test
brianignacio5 Jun 24, 2025
6c063c4
update advanced expect
brianignacio5 Jun 24, 2025
6e56bab
use min version extension tester
brianignacio5 Jun 24, 2025
8530723
test basename
brianignacio5 Jun 24, 2025
e56a313
dirname instead
brianignacio5 Jun 24, 2025
0f99ce4
update testWorkspace to minimal project
brianignacio5 Jun 24, 2025
bd037de
update idf installed msg logic
brianignacio5 Jun 24, 2025
2422487
update msg installed logic
brianignacio5 Jun 24, 2025
0b66875
rm display none for espidf status
brianignacio5 Jun 24, 2025
d74ed4d
rm unnecesary changes
brianignacio5 Jun 24, 2025
f26f6b8
clean and check doc cmd output
brianignacio5 Jun 24, 2025
65a4b63
add env vars in workflow
brianignacio5 Jun 24, 2025
b2c0ffe
switch back from new project webview
brianignacio5 Jun 24, 2025
0534c6b
update menuconfig string test element
brianignacio5 Jun 24, 2025
89f8647
fix tests
brianignacio5 Jun 24, 2025
e0321e5
add warn message for reload nvs webview
brianignacio5 Jun 30, 2025
4c37beb
fix lint
brianignacio5 Jun 30, 2025
972dda9
ui changes for menuconfig and welcome page
brianignacio5 Jul 2, 2025
999131f
rm node modules codicon reference
brianignacio5 Jul 7, 2025
9fe0358
fix settings tree this ref
brianignacio5 Jul 7, 2025
0c8f09d
rm create from templates cmd, add new project created page with open …
brianignacio5 Jul 7, 2025
cf31356
update docs remove show examples command
brianignacio5 Jul 8, 2025
db331ee
collapsed items menuconfig newProject update partitionTable errors
brianignacio5 Jul 9, 2025
15b0389
add error modal for nvs partition editor
brianignacio5 Jul 9, 2025
22d4d1d
fix close icon not shown in cmakelists editor
brianignacio5 Jul 9, 2025
d7285e1
fix partition table unit tests update new project ui test
brianignacio5 Jul 10, 2025
9210530
fix create blink example duplicated button click
brianignacio5 Jul 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions .github/workflows/ui-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,36 @@ jobs:
with:
submodules: "recursive"

- name: Run ui test
uses: ./.github/actions/idf
id: idfuitest
- name: Install ESP-IDF
run: |
ESP_IDF_VERSION="v5.3.2"
sudo apt update
sudo apt install -y python3-pip git wget flex bison gperf python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util
wget https://dl.espressif.com/github_assets/espressif/esp-idf/releases/download/${ESP_IDF_VERSION}/esp-idf-${ESP_IDF_VERSION}.zip -O esp-idf.zip
unzip esp-idf.zip -d ~/
rm esp-idf.zip
mv ~/esp-idf-${ESP_IDF_VERSION} ~/esp-idf
~/esp-idf/install.sh

- name: Setup Node.js
uses: actions/setup-node@v4
with:
run: /ui-entrypoint.sh
node-version: '20'

- name: See if screenshots are generated
if: failure()
run: ls /github/workspace/test-resources/screenshots
- name: Install Yarn dependencies
run: |
yarn
yarn install

- name: Run Yarn script with xvfb
run: |
export IDF_TOOLS_PATH=~/.espressif
export IDF_PATH=~/esp-idf
source ~/esp-idf/export.sh && xvfb-run --auto-servernum yarn ci-test

- name: Upload screenshots
uses: actions/upload-artifact@v4
if: failure()
with:
name: screenshots
path: /github/workspace/test-resources/screenshots
path: /home/runner/work/vscode-esp-idf-extension/vscode-esp-idf-extension/test-resources/screenshots
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,6 @@ Press <kbd>F1</kbd> or click menu `View` -> `Command Palette...` to show Visual
<td></td>
<td></td>
</tr>
<tr>
<td>Create Project from Extension Template</td>
<td>Create an ESP-IDF project using one of the extension template projects.</td>
<td><kbd>⌘</kbd> <kbd>I</kbd> <kbd>C</kbd></td>
<td><kbd>Ctrl</kbd> <kbd>E</kbd> <kbd>C</kbd></td>
</tr>
<tr>
<td>Create New ESP-IDF Component</td>
<td>Create a new component in the current directory based on ESP-IDF component template.</td>
Expand Down Expand Up @@ -563,7 +557,7 @@ See an example in the [debugging](https://docs.espressif.com/projects/vscode-esp

## Available Tasks in `tasks.json`

A template `tasks.json` is included when creating a project using **ESP-IDF: Create Project from Extension Template**. These tasks can be executed by pressing <kbd>F1</kbd>, writing `Tasks: Run task` and selecting one of the following:
A template `tasks.json` is included when creating a project using **ESP-IDF: New Project**. These tasks can be executed by pressing <kbd>F1</kbd>, writing `Tasks: Run task` and selecting one of the following:

1. `Build` - Build Project
2. `Set Target to esp32`
Expand Down
1 change: 0 additions & 1 deletion docs/LANG_CONTRIBUTE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Each file has a key value structure such as:

```json
{
"espIdf.createFiles.title": "ESP-IDF: Create ESP-IDF Project from Extension Template",
"englishTextOrTextId": "translationInNewLanguage"
}
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ For more information, refer to `ESP Component Registry Documentation <https://do
Install Arduino-ESP32 as Component
----------------------------------

The ``ESP-IDF: Add Arduino-ESP32 as ESP-IDF Component`` command adds `Arduino-ESP32 <https://github.com/espressif/arduino-esp32>`_ as an ESP-IDF component in your current directory (``${CURRENT_DIRECTORY}/components/arduino``). You can also use the ``ESP-IDF: Create Project from Extension Template`` command with the ``arduino-as-component`` template to create a new project directory that includes Arduino-ESP32 as an ESP-IDF component.
The ``ESP-IDF: Add Arduino-ESP32 as ESP-IDF Component`` command adds `Arduino-ESP32 <https://github.com/espressif/arduino-esp32>`_ as an ESP-IDF component in your current directory (``${CURRENT_DIRECTORY}/components/arduino``).

.. note::

Expand Down
2 changes: 1 addition & 1 deletion docs_espressif/en/additionalfeatures/qemu.rst
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Show examples command was removed correct? Should be removed on the qemu.rst file as well. Note that the "New Project" command should refer to "New Project Wizard".

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ESP-IDF setup can include a fork of `Espressif QEMU fork <https://github.com/esp
Development steps:

1. Prepare a project folder in a container based on the dockerfile in the templates ``.devcontainer`` directory in this repository. For this you can:
- Create a project using **ESP-IDF: New Project**, **ESP-IDF: Show Examples Projects** or **ESP-IDF: Create Project from Extension Template** command which will include the ``.devcontainer`` directory.
- Create a project using **ESP-IDF: New Project**, **ESP-IDF: Show Examples Projects** command which will include the ``.devcontainer`` directory.
- Use the **ESP-IDF: Add Docker Container Configuration** command to add the ``.devcontainer`` files to the currently opened project directory.
2. Use the **Remote Containers: Open Folder in Container..** command to open the folder within the container.
3. The **Remote Containers** will build the container from the Dockerfile (if it has not been created before) and install this extension on the container.
Expand Down
2 changes: 0 additions & 2 deletions docs_espressif/en/commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ All commands start with ``ESP-IDF:``.
- Set required values in your project SDKConfig to enable code coverage analysis.
* - Configure project for ESP-Clang
- Configure the current ESP-IDF project to use esp-clang as toolchain to use and configure LLVM Clang extension in settings.json.
* - Create Project from Extension Template
- Create an ESP-IDF project using one of the extension template projects.
* - Create New ESP-IDF Component
- Create a new component in the current directory based on ESP-IDF component template.
* - Dispose of Current SDK Configuration Editor Server Process
Expand Down
2 changes: 0 additions & 2 deletions docs_espressif/zh_CN/commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
- 打开一个带有安装向导的窗口,可以安装 ESP-IDF、IDF 工具和 Python 虚拟环境。
* - 配置 SDKConfig 文件以启用代码覆盖率
- 在项目的 SDKConfig 文件中设置必要的值,启用代码覆盖率分析。
* - 基于模板创建新项目
- 使用扩展中的项目模板来创建一个新的 ESP-IDF 项目。
* - 创建新 ESP-IDF 组件
- 在当前目录下,基于 ESP-IDF 组件模板创建新组件。
* - 清理当前 SDK 配置编辑器服务器进程
Expand Down
2 changes: 0 additions & 2 deletions l10n/bundle.l10n.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
"Discarded changes in SDK Configuration editor": "Cambios descartados en el editor de configuración del SDK",
"Error encountered while adding dependency {dependency} to the component \"{component}\"": "Se encontró un error al agregar la dependencia {dependency} al componente \"{component}\"",
"Error encountered while creating project from example \"{example}\"": "Se encontró un error al crear un proyecto a partir del ejemplo \"{example}\"",
"Create ESP-IDF From Extension Templates": "Cree ESP-IDF a partir de plantillas de extensión",
"Install ESP-ADF": "Instalar ESP-ADF",
"Install ESP-MDF": "Instalar ESP-MDF",
"Install ESP-Matter": "Instalar ESP-Materia",
Expand All @@ -158,7 +157,6 @@
"Install ESP-Matter Python Requirements": "Instalar los requisitos de ESP-Matter Python",
"Add .vscode subdirectory files": "Agregar archivos de subdirectorio .vscode",
"Add .devcontainer subdirectory files": "Agregar archivos de subdirectorio .devcontainer",
"Create ESP-IDF Component": "Crear componente ESP-IDF",
"Flash with JTAG": "Flashear con JTAG",
"Flash with UART": "Flashear con UART",
"Flash with DFU": "Flashear con DFU",
Expand Down
1 change: 0 additions & 1 deletion l10n/bundle.l10n.pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
"Discarded changes in SDK Configuration editor": "Alterações descartadas no editor de configuração do SDK",
"Error encountered while adding dependency {dependency} to the component \"{component}\"": "Erro encontrado ao adicionar a dependência {dependency} ao componente \"{component}\"",
"Error encountered while creating project from example \"{example}\"": "Erro encontrado ao criar o projeto do exemplo \"{example}\"",
"Create ESP-IDF From Extension Templates": "Crie ESP-IDF a partir de modelos de extensão",
"Install ESP-ADF": "Instale ESP-ADF",
"Install ESP-MDF": "Instale ESP-MDF",
"Install ESP-Matter": "Instale ESP-Matter",
Expand Down
1 change: 0 additions & 1 deletion l10n/bundle.l10n.ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
"Discarded changes in SDK Configuration editor": "Изменения в редакторе конфигурации SDK отменены",
"Error encountered while adding dependency {dependency} to the component \"{component}\"": "Произошла ошибка при добавлении зависимости {dependent} к компоненту \"{comment}\"",
"Error encountered while creating project from example \"{example}\"": "Ошибка при создании проекта из примера \"{example}\"",
"Create ESP-IDF From Extension Templates": "Создание ESP-IDF из шаблонов расширения",
"Install ESP-ADF": "Установка ESP-ADF",
"Install ESP-MDF": "Установка ESP-MDF",
"Install ESP-Matter": "Установка ESP-Matter",
Expand Down
1 change: 0 additions & 1 deletion l10n/bundle.l10n.zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
"Discarded changes in SDK Configuration editor": "已放弃 SDK 配置编辑器中的更改",
"Error encountered while adding dependency {dependency} to the component \"{component}\"": "将依赖项 {dependency} 添加到组件 \"{component}\" 时出错",
"Error encountered while creating project from example \"{example}\"": "基于 \"{example}\" 示例创建项目时出错",
"Create ESP-IDF From Extension Templates": "基于扩展模板创建 ESP-IDF",
"Install ESP-ADF": "安装 ESP-ADF",
"Install ESP-MDF": "安装 ESP-MDF",
"Install ESP-Matter": "安装 ESP-Matter",
Expand Down
22 changes: 3 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"soc"
],
"activationEvents": [
"onCommand:espIdf.createFiles",
"onCommand:espIdf.addArduinoAsComponentToCurFolder",
"onCommand:espIdf.createIdfTerminal",
"onCommand:espIdf.createVsCodeFolder",
Expand Down Expand Up @@ -87,7 +86,6 @@
"onCommand:espIdf.searchInEspIdfDocs",
"onCommand:espIdf.setup.start",
"onCommand:espIdf.welcome.start",
"onCommand:espIdf.examples.start",
"onCommand:esp.rainmaker.backend.connect",
"onCommand:esp.rainmaker.backend.sync",
"onCommand:espIdf.getEspAdf",
Expand Down Expand Up @@ -535,11 +533,6 @@
]
},
"keybindings": [
{
"command": "espIdf.createFiles",
"key": "ctrl+e c",
"mac": "cmd+i c"
},
{
"command": "espIdf.fullClean",
"key": "ctrl+e x",
Expand Down Expand Up @@ -1273,11 +1266,6 @@
"command": "espIdf.searchError",
"title": "%espIdf.searchError.title%"
},
{
"command": "espIdf.createFiles",
"title": "%espIdf.createFiles.title%",
"category": "ESP-IDF"
},
{
"command": "espIdf.addArduinoAsComponentToCurFolder",
"title": "%espIdf.addArduinoAsComponentToCurFolder.title%",
Expand Down Expand Up @@ -1313,11 +1301,6 @@
"title": "%espIdf.setup.title%",
"category": "ESP-IDF"
},
{
"command": "espIdf.examples.start",
"title": "%espIdf.examples.title%",
"category": "ESP-IDF"
},
{
"command": "espIdf.cmakeListsEditor.start",
"title": "%espIdf.cmakeListsEditor.start.title%",
Expand Down Expand Up @@ -2451,7 +2434,7 @@
"genLocalizationBundle": "npx @vscode/l10n-dev export --outDir ./l10n ./src",
"webpack": "webpack --mode production",
"ui-test": "yarn compile && extest setup-and-run -y -i -u -l DEBUG -o testFiles/testWorkspace/.vscode/settings.json 'out/ui-test/*-test.js'",
"ci-test": "yarn compile && extest setup-and-run './out/ui-test/*-test.js' -u -s test-resources -o testFiles/testWorkspace/.vscode/settings.json -l DEBUG"
"ci-test": "yarn compile && extest setup-and-run './out/ui-test/*-test.js' -u -s test-resources -c min -o testFiles/testWorkspace/.vscode/settings.json -l DEBUG"
},
"devDependencies": {
"@babel/types": "^7.23.0",
Expand Down Expand Up @@ -2509,7 +2492,7 @@
"ts-loader": "^9.4.4",
"typescript": "^5.2.2",
"vite": "^4.5.13",
"vscode-extension-tester": "7.3.2",
"vscode-extension-tester": "^8.15.0",
"vue-hot-reload-api": "^2.3.2",
"vue-loader": "^17.2.2",
"vue-router": "^4.2.4",
Expand All @@ -2519,6 +2502,7 @@
},
"dependencies": {
"@types/js-yaml": "^4.0.5",
"@vscode/codicons": "^0.0.36",
"@vscode/l10n": "^0.0.18",
"ansi-to-html": "^0.6.11",
"assert": "^2.1.0",
Expand Down
2 changes: 0 additions & 2 deletions package.nls.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"espIdf.clearSavedIdfSetups.title": "Limpiar configuraciones de ESP-IDF guardadas",
"espIdf.cmakeListsEditor.start.title": "Editor CMakeLists.txt",
"espIdf.createDevContainer.title": "Agregar configuración de contenedor Docker",
"espIdf.createFiles.title": "Crear proyecto a partir de la plantilla de extensión",
"espIdf.createIdfTerminal.title": "Abrir terminal ESP-IDF",
"espIdf.createNewComponent.title": "Crear nuevo componente de ESP-IDF",
"espIdf.createSbom.title": "Ejecutar comprobación de vulnerabilidad ESP-IDF-SBOM",
Expand All @@ -38,7 +37,6 @@
"espIdf.troubleshootPanel.title": "ESP-IDF: Formulario de solución de problemas",
"espIdf.efuse.clearResults.title": "Limpiar resumen de efuse",
"espIdf.eraseFlash.title": "Borrar memoria Flash del dispositivo",
"espIdf.examples.title": "Mostrar proyectos de ejemplo",
"espIdf.flashAppUart.title": "Solo aplicación Flash (UART)",
"espIdf.flashAndEncryptDevice.title": "Encriptar y Flashear su Proyecto",
"espIdf.flashBootloaderUart.title": "SOLO ROBAJE DE BOOTOLA FLASH (UART)",
Expand Down
2 changes: 0 additions & 2 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"espIdf.clearSavedIdfSetups.title": "Clear Saved ESP-IDF Setups",
"espIdf.cmakeListsEditor.start.title": "CMakeLists.txt Editor",
"espIdf.createDevContainer.title": "Add Docker Container Configuration",
"espIdf.createFiles.title": "Create Project from Extension Template",
"espIdf.createIdfTerminal.title": "Open ESP-IDF Terminal",
"espIdf.createNewComponent.title": "Create New ESP-IDF Component",
"espIdf.createSbom.title": "Run ESP-IDF-SBOM Vulnerability Check",
Expand All @@ -38,7 +37,6 @@
"espIdf.troubleshootPanel.title": "ESP-IDF: Troubleshoot Form",
"espIdf.efuse.clearResults.title": "Clear eFuse Summary",
"espIdf.eraseFlash.title": "Erase Flash Memory from Device",
"espIdf.examples.title": "Show Example Projects",
"espIdf.flashAppUart.title": "Flash App Only (UART)",
"espIdf.flashAndEncryptDevice.title": "Encrypt and Flash Your Project",
"espIdf.flashBinaryToPartition.title": "Flash Binary to Partition...",
Expand Down
2 changes: 0 additions & 2 deletions package.nls.pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"espIdf.clearSavedIdfSetups.title": "Limpar configurações ESP-IDF salvas",
"espIdf.cmakeListsEditor.start.title": "Editor CMakeLists.txt",
"espIdf.createDevContainer.title": "Adicionar configuração de contêiner Docker",
"espIdf.createFiles.title": "Criar projeto a partir do modelo de extensão",
"espIdf.createIdfTerminal.title": "Abra o terminal ESP-IDF",
"espIdf.createNewComponent.title": "Criar novo componente ESP-IDF",
"espIdf.createSbom.title": "Execute a verificação de vulnerabilidade ESP-IDF-SBOM",
Expand All @@ -38,7 +37,6 @@
"espIdf.troubleshootPanel.title": "ESP-IDF: Formulário de solução de problemas",
"espIdf.efuse.clearResults.title": "Limpar resumo do eFuse",
"espIdf.eraseFlash.title": "Apagar memória flash do dispositivo",
"espIdf.examples.title": "Mostrar exemplos de projetos",
"espIdf.flashAppUart.title": "Apenas aplicativo flash (UART)",
"espIdf.flashAndEncryptDevice.title": "Criptografe e atualize seu projeto",
"espIdf.flashBinaryToPartition.title": "Flash binário para partição...",
Expand Down
2 changes: 0 additions & 2 deletions package.nls.ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"espIdf.clearSavedIdfSetups.title": "Очистить сохраненные настройки ESP-IDF",
"espIdf.cmakeListsEditor.start.title": "Редактор CMakeLists.txt",
"espIdf.createDevContainer.title": "Добавить конфигурацию Docker-контейнера",
"espIdf.createFiles.title": "Создать проект из шаблона расширения",
"espIdf.createIdfTerminal.title": "Открыть терминал ESP-IDF",
"espIdf.createNewComponent.title": "Создать новый компонент ESP-IDF",
"espIdf.createSbom.title": "Запустить проверку уязвимостей ESP-IDF-SBOM.",
Expand All @@ -38,7 +37,6 @@
"espIdf.troubleshootPanel.title": "ESP-IDF: форма устранения неполадок",
"espIdf.efuse.clearResults.title": "Очистить сводку eFuse",
"espIdf.eraseFlash.title": "Очистить Flash-память устройства",
"espIdf.examples.title": "Показать примеры проектов",
"espIdf.flashAndEncryptDevice.title": "Зашифровать и прошить проект",
"espIdf.flashAppUart.title": "Только приложение Flash (UART)",
"espIdf.flashBootloaderUart.title": "Только Flash Bootloader (UART)",
Expand Down
2 changes: 0 additions & 2 deletions package.nls.zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"espIdf.clearSavedIdfSetups.title": "清除已保存的 ESP-IDF 设置",
"espIdf.cmakeListsEditor.start.title": "CMakeLists.txt 编辑器",
"espIdf.createDevContainer.title": "添加 Docker 容器配置",
"espIdf.createFiles.title": "基于模板创建新项目",
"espIdf.createIdfTerminal.title": "打开 ESP-IDF 终端",
"espIdf.createNewComponent.title": "创建新 ESP-IDF 组件",
"espIdf.createSbom.title": "运行 ESP-IDF-SBOM 漏洞检查",
Expand All @@ -38,7 +37,6 @@
"espIdf.troubleshootPanel.title": "ESP-IDF 故障排除表",
"espIdf.efuse.clearResults.title": "清除 eFuse 摘要",
"espIdf.eraseFlash.title": "擦除设备 flash 数据",
"espIdf.examples.title": "展示示例项目",
"espIdf.flashAndEncryptDevice.title": "加密并烧录项目",
"espIdf.flashAppUart.title": "仅Flash AppUART",
"espIdf.flashBinaryToPartition.title": "将二进制文件烧录到分区…",
Expand Down
29 changes: 8 additions & 21 deletions src/cmake/cmakeEditorPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,7 @@ export class CmakeListsEditorPanel {
)
);

const codiconsUri = panel.webview.asWebviewUri(
vscode.Uri.joinPath(
extensionPath,
"node_modules",
"@vscode/codicons",
"dist",
"codicon.css"
)
);

panel.webview.html = this.createCmakeListEditorHtml(
scriptsPath,
codiconsUri
);
panel.webview.html = this.createCmakeListEditorHtml(scriptsPath);

const cmakeListsWatcher = vscode.workspace.createFileSystemWatcher(
fileUri.fsPath,
Expand Down Expand Up @@ -149,7 +136,11 @@ export class CmakeListsEditorPanel {
fileName: fileUri.fsPath,
});
} catch (error) {
Logger.errorNotify(`Failed reading ${fileUri.fsPath}`, error, "CmakeListsEditorPanel loadCMakeListSchema");
Logger.errorNotify(
`Failed reading ${fileUri.fsPath}`,
error,
"CmakeListsEditorPanel loadCMakeListSchema"
);
}
case "saveChanges":
if (message.newValues) {
Expand All @@ -167,17 +158,13 @@ export class CmakeListsEditorPanel {
CmakeListsEditorPanel.cmakeListsPanels.add(fileUri.fsPath, panel);
}

private createCmakeListEditorHtml(
scriptPath: vscode.Uri,
codiconsUri: vscode.Uri
): string {
private createCmakeListEditorHtml(scriptPath: vscode.Uri): string {
return `<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>CMakeLists.txt</title>
<link href="${codiconsUri}" rel="stylesheet" />
</head>
<body>
<div id="editor"></div>
Expand All @@ -197,7 +184,7 @@ export class CmakeListsEditorPanel {
panel.webview.postMessage({
command: "loadEmptyElements",
elements: listWithValues,
cmakeListsType: type
cmakeListsType: type,
});
}
listWithValues = await updateWithValuesCMakeLists(fileUri, listWithValues);
Expand Down
Loading