- Remove models file UTF8-BOM header

github0null · github0null · commit 1dcc5b1e73be · 2024-01-13T19:27:32.000+08:00
- Optimize project auto save/reload
- Add 'Build', 'Flash' status bar
- Optimize api
diff --git a/package.json b/package.json
@@ -1126,7 +1126,7 @@
                 {
                     "command": "_cl.eide.project.source.show_disassembly",
                     "group": "commands",
-                    "when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.info$|\\.axf$|\\.elf$/ && cl.eide.projectActived && !config.EIDE.Option.DisableEditorContextMenu"
+                    "when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.info$|\\.axf$|\\.elf$|\\.out$/ && cl.eide.projectActived && !config.EIDE.Option.DisableEditorContextMenu"
                 },
                 {
                     "command": "_cl.eide.project.source.show_cmsis_config_wizard",
@@ -1155,15 +1155,10 @@
                 }
             ],
             "explorer/context": [
-                {
-                    "command": "eide.c51ToSdcc",
-                    "group": "commands",
-                    "when": "resourceLangId =~ /^c$|^cpp$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"
-                },
                 {
                     "command": "_cl.eide.project.source.show_disassembly",
                     "group": "commands",
-                    "when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.axf$|\\.elf$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"
+                    "when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.axf$|\\.elf$|\\.out$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"
                 },
                 {
                     "command": "_cl.eide.project.source.show_cmsis_config_wizard",
@@ -1660,6 +1655,15 @@
                     }
                 }
             }
-        ]
+        ],
+        "icons": {
+            "eide-hammer": {
+                "description": "fa-hammer",
+                "default": {
+                    "fontPath": "./res/icon/fa-solid-900.woff",
+                    "fontCharacter": "\\f6e3"
+                }
+            }
+        }
     }
 }
diff --git a/package.nls.json b/package.nls.json
@@ -101,6 +101,7 @@
     "settings.builder.jobs": "The number of threads when build",
     
     "settings.option.show.toolbar.in.editer.title": "Displays some toolbars in the editor title",
+    "settings.option.show.statusbar": "Displays toolbar icons in the status bar",
     "settings.option.print.relative.path": "Print relative path when compile source file",
     "settings.option.create.batch.file": "Create batch file after build",
     "settings.option.use.task.to.build": "Use Task to build project instead of Terminal",
diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json
@@ -93,7 +93,8 @@
 
     "settings.builder.jobs": "构建时使用的线程数",
 
-    "settings.option.show.toolbar.in.editer.title": "在编辑器的标题栏显示小工具",
+    "settings.option.show.toolbar.in.editer.title": "在编辑器的标题栏显示工具栏图标",
+    "settings.option.show.statusbar": "在状态栏显示工具栏图标",
     "settings.option.print.relative.path": "编译时打印源文件的相对路径",
     "settings.option.create.batch.file": "生成脚本",
     "settings.option.use.task.to.build": "使用 vscode 任务执行编译命令",
diff --git a/res/data/models/unix/any.gcc.model.json b/res/data/models/unix/any.gcc.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "GNU Toolchain",
     "id": "GCC",
     "toolPrefix": "",
diff --git a/res/data/models/unix/arm.gcc.model.json b/res/data/models/unix/arm.gcc.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "GNU Arm Embedded Toolchain",
     "id": "GCC",
     "toolPrefix": "arm-none-eabi-",
diff --git a/res/data/models/unix/stm8.cosmic.model.json b/res/data/models/unix/stm8.cosmic.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "COSMIC C Compiler For STM8",
     "id": "COSMIC_STM8",
     "useUnixPath": true,
