Merge pull request #79 from github0null/dev

v2.15.2 revision

Author: github0null

CHANGELOG.md

@@ -4,12 +4,17 @@
 
 ***
 
-### [v2.15.1]
-- 新增：支持在**源文件路径**，**烧录选项->程序文件** 中使用**变量**. 暂支持以下变量：
-  - `OutDir`：         输出目录
-  - `ProjectName`：    项目名
-  - `ExecutableName`： 输出的可执行文件路径，不含后缀
-  - `ProjectRoot`：    项目根目录
+### [v2.15.2] (revision)
+- **修复：v2.15.1 更新增加了源文件路径变量支持，导致打开项目时加载速度过慢的问题**
+- 优化：当开启 VT100 终端颜色失败时，自动禁用编译输出的关键字高亮（可通过向 Builder.AdditionalCommandLine 设置添加 `-force-color` 强制开启高亮）
+***
+
+### [v2.15.1] (revision)
+- 新增：支持在**源文件路径**，**烧录选项->程序文件** 中使用**变量**（不区分大小写）. 暂支持以下变量：
+  - `$(OutDir)`：         输出目录
+  - `$(ProjectName)`：    项目名
+  - `$(ExecutableName)`： 输出的可执行文件路径，不含后缀
+  - `$(ProjectRoot)`：    项目根目录
   - `项目设置->环境变量` 中的变量（变量名必须只包含字母，数字或下划线）
 - 修复：状态栏 **打开串口命令失效**
 - 修复：sdcc 错误输出高亮匹配失效

package.json

@@ -27,7 +27,7 @@
     "homepage": "https://github.com/github0null/eide/blob/master/README.md",
     "license": "MIT",
     "description": "An embedded development environment for 8051/STM8/Cortex-M/RISC-V",
-    "version": "2.15.1",
+    "version": "2.15.2",
     "engines": {
         "vscode": "^1.60.0"
     },

src/EIDEProject.ts

@@ -1328,15 +1328,15 @@ export abstract class AbstractProject {
         return [];
     }
 
-    getEnvFile(): File {
+    getEnvFile(notInitFile?: boolean): File {
 
         const prjConfig = this.GetConfiguration();
         const targetName = prjConfig.config.mode.toLowerCase();
 
         const envFilePath = `${this.getEideDir().path}${File.sep}${targetName}.env.ini`;
         const envFile = new File(envFilePath);
 
-        if (!envFile.IsFile()) {
+        if (!notInitFile && !envFile.IsFile()) {
             const defTxt: string[] = [
                 `###########################################################`,
                 `#              project environment variables`,
@@ -1361,37 +1361,42 @@ export abstract class AbstractProject {
         return envFile;
     }
 
+    private env_lastGetTime: number = 0;
+    private env_lastReadTime: number = 0;
+    private env_lastRawEnvObj: { [name: string]: any } | undefined;
     getProjectEnv(): { [name: string]: any } | undefined {
+        try {
 
-        const envs = this.getRawEnv();
-        if (envs == undefined) { return; }
-
-        // remove none-string obj
-        for (const key in envs) {
-            if (typeof envs[key] == 'object' ||
-                Array.isArray(envs[key]) ||
-                key.includes(' ')) {
-                delete envs[key];
+            // limit read interval (150 ms), increase speed
+            if (this.env_lastRawEnvObj != undefined &&
+                Date.now() - this.env_lastGetTime < 150) {
+                return this.env_lastRawEnvObj;
             }
-        }
-
-        // return env objects
-        return envs;
-    }
 
-    private lastReadTime: number = 0;
-    private lastRawEnvObj: { [name: string]: any } | undefined;
-    private getRawEnv(): { [name: string]: any } | undefined {
-        try {
-            const envFile = this.getEnvFile();
+            // is env need update ?
+            const envFile = this.getEnvFile(true);
             if (envFile.IsFile()) {
                 const lastMdTime = fs.statSync(envFile.path).mtimeMs;
-                if (this.lastRawEnvObj == undefined ||
-                    lastMdTime > this.lastReadTime) { // update env
-                    this.lastRawEnvObj = ini.parse(envFile.Read());
-                    this.lastReadTime = fs.statSync(envFile.path).mtimeMs;
+                if (this.env_lastRawEnvObj == undefined ||
+                    lastMdTime > this.env_lastReadTime) {
+
+                    // update env
+                    this.env_lastRawEnvObj = ini.parse(envFile.Read());
+                    this.env_lastReadTime = lastMdTime;
+
+                    // delete non-string obj
+                    for (const key in this.env_lastRawEnvObj) {
+                        if (typeof this.env_lastRawEnvObj[key] == 'object' ||
+                            Array.isArray(this.env_lastRawEnvObj[key]) ||
+                            key.includes(' ')) {
+                            delete this.env_lastRawEnvObj[key];
+                        }
+                    }
                 }
-                return this.lastRawEnvObj;
+
+                // return env objects
+                this.env_lastGetTime = Date.now();
+                return this.env_lastRawEnvObj;
             }
         } catch (error) {
             GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));