+
`;
}
-function buildArgsTableHtml(
- title: string,
+function buildArgsTabContentHtml(
kind: "west" | "cmake",
args: string[],
projectName: string,
buildName: string,
): string {
return `
-
-
-
`;
+}
+
+function tabbedBuildArgsHtml(
+ westArgs: string[],
+ cmakeArgs: string[],
+ projectName: string,
+ buildName: string,
+): string {
+ return `
+
+
+ West Args
+
+ ${buildArgsTabContentHtml("west", westArgs, projectName, buildName)}
+
+ CMake Args
+
+ ${buildArgsTabContentHtml("cmake", cmakeArgs, projectName, buildName)}
+
+
`;
}
@@ -164,9 +131,9 @@ function calculatedSectionHtml(
if (buildInfo) {
buildOutputHtml = `
-
Resolved KConfig Files (from build output)
+
Resolved Kconfig Files (from build output)
${readonlyFileListHtml(buildInfo.kconfigFiles)}
-
Resolved KConfig User Files
+
Resolved Kconfig User Files
${readonlyFileListHtml(buildInfo.otherKconfigFiles)}
Resolved DTS File
${buildInfo.dtsFile ? readonlyFileListHtml([buildInfo.dtsFile]) : '
None
'}
@@ -182,18 +149,14 @@ function calculatedSectionHtml(
}
return `
-
-
-
-
Composed KConfig Files (project + build)
- ${readonlyFileListHtml(calculated.config.concat(calculated.extraConfig))}
-
Composed DTC Overlay Files (project + build)
- ${readonlyFileListHtml(calculated.overlay.concat(calculated.extraOverlay))}
-
-
- ${buildOutputHtml}
-
`;
+
+
Composed Kconfig Files (project + build)
+ ${readonlyFileListHtml(calculated.config.concat(calculated.extraConfig))}
+
Composed Devicetree Overlay Files (project + build)
+ ${readonlyFileListHtml(calculated.overlay.concat(calculated.extraOverlay))}
+
+
+ ${buildOutputHtml}`;
}
function runnersHtml(
@@ -209,11 +172,22 @@ function runnersHtml(
(r) => `
-
Runner: ${escapeHtml(r.config.runner)}
-
Args: ${escapeHtml(r.config.args || "(none)")}
-
-
+
+
+
+
+
+
+
`,
)
.join("\n");
@@ -224,124 +198,101 @@ export function getBuildSectionHtml(
projectName: string,
buildName: string,
buildVars: Record
,
- calculated: CalculatedConfigFiles,
- buildInfo: BuildInfo | undefined,
isActive: boolean,
): string {
const activeClass = isActive ? " build-active" : "";
- const activeBadge = isActive ? 'Active ' : "";
+ const activeBadge = isActive ? ' Active ' : "";
return `
-
-
-
${escapeHtml(build.boardDisplayName)}
- ${activeBadge}
+
+
+
+ Board
+ ${escapeHtml(build.boardDisplayName)}
-
-
-
- Board
- ${escapeHtml(build.boardDisplayName)}
-
-
- Board Directory
- ${escapeHtml(build.resolvedBoardPath ?? "Not resolved")}
-
-
-
Debug Optimization
-
${escapeHtml(build.debugOptimization)}
+
+ Board Directory
+ ${escapeHtml(build.resolvedBoardPath ?? "Not resolved")}
+
+
+
+
+ Debug Optimization
+ ${escapeHtml(build.debugOptimization)}
+
- ${buildArgsTableHtml("West Args", "west", build.westBuildArgs, projectName, buildName)}
- ${buildArgsTableHtml("CMake Args", "cmake", build.westBuildCMakeArgs, projectName, buildName)}
+
+
+
+
+ Config
+
+ ${buildVariablesTableHtml(buildVars, projectName, buildName)}
- ${fileGroupHtml(
- "KConfig Files",
- `kconfig-build-${buildName}`,
+ ${tabbedConfigGroupHtml(
+ `build-${buildName}`,
build.confFiles.config,
build.confFiles.extraConfig,
"addBuildConfigFile",
"removeBuildConfigFile",
- )}
-
- ${fileGroupHtml(
- "DTC Overlay Files",
- `overlay-build-${buildName}`,
+ "toggleBuildConfigFileExtra",
build.confFiles.overlay,
build.confFiles.extraOverlay,
"addBuildOverlayFile",
"removeBuildOverlayFile",
+ "toggleBuildOverlayFileExtra",
)}
+
+ Build & Debug
+
+ ${tabbedBuildArgsHtml(build.westBuildArgs, build.westBuildCMakeArgs, projectName, buildName)}
- ${calculatedSectionHtml(calculated, buildInfo)}
+
+
+
+ Debug
+ ${escapeHtml(getLaunchTargetDisplayName(build.launchTarget, build.launchTargetFolder, "Zephyr IDE: Debug"))}
+
+
+
+
+ Build + Debug
+ ${escapeHtml(getLaunchTargetDisplayName(build.buildDebugTarget, build.buildDebugTargetFolder, "Zephyr IDE: Debug"))}
+
+
+
+
+ Attach
+ ${escapeHtml(getLaunchTargetDisplayName(build.attachTarget, build.attachTargetFolder, "Zephyr IDE: Attach"))}
+
+
+
+
-
-
- Debug
- ${escapeHtml(getLaunchTargetDisplayName(build.launchTarget, build.launchTargetFolder, "Zephyr IDE: Debug"))}
-
-
-
-
- Build + Debug
- ${escapeHtml(getLaunchTargetDisplayName(build.buildDebugTarget, build.buildDebugTargetFolder, "Zephyr IDE: Debug"))}
-
-
-
-
- Attach
- ${escapeHtml(getLaunchTargetDisplayName(build.attachTarget, build.attachTargetFolder, "Zephyr IDE: Attach"))}
-
-
-
-
-
- ${runnersHtml(build.runners, projectName, buildName)}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ ${runnersHtml(build.runners, projectName, buildName)}
+
+
+
-
+
`;
}
+
+export function getCalculatedSectionHtml(
+ calculated: CalculatedConfigFiles,
+ buildInfo: BuildInfo | undefined,
+): string {
+ return calculatedSectionHtml(calculated, buildInfo);
+}
diff --git a/src/panels/project_build_view/ProjectBuildPanel.ts b/src/panels/project_build_view/ProjectBuildPanel.ts
index 4ec46868..3557e183 100644
--- a/src/panels/project_build_view/ProjectBuildPanel.ts
+++ b/src/panels/project_build_view/ProjectBuildPanel.ts
@@ -50,17 +50,18 @@ import {
selectDebugAttachLaunchConfiguration,
getProjectFolder,
} from "../../project_utilities/project";
+import { getConfFileKey } from "../../project_utilities/config_selector";
import { escapeHtml } from "../webview_shared/webviewTypes";
import { generateNonce } from "../webview_shared/nonce";
import { getProjectSectionHtml } from "./ProjectSection";
-import { getBuildSectionHtml } from "./BuildSection";
+import { getBuildSectionHtml, getCalculatedSectionHtml } from "./BuildSection";
import { getTestSectionHtml } from "./TestSection";
import { getVariablesReferenceSectionHtml } from "./VariablesSection";
import { normalizeBuildArgs } from "../../project_utilities/build_args";
export class ProjectBuildPanel {
- private static readonly PROJECT_VARIABLE_DEFAULTS_CONFIG_KEY = "zephyr-ide.project_variable_defaults";
- private static readonly BUILD_VARIABLE_DEFAULTS_CONFIG_KEY = "zephyr-ide.build_variable_defaults";
+ private static readonly PROJECT_VARIABLE_DEFAULTS_CONFIG_KEY = "zephyr-ide.projectVariableDefaults";
+ private static readonly BUILD_VARIABLE_DEFAULTS_CONFIG_KEY = "zephyr-ide.buildVariableDefaults";
/** All open panels, keyed by project name (or "__default__" when no project specified) */
private static _panels: Map
= new Map();
@@ -74,6 +75,7 @@ export class ProjectBuildPanel {
private _globalConfig: GlobalConfig;
private _selectedProject: string | undefined;
private _selectedBuildOrTest: string | undefined; // "build:" or "test:"
+ private _htmlInitialized = false;
/** For backward-compat: returns the first open panel, if any */
public static get currentPanel(): ProjectBuildPanel | undefined {
@@ -262,6 +264,11 @@ export class ProjectBuildPanel {
await this.handleRemoveConfigFile(message, false, true);
return;
+ // Toggle file between override and extra
+ case "toggleFileExtra":
+ await this.handleToggleFileExtra(message);
+ return;
+
// Build config files
case "addBuildConfigFile":
await addConfigFiles(ctx, ws, true, false, this._selectedProject, message.build);
@@ -279,10 +286,17 @@ export class ProjectBuildPanel {
return;
// Build management
- case "addBuild":
- await addBuildToProject(ws, ctx, message.project);
+ case "addBuild": {
+ const projectName = message.project;
+ const existingBuilds = new Set(Object.keys(ws.projects[projectName]?.buildConfigs ?? {}));
+ await addBuildToProject(ws, ctx, projectName);
+ const newBuild = Object.keys(ws.projects[projectName]?.buildConfigs ?? {}).find(b => !existingBuilds.has(b));
+ if (newBuild) {
+ this._selectedBuildOrTest = `build:${newBuild}`;
+ }
await this.refreshAfterChange();
return;
+ }
case "removeBuild":
await removeBuild(ctx, ws, message.project, message.build);
await this.refreshAfterChange();
@@ -299,10 +313,17 @@ export class ProjectBuildPanel {
return;
// Test management
- case "addTest":
- await addTest(ws, ctx, message.project);
+ case "addTest": {
+ const projectName = message.project;
+ const existingTests = new Set(Object.keys(ws.projects[projectName]?.twisterConfigs ?? {}));
+ await addTest(ws, ctx, projectName);
+ const newTest = Object.keys(ws.projects[projectName]?.twisterConfigs ?? {}).find(t => !existingTests.has(t));
+ if (newTest) {
+ this._selectedBuildOrTest = `test:${newTest}`;
+ }
await this.refreshAfterChange();
return;
+ }
// Runner management
case "addRunner":
@@ -313,6 +334,9 @@ export class ProjectBuildPanel {
await removeRunner(ctx, ws, message.project, message.build, message.runner);
await this.refreshAfterChange();
return;
+ case "updateRunner":
+ await this.handleUpdateRunner(message);
+ return;
// Build actions
case "build":
@@ -374,11 +398,69 @@ export class ProjectBuildPanel {
this._selectedProject,
isPrimary,
[message.file],
- isProject ? undefined : message.build,
+ isProject ? undefined : (message.build || this.getSelectedBuildName()),
);
await this.refreshAfterChange();
}
+ private async handleToggleFileExtra(message: any) {
+ if (!this._selectedProject || !message.file) {
+ return;
+ }
+ const toggleCmd = String(message["toggle-cmd"] ?? "");
+ const toExtra = message.extra === "true";
+ const file = String(message.file);
+
+ // Determine isKConfig, isProject from the toggle command name
+ let isKConfig: boolean;
+ let isProject: boolean;
+ switch (toggleCmd) {
+ case "toggleProjectConfigFileExtra":
+ isKConfig = true; isProject = true; break;
+ case "toggleProjectOverlayFileExtra":
+ isKConfig = false; isProject = true; break;
+ case "toggleBuildConfigFileExtra":
+ isKConfig = true; isProject = false; break;
+ case "toggleBuildOverlayFileExtra":
+ isKConfig = false; isProject = false; break;
+ default:
+ return;
+ }
+
+ const project = this._wsConfig.projects[this._selectedProject];
+ if (!project) { return; }
+
+ let confFiles;
+ if (isProject) {
+ confFiles = project.confFiles;
+ } else {
+ const buildName = this.getSelectedBuildName();
+ if (!buildName || !project.buildConfigs[buildName]) { return; }
+ confFiles = project.buildConfigs[buildName].confFiles;
+ }
+
+ // Remove from current list, add to target list
+ // toExtra=true means moving from primary→extra; isPrimary is the inverse of "is extra"
+ const fromKey = getConfFileKey(isKConfig, toExtra);
+ const toKey = getConfFileKey(isKConfig, !toExtra);
+
+ confFiles[fromKey] = confFiles[fromKey].filter((f: string) => f !== file);
+ if (!confFiles[toKey].includes(file)) {
+ confFiles[toKey].push(file);
+ }
+
+ await setWorkspaceState(this._context, this._wsConfig);
+ this.updateHtml();
+ }
+
+ private getSelectedBuildName(): string | undefined {
+ const sel = this._selectedBuildOrTest;
+ if (sel && sel.startsWith("build:")) {
+ return sel.slice(6);
+ }
+ return undefined;
+ }
+
private async handleUpsertVariable(message: any) {
const key = String(message.key ?? "").trim();
const value = String(message.value ?? "");
@@ -476,6 +558,27 @@ export class ProjectBuildPanel {
this.updateHtml();
}
+ private async handleUpdateRunner(message: any) {
+ const projectName = this._selectedProject;
+ const buildName = String(message.build ?? "");
+ const runnerName = String(message.runner ?? "");
+ if (!projectName || !buildName || !runnerName) {
+ return;
+ }
+ const runner = this._wsConfig.projects[projectName]?.buildConfigs?.[buildName]?.runnerConfigs?.[runnerName];
+ if (!runner) {
+ return;
+ }
+ if (message["runner-type"] !== undefined) {
+ runner.runner = String(message["runner-type"]);
+ }
+ if (message["runner-args"] !== undefined) {
+ runner.args = String(message["runner-args"]);
+ }
+ await setWorkspaceState(this._context, this._wsConfig);
+ await this.refreshAfterChange();
+ }
+
private async refreshAfterChange() {
await vscode.commands.executeCommand("zephyr-ide.update-web-view");
}
@@ -517,16 +620,33 @@ export class ProjectBuildPanel {
// ---------------------------------------------------------------------------
private updateHtml() {
- this._panel.webview.html = this.getHtmlForWebview();
+ const content = this.generateDynamicContent();
+ if (!this._htmlInitialized) {
+ this._panel.webview.html = this.getHtmlShell(content);
+ this._htmlInitialized = true;
+ } else {
+ void this._panel.webview.postMessage({
+ command: "updateContent",
+ ...content,
+ });
+ }
}
- private getHtmlForWebview(): string {
- const nonce = generateNonce();
+ /** Generate only the dynamic parts of the page. */
+ private generateDynamicContent(): {
+ projectOptionsHtml: string;
+ selectorHtml: string;
+ projectHtml: string;
+ buildOrTestHtml: string;
+ calculatedHtml: string;
+ noProjectHtml: string;
+ hasBuildSelected: boolean;
+ } {
const projectNames = Object.keys(this._wsConfig.projects ?? {});
const selected = this._selectedProject;
// Project selector
- const projectOptions = projectNames
+ const projectOptionsHtml = projectNames
.map((name) => {
const sel = name === selected ? " selected" : "";
return `${escapeHtml(name)} `;
@@ -536,6 +656,7 @@ export class ProjectBuildPanel {
// Project section
let projectHtml = "";
let buildOrTestHtml = "";
+ let calculatedHtml = "";
let selectorHtml = "";
if (selected && this._wsConfig.projects[selected]) {
@@ -590,7 +711,16 @@ export class ProjectBuildPanel {
const calculated = getCalculatedConfigFiles(project, project.buildConfigs[buildName]);
const activeBuild = this._wsConfig.projectStates[selected]?.activeBuildConfig;
const isActive = buildName === activeBuild;
- buildOrTestHtml = getBuildSectionHtml(buildDetails, selected, buildName, buildVars, calculated, undefined, isActive);
+ buildOrTestHtml = getBuildSectionHtml(buildDetails, selected, buildName, buildVars, isActive);
+ calculatedHtml = `
+
+
+
+ ${getCalculatedSectionHtml(calculated, undefined)}
+
+
+
+
+
No builds configured.
+
+ Create Build
+
+
+
+
+
+
Select a build or test to view details.
+
+
`
: "";
+ const hasBuildSelected = !!(selected && this._selectedBuildOrTest?.startsWith("build:"));
+
+ return {
+ projectOptionsHtml,
+ selectorHtml,
+ projectHtml,
+ buildOrTestHtml,
+ calculatedHtml,
+ noProjectHtml,
+ hasBuildSelected,
+ };
+ }
+
+ private getHtmlShell(content: ReturnType
): string {
+ const nonce = generateNonce();
+ const disabledAttr = content.hasBuildSelected ? "" : " disabled";
+
+ const variablesRefHtml = getVariablesReferenceSectionHtml();
+
return `
Zephyr IDE: Project Details
${this.getStylesheetLinks()}
@@ -627,19 +796,43 @@ export class ProjectBuildPanel {
Inspect configured projects, builds, tests, and derived variables.
- Project:
-
- ${projectOptions}
-
+
+
- ${noProjectHtml}
+ ${content.noProjectHtml}
- ${projectHtml}
- ${selectorHtml}
- ${buildOrTestHtml}
+
+
${content.projectHtml}
+
${content.buildOrTestHtml}
+
+
${content.calculatedHtml}
None
`;
- }
- return files
- .map((f) => {
- const escaped = escapeHtml(f);
- const extraFlag = isExtra ? "true" : "false";
- return `
- ${escaped}
-
-
-
`;
- })
- .join("\n");
-}
-
-function fileGroupHtml(
- title: string,
- groupId: string,
- primaryFiles: string[],
- extraFiles: string[],
- addCmd: string,
- removeCmd: string,
-): string {
- return `
-
-
-
-
Override Files
- ${fileListHtml(primaryFiles, groupId, false, removeCmd)}
-
-
-
Extra Files
- ${fileListHtml(extraFiles, groupId, true, removeCmd)}
-
-
,
@@ -82,11 +38,9 @@ function variablesTableHtml(
-
-
-
`,
)
@@ -94,8 +48,7 @@ function variablesTableHtml(
-
@@ -134,33 +87,27 @@ export function getProjectSectionHtml(
${cmakeFile}
- ${fileGroupHtml(
- "KConfig Files",
- "kconfig-project",
+ ${tabbedConfigGroupHtml(
+ "project",
projectInfo.confFiles.config,
projectInfo.confFiles.extraConfig,
"addProjectConfigFile",
"removeProjectConfigFile",
- )}
-
- ${fileGroupHtml(
- "DTC Overlay Files",
- "overlay-project",
+ "toggleProjectConfigFileExtra",
projectInfo.confFiles.overlay,
projectInfo.confFiles.extraOverlay,
"addProjectOverlayFile",
"removeProjectOverlayFile",
+ "toggleProjectOverlayFileExtra",
)}
${variablesTableHtml(projectVars, "project", projectName)}
-
-
Add Build
-
-
Add Test
diff --git a/src/panels/project_build_view/configFileGroup.ts b/src/panels/project_build_view/configFileGroup.ts
new file mode 100644
index 00000000..c0758acf
--- /dev/null
+++ b/src/panels/project_build_view/configFileGroup.ts
@@ -0,0 +1,118 @@
+/*
+Copyright 2024 mylonics
+Author Rijesh Augustine
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { escapeHtml } from "../webview_shared/webviewTypes";
+
+/**
+ * Renders a single file row with an "Extra" checkbox, clickable filename, and remove button.
+ */
+function fileRowHtml(
+ file: string,
+ groupId: string,
+ isExtra: boolean,
+ removeCmd: string,
+ toggleCmd: string,
+): string {
+ const escaped = escapeHtml(file);
+ const extraFlag = isExtra ? "true" : "false";
+ const toggleToExtraFlag = isExtra ? "false" : "true";
+ const modeLabel = isExtra ? "Extra" : "Override";
+ return `
+
+ ${modeLabel}
+
+ ${escaped}
+
+
+
`;
+}
+
+/**
+ * Renders a scrollable file list for one tab (KConfig or DTC).
+ */
+function fileTabContentHtml(
+ groupId: string,
+ primaryFiles: string[],
+ extraFiles: string[],
+ addCmd: string,
+ removeCmd: string,
+ toggleCmd: string,
+ addLabel: string,
+): string {
+ const allRows: string[] = [];
+
+ for (const f of primaryFiles) {
+ allRows.push(fileRowHtml(f, groupId, false, removeCmd, toggleCmd));
+ }
+ for (const f of extraFiles) {
+ allRows.push(fileRowHtml(f, groupId, true, removeCmd, toggleCmd));
+ }
+
+ const emptyNotice = allRows.length === 0
+ ? '
No files configured
'
+ : "";
+
+ return `
+
+
+
+ ${allRows.join("\n")}
+ ${emptyNotice}
+
+
`;
+}
+
+/**
+ * Renders a tabbed config file group with Kconfig and Devicetree Overlay tabs.
+ * Each tab shows a unified list of files with an Extra checkbox column.
+ */
+export function tabbedConfigGroupHtml(
+ idPrefix: string,
+ kconfigPrimary: string[],
+ kconfigExtra: string[],
+ kconfigAddCmd: string,
+ kconfigRemoveCmd: string,
+ kconfigToggleCmd: string,
+ overlayPrimary: string[],
+ overlayExtra: string[],
+ overlayAddCmd: string,
+ overlayRemoveCmd: string,
+ overlayToggleCmd: string,
+): string {
+ const kconfigGroupId = `kconfig-${idPrefix}`;
+ const overlayGroupId = `overlay-${idPrefix}`;
+
+ return `
+
+
+ Kconfig Files
+
+ ${fileTabContentHtml(kconfigGroupId, kconfigPrimary, kconfigExtra, kconfigAddCmd, kconfigRemoveCmd, kconfigToggleCmd, "Add Kconfig")}
+
+ Devicetree Overlay Files
+
+ ${fileTabContentHtml(overlayGroupId, overlayPrimary, overlayExtra, overlayAddCmd, overlayRemoveCmd, overlayToggleCmd, "Add Overlay")}
+
+
+
`;
+}
diff --git a/src/panels/project_build_view/project-build-panel.css b/src/panels/project_build_view/project-build-panel.css
index 6c82e28c..4ca83280 100644
--- a/src/panels/project_build_view/project-build-panel.css
+++ b/src/panels/project_build_view/project-build-panel.css
@@ -29,12 +29,30 @@
min-width: 180px;
}
+/* Page header selectors row */
+.page-header-selectors {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+ flex-wrap: wrap;
+}
+
+/* Page header build action buttons */
+.page-header-actions {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: 8px;
+ margin-bottom: 16px;
+ padding-bottom: 14px;
+ border-bottom: 1px solid var(--vscode-panel-border);
+}
+
/* Build / test selector toolbar */
.build-test-selector {
display: flex;
align-items: center;
gap: 8px;
- padding: 8px 0;
}
.build-test-selector label {
@@ -49,7 +67,73 @@
/* Test section */
.test-section {
- border-left: 3px solid var(--vscode-panel-border);
+ border-top: 3px solid var(--vscode-panel-border);
+}
+
+/* Side-by-side project + build layout */
+.project-build-row {
+ display: flex;
+ gap: 12px;
+ align-items: stretch;
+ height: clamp(480px, 65vh, 860px);
+}
+
+.project-build-col {
+ flex: 1;
+ min-width: 0;
+ min-height: 0;
+ display: flex;
+}
+
+.project-build-col > .panel-section {
+ flex: 1;
+ min-height: 0;
+ margin-bottom: 0;
+ display: flex;
+ flex-direction: column;
+}
+
+.project-build-col > .panel-section > .section-body {
+ flex: 1;
+ min-height: 0;
+ overflow: auto;
+}
+
+@media (max-width: 900px) {
+ .project-build-row {
+ flex-direction: column;
+ height: auto;
+ }
+
+ .project-build-col > .panel-section {
+ min-height: auto;
+ }
+}
+
+/* Build placeholder (when no build selected) */
+.build-placeholder {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 200px;
+}
+
+.build-placeholder-content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 12px;
+ color: var(--vscode-descriptionForeground);
+ text-align: center;
+ padding: 32px 16px;
+}
+
+.build-placeholder-content i {
+ font-size: 2em;
+}
+
+.build-placeholder-content p {
+ margin: 0;
}
/* Sections */
@@ -138,7 +222,7 @@
border-top: 1px solid var(--vscode-panel-border);
}
-/* Config file groups */
+/* Config file groups (tabbed) */
.config-group {
margin: 12px 0;
border: 1px solid var(--vscode-panel-border);
@@ -147,40 +231,61 @@
box-shadow: var(--zephyr-webview-surface-shadow);
}
-.config-group-header {
+.config-tab-body {
+ padding: 0;
+}
+
+.config-tab-header-row {
display: flex;
align-items: center;
- justify-content: space-between;
- padding: 6px 12px;
+ padding: 4px 12px;
+ gap: 8px;
+ border-bottom: 1px solid var(--vscode-panel-border);
background-color: var(--vscode-sideBar-background);
+ font-size: 0.85em;
font-weight: 500;
+ color: var(--vscode-descriptionForeground);
}
-.config-group-title {
- display: flex;
- align-items: center;
- gap: 6px;
+.config-tab-col-extra {
+ flex: 0 0 90px;
+ text-align: center;
}
-.config-group-sub {
- padding: 4px 12px 8px;
+.config-tab-col-file {
+ flex: 1;
}
-.config-sub-label {
- font-size: 0.9em;
- color: var(--vscode-descriptionForeground);
- margin: 6px 0 2px;
- font-weight: 500;
+.config-tab-add-button {
+ margin-left: auto;
+}
+
+.config-file-scroll {
+ max-height: 200px;
}
.file-list-item {
display: flex;
align-items: center;
- justify-content: space-between;
- padding: 2px 4px;
+ padding: 2px 12px;
+ gap: 8px;
border-radius: var(--zephyr-webview-radius);
}
+.file-list-item .file-mode-button {
+ flex: 0 0 90px;
+ display: flex;
+ justify-content: center;
+}
+
+.file-mode-button {
+ flex: 0 0 90px;
+}
+
+.file-remove-button {
+ margin-left: auto;
+}
+
.file-list-item:hover {
background-color: var(--vscode-list-hoverBackground);
}
@@ -207,12 +312,10 @@
}
/* Build section */
-.build-section {
- border-left: 3px solid var(--vscode-panel-border);
-}
-
-.build-section.build-active {
- border-left-color: var(--vscode-charts-green, #89d185);
+.build-section .section-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
}
.build-header {
@@ -221,6 +324,23 @@
gap: 8px;
}
+.build-details-grid {
+ display: grid;
+ grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+ gap: 12px;
+ align-items: start;
+}
+
+.build-details-col {
+ min-width: 0;
+}
+
+@media (max-width: 1200px) {
+ .build-details-grid {
+ grid-template-columns: minmax(0, 1fr);
+ }
+}
+
/* Section row headers (variables, runners, launch configs) */
.section-row-header {
display: flex;
@@ -405,7 +525,7 @@
.runner-row {
display: flex;
- align-items: center;
+ align-items: flex-start;
padding: 6px 8px;
gap: 12px;
border: 1px solid var(--vscode-panel-border);
@@ -433,6 +553,49 @@
align-items: center;
gap: 4px;
min-width: 100px;
+ padding-top: 4px;
+}
+
+.runner-fields {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.runner-field-row {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.runner-field-label {
+ font-size: 0.85em;
+ color: var(--vscode-descriptionForeground);
+ min-width: 50px;
+}
+
+.runner-input {
+ flex: 1;
+ background: var(--vscode-input-background);
+ color: var(--vscode-input-foreground);
+ border: 1px solid var(--vscode-input-border, transparent);
+ padding: 3px 6px;
+ font-family: var(--vscode-editor-font-family);
+ font-size: var(--vscode-editor-font-size);
+ border-radius: 2px;
+}
+
+.runner-input:focus {
+ outline: 1px solid var(--vscode-focusBorder);
+ outline-offset: -1px;
+}
+
+.runner-actions {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ padding-top: 2px;
}
.runner-detail {
diff --git a/src/panels/project_build_view/project-build-panel.ts b/src/panels/project_build_view/project-build-panel.ts
index 1a1589b4..a0756579 100644
--- a/src/panels/project_build_view/project-build-panel.ts
+++ b/src/panels/project_build_view/project-build-panel.ts
@@ -29,6 +29,10 @@ import '@vscode-elements/elements/dist/vscode-table-body/index.js';
import '@vscode-elements/elements/dist/vscode-table-row/index.js';
import '@vscode-elements/elements/dist/vscode-table-cell/index.js';
import '@vscode-elements/elements/dist/vscode-button-group/index.js';
+import '@vscode-elements/elements/dist/vscode-tabs/index.js';
+import '@vscode-elements/elements/dist/vscode-tab-header/index.js';
+import '@vscode-elements/elements/dist/vscode-tab-panel/index.js';
+import '@vscode-elements/elements/dist/vscode-scrollable/index.js';
import { getVsCodeApi } from "../webview_shared/webviewTypes";
@@ -39,39 +43,24 @@ function sendCommand(command: string, data: Record
= {}): void {
}
// ---------------------------------------------------------------------------
-// Project selector
+// Delegated change handlers (vscode-elements fire 'vsc-change')
// ---------------------------------------------------------------------------
-function setupProjectSelector(): void {
- const select = document.getElementById("projectSelect") as HTMLElement | null;
- if (select) {
- select.addEventListener("vsc-change", (e: Event) => {
- const value = (e.target as any).value;
- sendCommand("switchProject", { project: value });
- });
- }
-}
-
-// ---------------------------------------------------------------------------
-// Build / test selector
-// ---------------------------------------------------------------------------
-
-function setupBuildTestSelector(): void {
- const select = document.getElementById("buildTestSelect") as HTMLElement | null;
- if (select) {
- select.addEventListener("vsc-change", (e: Event) => {
- const value = (e.target as any).value;
- sendCommand("switchBuildOrTest", { selection: value });
- });
- }
-}
-
-// ---------------------------------------------------------------------------
-// Collapsible sections
-// ---------------------------------------------------------------------------
+function setupChangeHandlers(): void {
+ // vscode-single-select fires non-bubbling 'change' events on the host element.
+ // Use capture phase to intercept them at document level.
+ document.addEventListener("change", (e: Event) => {
+ const target = e.target;
+ if (!(target instanceof HTMLElement)) { return; }
+
+ const id = target.id;
+ if (id === "projectSelect") {
+ sendCommand("switchProject", { project: (target as any).value });
+ } else if (id === "buildTestSelect") {
+ sendCommand("switchBuildOrTest", { selection: (target as any).value });
+ }
+ }, true); // capture phase
-function setupCollapsibles(): void {
- // vscode-collapsible handles its own open/close natively; no manual toggle needed.
}
// ---------------------------------------------------------------------------
@@ -131,6 +120,12 @@ function setupClickDelegation(): void {
const row = el.closest(".build-arg-row");
const argInput = row?.querySelector(".build-arg-input") as HTMLInputElement | null;
data.value = argInput?.value ?? "";
+ } else if (command === "updateRunner") {
+ const row = el.closest(".runner-row");
+ const runnerInput = row?.querySelector(".runner-runner-input") as HTMLInputElement | null;
+ const argsInput = row?.querySelector(".runner-args-input") as HTMLInputElement | null;
+ data["runner-type"] = runnerInput?.value ?? "";
+ data["runner-args"] = argsInput?.value ?? "";
}
sendCommand(command, data);
@@ -147,14 +142,22 @@ function setupClickDelegation(): void {
button.click();
return;
}
- if (!hasBuildArgInputClass(target)) {
+ if (hasBuildArgInputClass(target)) {
+ const row = target?.closest(".build-arg-row");
+ const button = row?.querySelector('[data-command="upsertBuildArg"]') as HTMLElement | null;
+ if (!button) { return; }
+ e.preventDefault();
+ button.click();
+ return;
+ }
+ if (target?.classList.contains("runner-input")) {
+ const row = target?.closest(".runner-row");
+ const button = row?.querySelector('[data-command="updateRunner"]') as HTMLElement | null;
+ if (!button) { return; }
+ e.preventDefault();
+ button.click();
return;
}
- const row = target?.closest(".build-arg-row");
- const button = row?.querySelector('[data-command="upsertBuildArg"]') as HTMLElement | null;
- if (!button) { return; }
- e.preventDefault();
- button.click();
}, listenerOptions);
const handleKeyboardCommand = (e: KeyboardEvent): void => {
@@ -178,21 +181,128 @@ function setupClickDelegation(): void {
window.addEventListener("unload", () => eventController.abort(), { once: true });
}
+// ---------------------------------------------------------------------------
+// Tab state preservation
+// ---------------------------------------------------------------------------
+
+type TabState = Record;
+
+function captureTabState(): TabState {
+ const state: TabState = {};
+ document.querySelectorAll("vscode-tabs[data-tab-id]").forEach((tabs) => {
+ const id = tabs.getAttribute("data-tab-id");
+ if (id) {
+ state[id] = (tabs as any).selectedIndex ?? 0;
+ }
+ });
+ return state;
+}
+
+function restoreTabState(state: TabState): void {
+ document.querySelectorAll("vscode-tabs[data-tab-id]").forEach((tabs) => {
+ const id = tabs.getAttribute("data-tab-id");
+ if (id && state[id] !== undefined) {
+ (tabs as any).selectedIndex = state[id];
+ }
+ });
+}
+
+function saveTabStateToPersistent(): void {
+ const tabState = captureTabState();
+ const existing = vscode.getState() ?? {};
+ vscode.setState({ ...existing, tabState });
+}
+
+function restoreTabStateFromPersistent(): void {
+ const saved = vscode.getState() as Record | undefined;
+ if (saved?.tabState) {
+ restoreTabState(saved.tabState as TabState);
+ }
+}
+
+// ---------------------------------------------------------------------------
+// DOM content update (in-place, preserving tab state)
+// ---------------------------------------------------------------------------
+
+function applyContentUpdate(message: any): void {
+ const tabState = captureTabState();
+
+ const projectCol = document.getElementById("projectCol");
+ const buildTestCol = document.getElementById("buildTestCol");
+ const calculatedArea = document.getElementById("calculatedArea");
+ const noProjectArea = document.getElementById("noProjectArea");
+ const selectorContainer = document.getElementById("buildTestSelectorContainer");
+ const headerActions = document.getElementById("headerActions");
+
+ if (projectCol && message.projectHtml !== undefined) {
+ projectCol.innerHTML = message.projectHtml;
+ }
+ if (buildTestCol && message.buildOrTestHtml !== undefined) {
+ buildTestCol.innerHTML = message.buildOrTestHtml;
+ }
+ if (calculatedArea && message.calculatedHtml !== undefined) {
+ calculatedArea.innerHTML = message.calculatedHtml;
+ }
+ if (noProjectArea && message.noProjectHtml !== undefined) {
+ noProjectArea.innerHTML = message.noProjectHtml;
+ }
+ if (selectorContainer && message.selectorHtml !== undefined) {
+ selectorContainer.innerHTML = message.selectorHtml;
+ }
+
+ // Update header action button disabled states
+ if (headerActions) {
+ const buttons = headerActions.querySelectorAll("vscode-button");
+ buttons.forEach((btn) => {
+ if (message.hasBuildSelected) {
+ btn.removeAttribute("disabled");
+ } else {
+ btn.setAttribute("disabled", "");
+ }
+ });
+ }
+
+ // Update project selector options
+ const projectSelect = document.getElementById("projectSelect");
+ if (projectSelect && message.projectOptionsHtml !== undefined) {
+ (projectSelect as HTMLElement).innerHTML = message.projectOptionsHtml;
+ }
+
+ // Restore tab state after a microtask to let custom elements render
+ requestAnimationFrame(() => {
+ restoreTabState(tabState);
+ saveTabStateToPersistent();
+ });
+}
+
// ---------------------------------------------------------------------------
// Initialize
// ---------------------------------------------------------------------------
function init(): void {
- setupProjectSelector();
- setupBuildTestSelector();
- setupCollapsibles();
+ setupChangeHandlers();
setupClickDelegation();
+
+ // Monitor tab changes to persist state
+ document.addEventListener("click", (e) => {
+ const target = e.target as HTMLElement | null;
+ if (target?.tagName?.toLowerCase() === "vscode-tab-header") {
+ // Delay slightly so the tab selection updates first
+ requestAnimationFrame(() => saveTabStateToPersistent());
+ }
+ });
+
+ // Restore tabs from persisted state on initial load
+ requestAnimationFrame(() => restoreTabStateFromPersistent());
}
// Handle messages from extension
window.addEventListener("message", (event) => {
const message = event.data;
switch (message.command) {
+ case "updateContent":
+ applyContentUpdate(message);
+ break;
case "refresh":
// Full content replacement handled by extension re-setting HTML
break;
diff --git a/src/panels/sdk_panel/SDKPanel.ts b/src/panels/sdk_panel/SDKPanel.ts
new file mode 100644
index 00000000..3746f58a
--- /dev/null
+++ b/src/panels/sdk_panel/SDKPanel.ts
@@ -0,0 +1,329 @@
+/*
+Copyright 2024 mylonics
+Author Rijesh Augustine
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as vscode from "vscode";
+import { WorkspaceConfig, GlobalConfig } from "../../setup_utilities/types";
+import {
+ getWestSDKContext,
+ listAvailableSDKs,
+ ParsedSDKList,
+ onSDKProgress,
+} from "../../setup_utilities/west_sdk";
+import { notifyError, outputError } from "../../utilities/output";
+
+export class SDKPanel {
+ public static currentPanel: SDKPanel | undefined;
+ private readonly _panel: vscode.WebviewPanel;
+ private readonly _extensionPath: string;
+ private readonly _context: vscode.ExtensionContext;
+ private _disposables: vscode.Disposable[] = [];
+
+ private currentWsConfig?: WorkspaceConfig;
+ private currentGlobalConfig?: GlobalConfig;
+
+ /** Cached SDK list fetched in the background. */
+ private _cachedSDKList?: ParsedSDKList;
+ /** True while a background SDK list fetch is in flight. */
+ private _sdkListFetching = false;
+
+ /** Update all open SDK panels with new config */
+ public static updateAllPanels(wsConfig: WorkspaceConfig, globalConfig: GlobalConfig) {
+ if (SDKPanel.currentPanel) {
+ SDKPanel.currentPanel.updateContent(wsConfig, globalConfig);
+ }
+ }
+
+ public static createOrShow(
+ extensionPath: string,
+ context: vscode.ExtensionContext,
+ wsConfig: WorkspaceConfig,
+ globalConfig: GlobalConfig,
+ ) {
+ const column = vscode.window.activeTextEditor
+ ? vscode.window.activeTextEditor.viewColumn
+ : undefined;
+
+ if (SDKPanel.currentPanel) {
+ SDKPanel.currentPanel._panel.reveal(column);
+ SDKPanel.currentPanel.updateContent(wsConfig, globalConfig);
+ return SDKPanel.currentPanel;
+ }
+
+ const panel = vscode.window.createWebviewPanel(
+ "zephyrIDESDK",
+ "Zephyr IDE: SDK",
+ column || vscode.ViewColumn.One,
+ {
+ enableScripts: true,
+ retainContextWhenHidden: true,
+ localResourceRoots: [vscode.Uri.file(extensionPath)],
+ },
+ );
+
+ SDKPanel.currentPanel = new SDKPanel(
+ panel,
+ extensionPath,
+ context,
+ wsConfig,
+ globalConfig,
+ );
+ return SDKPanel.currentPanel;
+ }
+
+ private constructor(
+ panel: vscode.WebviewPanel,
+ extensionPath: string,
+ context: vscode.ExtensionContext,
+ wsConfig: WorkspaceConfig,
+ globalConfig: GlobalConfig,
+ ) {
+ this._panel = panel;
+ this._extensionPath = extensionPath;
+ this._context = context;
+
+ this.updateContent(wsConfig, globalConfig);
+
+ this._panel.onDidDispose(() => this.dispose(), null, this._disposables);
+
+ this._panel.webview.onDidReceiveMessage(
+ (message) => { this.handleWebviewMessage(message); },
+ null,
+ this._disposables,
+ );
+
+ // Subscribe to SDK install progress events and forward to webview
+ this._disposables.push(
+ onSDKProgress((event) => {
+ this._panel.webview.postMessage({
+ command: 'sdkInstallProgress',
+ data: event,
+ });
+ }),
+ );
+
+ // Pre-fetch SDK list in the background
+ void this.fetchSDKListInBackground();
+ }
+
+ public updateContent(wsConfig: WorkspaceConfig, globalConfig: GlobalConfig) {
+ this.currentWsConfig = wsConfig;
+ this.currentGlobalConfig = globalConfig;
+ this._panel.webview.html = this.getHtmlForWebview(wsConfig, globalConfig);
+
+ // Push cached SDK list immediately if available, otherwise start fetching
+ if (this._cachedSDKList) {
+ this._panel.webview.postMessage({
+ command: "sdkListResult",
+ data: this._cachedSDKList,
+ });
+ } else if (this.hasValidSetupState()) {
+ this._panel.webview.postMessage({ command: "sdkListLoading" });
+ void this.fetchSDKListInBackground();
+ }
+ }
+
+ public dispose() {
+ SDKPanel.currentPanel = undefined;
+ this._panel.dispose();
+ while (this._disposables.length) {
+ const x = this._disposables.pop();
+ if (x) { x.dispose(); }
+ }
+ }
+
+ // ---------------------------------------------------------------------------
+ // Helpers
+ // ---------------------------------------------------------------------------
+
+ private hasValidSetupState(): boolean {
+ return this.currentGlobalConfig?.setupStateDictionary !== undefined &&
+ Object.keys(this.currentGlobalConfig.setupStateDictionary).length > 0;
+ }
+
+ private handleWebviewMessage(message: any) {
+ switch (message.command) {
+ case "installSDK":
+ this.installSDK();
+ return;
+ case "listSDKs":
+ this.listSDKs();
+ return;
+ case "openSetupPanel":
+ vscode.commands.executeCommand("zephyr-ide.open-setup-panel");
+ return;
+ }
+ }
+
+ private async installSDK() {
+ try {
+ await vscode.commands.executeCommand("zephyr-ide.install-sdk");
+ if (this.currentWsConfig && this.currentGlobalConfig) {
+ try {
+ this._cachedSDKList = undefined;
+ this.updateContent(this.currentWsConfig, this.currentGlobalConfig);
+ await this.listSDKs();
+ } catch (updateError) {
+ outputError("SDK Panel", `Failed to refresh panel after SDK installation: ${String(updateError)}`);
+ }
+ }
+ } catch (error) {
+ notifyError("SDK Install", `Failed to install west SDK: ${error}`);
+ }
+ }
+
+ private async fetchSDKListInBackground() {
+ if (this._sdkListFetching || !this.hasValidSetupState()) {
+ return;
+ }
+ if (!this.currentWsConfig || !this.currentGlobalConfig) {
+ return;
+ }
+
+ this._sdkListFetching = true;
+ try {
+ const setupState = await getWestSDKContext(
+ this.currentWsConfig,
+ this.currentGlobalConfig,
+ this._context,
+ );
+ if (!setupState) { return; }
+ const sdkList = await listAvailableSDKs(setupState);
+ this._cachedSDKList = sdkList;
+
+ // Push to webview if still open
+ this._panel.webview.postMessage({
+ command: "sdkListResult",
+ data: sdkList,
+ });
+ } catch {
+ // Silently ignore background fetch failures
+ } finally {
+ this._sdkListFetching = false;
+ }
+ }
+
+ private async listSDKs() {
+ try {
+ if (!this.currentWsConfig || !this.currentGlobalConfig) {
+ notifyError("SDK List", "Configuration not available");
+ return;
+ }
+
+ const setupState = await getWestSDKContext(
+ this.currentWsConfig,
+ this.currentGlobalConfig,
+ this._context,
+ );
+ if (!setupState) {
+ notifyError("SDK List", "No valid west installation found for SDK management");
+ return;
+ }
+
+ const sdkList = await listAvailableSDKs(setupState);
+ this._cachedSDKList = sdkList;
+
+ this._panel.webview.postMessage({
+ command: "sdkListResult",
+ data: sdkList,
+ });
+ } catch (error) {
+ notifyError("SDK List", `Failed to list SDKs: ${error}`);
+ this._panel.webview.postMessage({
+ command: "sdkListResult",
+ data: {
+ success: false,
+ versions: [],
+ error: `Failed to list SDKs: ${error}`,
+ },
+ });
+ }
+ }
+
+ // ---------------------------------------------------------------------------
+ // HTML Generation
+ // ---------------------------------------------------------------------------
+
+ private getHtmlForWebview(wsConfig: WorkspaceConfig, globalConfig: GlobalConfig): string {
+ const hasSetupState = this.hasValidSetupState();
+ const statusIcon = globalConfig.sdkInstalled ? '✓' : hasSetupState ? '⚙' : '⚠';
+ const statusLabel = globalConfig.sdkInstalled ? 'Installed' : hasSetupState ? 'Not Installed' : 'Workspace Required';
+ const statusClass = globalConfig.sdkInstalled ? 'status-success' : hasSetupState ? 'status-warning' : 'status-error';
+
+ const warningSection = !hasSetupState ? `
+
+
+ No West Workspace Found
+
Zephyr SDK
+
+
+
+
+
The Zephyr SDK provides GNU toolchains for cross-compiling to supported target architectures. Install or update toolchains below, then refresh to see what's available.
+
+ ${warningSection}
+
+
+
+
Loading SDK information...
';
+ }
+ setSDKButtonsDisabled(true);
+ vscode.postMessage({ command: 'listSDKs' });
+}
+
+function installSDK(): void {
+ setSDKButtonsDisabled(true);
+ vscode.postMessage({ command: 'installSDK' });
+}
+
+function setSDKButtonsDisabled(disabled: boolean): void {
+ const installBtn = document.getElementById('sdkInstallBtn');
+ const listBtn = document.getElementById('sdkListBtn');
+ if (installBtn) { (installBtn as any).disabled = disabled; }
+ if (listBtn) { (listBtn as any).disabled = disabled; }
+}
+
+function showSDKListLoading(): void {
+ const containerDiv = document.getElementById('sdkListContainer');
+ if (containerDiv) {
+ containerDiv.innerHTML = 'Loading SDK information...
';
+ }
+}
+
+// ---------------------------------------------------------------------------
+// SDK list display
+// ---------------------------------------------------------------------------
+
+interface SDKVersion {
+ version?: string;
+ path?: string;
+ installedToolchains?: string[];
+ availableToolchains?: string[];
+}
+
+interface SDKListData {
+ success: boolean;
+ versions?: SDKVersion[];
+ error?: string;
+}
+
+function displaySDKList(sdkData: SDKListData): void {
+ const containerDiv = document.getElementById('sdkListContainer');
+ if (!containerDiv) { return; }
+
+ setSDKButtonsDisabled(false);
+
+ if (!sdkData.success) {
+ containerDiv.innerHTML = `
+
+
Error: ${escapeHtml(sdkData.error || 'Failed to list SDKs')}
+
+
+
+
+
+ No SDK versions found. Try installing an SDK first.
+
`;
+ return;
+ }
+
+ let html = '';
+ for (const version of sdkData.versions) {
+ const escapedVersion = escapeHtml(version.version || '');
+ const escapedPath = escapeHtml(version.path || '');
+
+ html += `
+
+
+
${escapedPath}
+ ${version.installedToolchains && version.installedToolchains.length > 0 ? `
+
` : ''}
+ ${version.availableToolchains && version.availableToolchains.length > 0 ? `
+
` : ''}
+
${escapeHtml(step.detail)} ` : '';
+ return `
+ ${getStepIcon(step.status)}
+
+ ${escapeHtml(step.label)}
+ ${detail}
+
+
${escapeHtml(data.message)}
`
+ : '';
+
+ const dismissBtn = (data.type === 'complete' || data.type === 'failed')
+ ? '
'
+ : '';
+
+ container.innerHTML = `
+
+
+
+
${stepsHtml}
+ ${messageHtml}
+ ${retryBtn}
+
+
default