v3.23.13 revision

v3.23.13 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,13 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.23.13] revision
+
+**Improve**:
+  - `Create Project`: Miscellaneous things. (init project files, init project settings ... etc.)
+
+***
+
 ### [v3.23.12] revision
 
 **Improve**:

package.json

@@ -36,7 +36,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.23.12",
+    "version": "3.23.13",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"

res/data/.clang-format

@@ -1,6 +1,6 @@
 ---
 BasedOnStyle: Microsoft
-Language: Cpp
+Language: C
 
 ###################################
 #          indent conf

src/EIDEProject.ts

@@ -3620,6 +3620,14 @@ class EIDEProject extends AbstractProject {
 
             // --- vscode settings
 
+            // 避免 msys bash 出现 cygpath 问题
+            if (SettingManager.instance().isEnableMsys())
+                settings['terminal.integrated.shellIntegration.enabled'] = false;
+
+            // 默认不要自动插入 header
+            if (settings["clangd.arguments"] == undefined)
+                settings["clangd.arguments"] = ["--header-insertion=never"];
+
             if (settings['files.autoGuessEncoding'] === undefined) {
                 settings['files.autoGuessEncoding'] = true;
             }
@@ -3731,13 +3739,13 @@ class EIDEProject extends AbstractProject {
                 GlobalEvent.emit('msg', ExceptionToMessage(error, 'Hidden'));
             }
 
-            // gen default 'settings.json'
-            try {
-                const settingsFile = File.fromArray([this.GetRootDir().path, AbstractProject.vsCodeDir, 'settings.json']);
-                if (!settingsFile.IsFile()) { settingsFile.Write('{}'); }
-            } catch (error) {
-                // nothing todo
-            }
+            // // gen default 'settings.json'
+            // try {
+            //     const settingsFile = File.fromArray([this.GetRootDir().path, AbstractProject.vsCodeDir, 'settings.json']);
+            //     if (!settingsFile.IsFile()) { settingsFile.Write('{}'); }
+            // } catch (error) {
+            //     // nothing todo
+            // }
 
             // add extension recommendation
             {
@@ -3750,8 +3758,7 @@ class EIDEProject extends AbstractProject {
                     "redhat.vscode-yaml",
                     "IBM.output-colorizer",
                     "cschlosser.doxdocgen",
-                    "ms-vscode.vscode-serial-monitor",
-                    "alefragnani.project-manager"
+                    "ms-vscode.vscode-serial-monitor"
                 ];
 
                 const prjInfo = this.GetConfiguration().config;

src/EIDEProjectExplorer.ts

@@ -1373,6 +1373,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                         }
                     }
                     break;
+                // The edit setting value's callback is in @ref ModifyOtherSettings(...)
                 case TreeItemType.SETTINGS:
                     {
                         const config = project.GetConfiguration();
@@ -3986,7 +3987,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
                 //
                 cfg['CompileFlags']['CompilationDatabase'] = './' + File.ToUnixPath(prj.getOutputDir());
                 const toolchain = prj.getToolchain();
-                const gccLikePath = toolchain.getGccFamilyCompilerPathForCpptools('c++');
+                const gccLikePath = toolchain.getGccFamilyCompilerPathForCpptools('c');
                 if (gccLikePath) { // clangd 仅兼容gcc的编译器
                     cfg['CompileFlags']['Compiler'] = gccLikePath;
                     let clangdCompileFlags = <string[]>(cfg['CompileFlags']['Add']);

src/Platform.ts

@@ -169,7 +169,7 @@ export function GetUUID(): string {
             const list = buf.match(/[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}/);
             uuid = list ? list[0] : UUID_NULL;
         } else {
-            uuid = child_process.execSync(`cat /proc/sys/kernel/random/uuid`).toString().trim();
+            uuid = 'machine-id-' + child_process.execSync(`cat /etc/machine-id`).toString().trim();
         }
     } catch (error) {
         uuid = UUID_NULL;

src/ResManager.ts

@@ -259,6 +259,9 @@ export class ResManager extends events.EventEmitter {
         }
     }
 
+    /**
+     * 按照文件名字，在 /tmp/EIDE 目录下寻找缓存的临时文件
+    */
     getCachedFileByName(name: string): File {
         return new File(this.GetTmpDir().path + File.sep + name);
     }