diff --git a/res/data/models/unix/stm8.iar.model.json b/res/data/models/unix/stm8.iar.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "IAR C Compiler For STM8",
     "id": "IAR_STM8",
     "version": {
diff --git a/res/data/models/win32/any.gcc.model.json b/res/data/models/win32/any.gcc.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "GNU Toolchain",
     "id": "GCC",
     "toolPrefix": "",
diff --git a/res/data/models/win32/arm.gcc.model.json b/res/data/models/win32/arm.gcc.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "GNU Arm Embedded Toolchain",
     "id": "GCC",
     "toolPrefix": "arm-none-eabi-",
diff --git a/res/data/models/win32/stm8.cosmic.model.json b/res/data/models/win32/stm8.cosmic.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "COSMIC C Compiler For STM8",
     "id": "COSMIC_STM8",
     "version": {
diff --git a/res/data/models/win32/stm8.iar.model.json b/res/data/models/win32/stm8.iar.model.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "name": "IAR C Compiler For STM8",
     "id": "IAR_STM8",
     "version": {
diff --git a/res/icon/fa-regular-400.woff b/res/icon/fa-regular-400.woff
diff --git a/res/icon/fa-solid-900.woff b/res/icon/fa-solid-900.woff
diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -57,9 +57,9 @@ import * as ArmCpuUtils from './ArmCpuUtils';
 
 export interface BuildOptions {
 
-    useDebug?: boolean;
+    dry_run?: boolean; // true: 仅输出编译命令及版本信息
 
-    useFastMode?: boolean;
+    not_rebuild?: boolean; // true: 增量编译，false: 重新编译所有
 
     flashAfterBuild?: boolean;
 
@@ -259,7 +259,7 @@ export abstract class CodeBuilder {
         let commandLine = this.genBuildCommand(options);
         if (!commandLine) return;
 
-        const title = (options?.useDebug ? 'compiler params' : 'build') + `:${this.project.getCurrentTarget()}`;
+        const title = (options?.dry_run ? 'compiler params' : 'build') + `:${this.project.getCurrentTarget()}`;
 
         // watch log, to emit done event
         try {
@@ -328,8 +328,8 @@ export abstract class CodeBuilder {
     genBuildCommand(options?: BuildOptions, disPowershell?: boolean): string | undefined {
 
         // reinit build mode
-        this.useFastCompile = options?.useFastMode;
-        this.useShowParamsMode = options?.useDebug;
+        this.useFastCompile = options?.not_rebuild;
+        this.useShowParamsMode = options?.dry_run;
 
         /* if not found toolchain, exit ! */
         if (!this.project.checkAndNotifyInstallToolchain()) { return; }
@@ -387,11 +387,6 @@ export abstract class CodeBuilder {
         return false;
     }
 
-    private getBuilderModelsDir(): File {
-        const platDir = osType() == 'win32' ? 'win32' : 'unix';
-        return File.fromArray([ResManager.instance().GetAppDataDir().path, 'models', platDir]);
-    }
-
     private getCommands(): string[] {
 
         const config = this.project.GetConfiguration().config;
@@ -413,7 +408,7 @@ export abstract class CodeBuilder {
             target: this.project.getCurrentTarget(),
             toolchain: toolchain.name,
             toolchainLocation: toolchain.getToolchainDir().path,
-            toolchainCfgFile: `${this.getBuilderModelsDir().path}/${toolchain.modelName}`,
+            toolchainCfgFile: `${ResManager.GetInstance().getBuilderModelsDir().path}/${toolchain.modelName}`,
             buildMode: 'fast|multhread',
             showRepathOnLog: settingManager.isPrintRelativePathWhenBuild(),
             threadNum: settingManager.getThreadNumber(),
diff --git a/src/EIDEProject.ts b/src/EIDEProject.ts
@@ -849,6 +849,28 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         return [this.getRootDir().path, this.getOutputDir(), this.getProjectName()].join(File.sep);
     }
 
+    /**
+     * get build output elf executable file path
+     * @note not hex, bin file path
+    */
+    public getExecutablePath(): string {
+        return this.getExecutablePathWithoutSuffix() + this.getToolchain().elfSuffix;
+        // @discard parse from file
+        // ------------------------------
+        // let suffix = '.axf';
+        // try {
+        //     let fpath = `${ResManager.GetInstance().getBuilderModelsDir().path}/${this.getToolchain().modelName}`;
+        //     let model = JSON.parse(fs.readFileSync(fpath).toString());
+        //     if (model['groups']['linker'] &&
+        //         model['groups']['linker']['$outputSuffix'] != undefined) {
+        //         suffix = model['groups']['linker']['$outputSuffix'];
+        //     }
+        // } catch (error) {
+        //     GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Error'));
+        // }
+        // return this.getExecutablePathWithoutSuffix() + suffix;
+    }
+
     public getUid(): string {
         const miscInfo = this.GetConfiguration().config.miscInfo;
         if (miscInfo.uid == undefined) miscInfo.uid = md5(`${this.getEideDir().path}-${Date.now()}`);
@@ -909,6 +931,10 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         return File.fromArray([this.getEideDir().path, AbstractProject.prjConfigName]);
     }
 
+    public getProjectRoot(): File {
+        return this.getRootDir();
+    }
+
     ////////////////////////////////// Abstract Project ///////////////////////////////////
 
     constructor() {
diff --git a/src/EIDEProjectExplorer.ts b/src/EIDEProjectExplorer.ts
@@ -431,6 +431,7 @@ export class ProjTreeItem extends vscode.TreeItem {
             case '.elf':
             case '.bin':
             case '.out':
+            case '.sm8':
                 name = 'file_type_binary.svg';
                 break;
             case '.map':
@@ -924,12 +925,44 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
 
             const activeProj = this.getActiveProject();
 
-            if (name == 'current.project') {
-                bar.text = `EIDE Project: ${activeProj?.getProjectName() || 'unspecified'}`;
+            if (name == 'project') {
+                bar.text = `EIDE Project: ${activeProj?.getCurrentTarget() || 'unspecified'}`;
+                if (activeProj) {
+                    let txt = `Switch target for eide project:`;
+                    txt += `${os.EOL}  - path: \`${activeProj.getProjectRoot().path}\``;
+                    bar.tooltip = new vscode.MarkdownString(txt);
+                } else {
+                    bar.tooltip = `Switch target for eide project`;
+                }
+            }
+
+            else if (name == 'build') {
+                if (activeProj) {
+                    let txt = `Build eide project:`;
+                    let repath = activeProj.ToRelativePath(activeProj.getExecutablePath());
+                    txt += `${os.EOL}  - output: \`${repath}\``;
+                    bar.tooltip = new vscode.MarkdownString(txt);
+                } else {
+                    bar.tooltip = `Build eide project`;
+                }
             }
 
-            else if (name == 'current.target') {
-                bar.text = `Target: ${activeProj?.getCurrentTarget() || 'unspecified'}`;
+            else if (name == 'flash') {
+                if (activeProj) {
+                    try {
+                        const flasher = HexUploaderManager.getInstance().createUploader(activeProj);
+                        let txt = `Program flash eide project:`;
+                        flasher.getAllProgramFiles().forEach(f => {
+                            let repath = activeProj.ToRelativePath(f.path) || f.path;
+                            txt += `${os.EOL}  - \`${repath}\``
+                        });
+                        bar.tooltip = new vscode.MarkdownString(txt);
+                    } catch (error) {
+                        GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
+                    }
+                } else {
+                    bar.tooltip = `Program flash eide project`;
+                }
             }
         });
     }
@@ -1743,7 +1776,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                     //   #  Symbol Name                Value      Bind  Sec  Type  Vis  Size
                     case 'AC5':
                     case 'AC6':
-                        elfpath = prj.getExecutablePathWithoutSuffix() + '.axf';
+                        elfpath = prj.getExecutablePath();
                         elftool = [toolchain.getToolchainDir().path, 'bin', `fromelf${exeSuffix()}`].join(File.sep);
                         elfcmds = ['--text', '-s', elfpath];
                         staMatcher = /\(SHT_SYMTAB\)/
@@ -1755,15 +1788,15 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                     // iar fmt:
                     //   # Name                                Value      Sec Type Bd Size   Group Other
                     case 'IAR_ARM':
-                        elfpath = prj.getExecutablePathWithoutSuffix() + '.elf';
+                        elfpath = prj.getExecutablePath();
                         elftool = [toolchain.getToolchainDir().path, 'bin', `ielfdumparm${exeSuffix()}`].join(File.sep);
                         elfcmds = ['-s', '.symtab', elfpath];
                         symMatcher = /^\s*\d+:\s+(?<name>[^\s]+)\s+(?<addr>0x[0-9a-f]+)\s+(?:[^\s]+)\s+(?<type>[^\s]+\s+[^\s]+)(?<size>\s+0x[0-9a-f]+)?/i;
                         truncatStaMatcher = /^\s*\d+:\s+(?:[^\s]+)\s*$/i
                         truncatEndMatcher = /^\s*0x[0-9a-f]+\s+/i
                         break;
                     case 'IAR_STM8':
-                        elfpath = prj.getExecutablePathWithoutSuffix() + '.out';
+                        elfpath = prj.getExecutablePath();
                         elftool = [toolchain.getToolchainDir().path, 'stm8', 'bin', `ielfdumpstm8${exeSuffix()}`].join(File.sep);
                         elfcmds = ['-s', '.symtab', elfpath];
                         symMatcher = /^\s*\d+:\s+(?<name>[^\s]+)\s+(?<addr>0x[0-9a-f]+)\s+(?:[^\s]+)\s+(?<type>[^\s]+\s+[^\s]+)(?<size>\s+0x[0-9a-f]+)?/i;
@@ -1775,7 +1808,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                     case 'ANY_GCC':
                     case 'MIPS_GCC':
                     case 'MTI_GCC':
-                        elfpath = prj.getExecutablePathWithoutSuffix() + '.elf';
+                        elfpath = prj.getExecutablePath();
                         elftool = [toolchain.getToolchainDir().path, 'bin', `${toolchainPrefix}nm${exeSuffix()}`].join(File.sep);
                         elfcmds = sortType == 'size' ? ['-l', '-S', '--size-sort', elfpath] : ['-ln', '-S', elfpath];
                         elfsort = true;
@@ -1789,7 +1822,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                         //  c_y:            00000007 section .ubsct defined public zpage
                         //  f_exit:         00008221 section .text defined public
                         //  f_main:         00008165 section .text defined public
-                        elfpath = prj.getExecutablePathWithoutSuffix() + '.sm8';
+                        elfpath = prj.getExecutablePath();
                         elftool = [toolchain.getToolchainDir().path, `cobj${exeSuffix()}`].join(File.sep);
                         elfcmds = ['-s', elfpath];
                         symMatcher = /^\s*(?<name>\w+):\s+(?<addr>[0-9a-f]+)\s+\w+\s+(?<type>[\w\.]+)/i;
@@ -4189,7 +4222,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
 
             /* gen command */
             const builder = CodeBuilder.NewBuilder(project);
-            const cmdLine = builder.genBuildCommand({ useFastMode: !rebuild }, true);
+            const cmdLine = builder.genBuildCommand({ not_rebuild: !rebuild }, true);
             if (cmdLine) {
                 buildCfg.command = cmdLine || '';
                 cmdList.push(buildCfg);
diff --git a/src/EIDETypeDefine.ts b/src/EIDETypeDefine.ts
@@ -141,6 +141,7 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
     protected watcher: FileWatcher;
 
     protected isDelUnknownKeysWhenLoad: boolean = true;
+    protected lastSaveTime: number = 0;
 
     constructor(configFile: File, type?: ProjectType) {
         this._event = new events.EventEmitter();
@@ -156,6 +157,13 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
 
     public load(): Configuration<ConfigType, EventType> {
 
+        try {
+            const meta = fs.statSync(this.cfgFile.path);
+            this.lastSaveTime = meta.mtime.getTime();
+        } catch (err) {
+            // nothing todo
+        }
+
         if (this.cfgFile.IsFile()) {
             this.InitConfig(this.cfgFile.Read());
         } else {
@@ -269,6 +277,7 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
         }
 
         if (oldContent == undefined || !this._json_equal(oldContent, newContent)) {
+            this.lastSaveTime = Date.now();
             this.cfgFile.Write(newContent);
         }
     }
@@ -442,8 +451,19 @@ export class ProjectConfiguration<T extends BuilderConfigData>
             resolveEnvVar: (p) => p
         };
 
-        this.watcher.OnChanged = () => this.onProjectFileChanged();
-        this.watcher.OnRename = () => this.onProjectFileChanged();
+        const _cb = () => {
+            try {
+                const meta = fs.statSync(this.cfgFile.path);
+                if (meta.mtime.getTime() > this.lastSaveTime + 3000) {
+                    this.onProjectFileChanged();
+                }
+            } catch (err) {
+                // nothing todo
+            }
+        };
+
+        this.watcher.OnChanged = _cb
+        this.watcher.OnRename = _cb;
     }
 
     private __fileChgEvtEmitDelayTimer: NodeJS.Timeout | undefined;
@@ -1388,28 +1408,11 @@ export class ProjectConfiguration<T extends BuilderConfigData>
         return utility.ToJsonStringExclude(eidePrjObj, ProjectConfiguration.EXCL_KEYS_IN_EIDE_JSON, 2);
     }
 
-    private __watcherReloadDelayTimer: NodeJS.Timeout | undefined;
     Save(force?: boolean) {
-
-        this.watcher.Close();
-
         const usrCtx = this.getProjectUsrCtx();
-
-        // save current target
-        usrCtx.target = this.config.mode;
-
+        usrCtx.target = this.config.mode; // save current target
         this.setProjectUsrCtx(usrCtx);
-
         super.Save();
-
-        if (this.__watcherReloadDelayTimer) {
-            this.__watcherReloadDelayTimer.refresh();
-        } else {
-            this.__watcherReloadDelayTimer = setTimeout((_this: ProjectConfiguration<any>) => {
-                _this.__watcherReloadDelayTimer = undefined;
-                _this.Watch();
-            }, 3000, this);
-        }
     }
 }
 
diff --git a/src/HexUploader.ts b/src/HexUploader.ts
diff --git a/src/ResManager.ts b/src/ResManager.ts
diff --git a/src/ToolchainManager.ts b/src/ToolchainManager.ts
diff --git a/src/extension.ts b/src/extension.ts

Original file line number	Diff line number	Diff line change
`@@ -1126,7 +1126,7 @@`
`1126`	`1126`	`{`
`1127`	`1127`	`"command": "_cl.eide.project.source.show_disassembly",`
`1128`	`1128`	`"group": "commands",`
`1129`		`- "when": "resourceExtname =~ /\\.c$\|\\.cpp$\|\\.c\\+\\+$\|\\.cc$\|\\.cxx$\|\\.info$\|\\.axf$\|\\.elf$/ && cl.eide.projectActived && !config.EIDE.Option.DisableEditorContextMenu"`
	`1129`	`+ "when": "resourceExtname =~ /\\.c$\|\\.cpp$\|\\.c\\+\\+$\|\\.cc$\|\\.cxx$\|\\.info$\|\\.axf$\|\\.elf$\|\\.out$/ && cl.eide.projectActived && !config.EIDE.Option.DisableEditorContextMenu"`
`1130`	`1130`	`},`
`1131`	`1131`	`{`
`1132`	`1132`	`"command": "_cl.eide.project.source.show_cmsis_config_wizard",`
`@@ -1155,15 +1155,10 @@`
`1155`	`1155`	`}`
`1156`	`1156`	`],`
`1157`	`1157`	`"explorer/context": [`
`1158`		`- {`
`1159`		`- "command": "eide.c51ToSdcc",`
`1160`		`- "group": "commands",`
`1161`		`- "when": "resourceLangId =~ /^c$\|^cpp$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"`
`1162`		`- },`
`1163`	`1158`	`{`
`1164`	`1159`	`"command": "_cl.eide.project.source.show_disassembly",`
`1165`	`1160`	`"group": "commands",`
`1166`		`- "when": "resourceExtname =~ /\\.c$\|\\.cpp$\|\\.c\\+\\+$\|\\.cc$\|\\.cxx$\|\\.axf$\|\\.elf$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"`
	`1161`	`+ "when": "resourceExtname =~ /\\.c$\|\\.cpp$\|\\.c\\+\\+$\|\\.cc$\|\\.cxx$\|\\.axf$\|\\.elf$\|\\.out$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"`
`1167`	`1162`	`},`
`1168`	`1163`	`{`
`1169`	`1164`	`"command": "_cl.eide.project.source.show_cmsis_config_wizard",`
`@@ -1660,6 +1655,15 @@`
`1660`	`1655`	`}`
`1661`	`1656`	`}`
`1662`	`1657`	`}`
`1663`		`- ]`
	`1658`	`+ ],`
	`1659`	`+ "icons": {`
	`1660`	`+ "eide-hammer": {`
	`1661`	`+ "description": "fa-hammer",`
	`1662`	`+ "default": {`
	`1663`	`+ "fontPath": "./res/icon/fa-solid-900.woff",`
	`1664`	`+ "fontCharacter": "\\f6e3"`
	`1665`	`+ }`
	`1666`	`+ }`
	`1667`	`+ }`
`1664`	`1668`	`}`
`1665`	`1669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{`
	`1`	`+{`
`2`	`2`	`"name": "GNU Toolchain",`
`3`	`3`	`"id": "GCC",`
`4`	`4`	`"toolPrefix": "",`