Merge pull request #507 from github0null/dev

v3.26.5 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,14 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.26.5] revision
+
+**Improve**:
+  - `Project Explorer`: Add `copyPath` context menu in explorer ui.
+  - `Project AutoSave`: When the project file is being modified, cancel the pending save operation. This avoids accidental file overwriting.
+
+***
+
 ### [v3.26.4] 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.26.4",
+    "version": "3.26.5",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -804,6 +804,14 @@
                 "command": "_cl.eide.project.source.folder.modify.extraArgs",
                 "title": "%eide.explorer.folder.modify.extraArgs%"
             },
+            {
+                "command": "_cl.eide.project.source.copyPath",
+                "title": "%eide.explorer.copyPath%"
+            },
+            {
+                "command": "_cl.eide.project.source.copyRelativePath",
+                "title": "%eide.explorer.copyRelativePath%"
+            },
             {
                 "command": "_cl.eide.project.refresh",
                 "title": "%eide.project.refresh%",
@@ -1497,6 +1505,16 @@
                     "when": "viewItem == FILE_ITEM || viewItem == V_FILE_ITEM && view == cl.eide.view.projects",
                     "group": "1_file@0"
                 },
+                {
+                    "command": "_cl.eide.project.source.copyPath",
+                    "when": "viewItem == FOLDER_ROOT || viewItem == FOLDER || viewItem == EXCFOLDER || viewItem == FILE_ITEM || viewItem == EXCFILE_ITEM || viewItem == V_FILE_ITEM || viewItem == V_EXCFILE_ITEM || viewItem == OUTPUT_FILE_ITEM || viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT || viewItem == V_EXCFOLDER && view == cl.eide.view.projects",
+                    "group": "2_file@0"
+                },
+                {
+                    "command": "_cl.eide.project.source.copyRelativePath",
+                    "when": "viewItem == FOLDER_ROOT || viewItem == FOLDER || viewItem == EXCFOLDER || viewItem == FILE_ITEM || viewItem == EXCFILE_ITEM || viewItem == V_FILE_ITEM || viewItem == V_EXCFILE_ITEM || viewItem == OUTPUT_FILE_ITEM && view == cl.eide.view.projects",
+                    "group": "2_file@1"
+                },
                 {
                     "command": "_cl.eide.project.source.file.modify.extraArgs",
                     "when": "viewItem == FILE_ITEM || viewItem == V_FILE_ITEM && view == cl.eide.view.projects",

package.nls.json

@@ -74,6 +74,8 @@
     "eide.explorer.file.compile": "Compile",
     "eide.explorer.file.modify.extraArgs": "Show/Modify Compiler Options",
     "eide.explorer.folder.modify.extraArgs": "Show/Modify Compiler Options",
+    "eide.explorer.copyPath": "Copy Path",
+    "eide.explorer.copyRelativePath": "Copy Relative Path",
 
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "Show Disassembly",

package.nls.zh-CN.json

@@ -74,6 +74,8 @@
     "eide.explorer.file.compile": "编译",
     "eide.explorer.file.modify.extraArgs": "查看/修改此文件的编译选项",
     "eide.explorer.folder.modify.extraArgs": "查看/修改此文件夹的编译选项",
+    "eide.explorer.copyPath": "复制路径",
+    "eide.explorer.copyRelativePath": "复制相对路径",
 
     "eide.source.show_cmsis_config_wizard": "CMSIS Configuration Wizard",
     "eide.source.show.disassembly": "查看反汇编",

src/EIDEProject.ts

@@ -1524,6 +1524,13 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         }
     }
 
+    clearPendingSave() {
+        if (this.__saveDelayTimer) {
+            clearTimeout(this.__saveDelayTimer);
+            this.__saveDelayTimer = undefined;
+        }
+    }
+
     InstallPack(packFile: File, reporter?: (progress?: number, message?: string) => void) {
         return this.packManager.Install(packFile, reporter);
     }

src/EIDEProjectExplorer.ts

@@ -828,7 +828,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                 break;
         }
 
-        prj.Save(false, 1000); // save project file with a delay
+        prj.Save(false, 2500); // save project file with a delay
     }
 
     LoadWorkspaceProject(workspaceState: vscode.Memento) {
@@ -3589,9 +3589,9 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         const uid = prj.getUid();
         const wsf = prj.getWorkspaceFile();
 
-        //
+        prj.clearPendingSave();
+
         // disable autosave
-        //
         this.enableAutoSave(false);
 
         if (this.__autosaveDisableTimeoutTimer) {
@@ -3603,9 +3603,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
             }, 5 * 60 * 1000, this);
         }
 
-        //
-        // do something
-        //
+        // ask user to reload project
         const msg = view_str$prompt$need_reload_project.replace('{}', prj.getProjectName());
         const ans = await vscode.window.showInformationMessage(msg, 'Yes', 'No');
         if (ans == 'Yes') {
@@ -3617,9 +3615,7 @@ export class ProjectExplorer implements CustomConfigurationProvider {
             this.__autosaveDisableTimeoutTimer = undefined;
         }
 
-        //
         // enable auto save
-        //
         this.enableAutoSave(true);
     }
 
@@ -5414,6 +5410,48 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         }
     }
 
+    async copyPath(type: 'abs' | 'relative', item: ProjTreeItem) {
+
+        const project = this.getProjectByTreeItem(item);
+        let copiedPath: string | undefined;
+
+        if (item.type === TreeItemType.FOLDER || 
+            item.type === TreeItemType.FOLDER_ROOT ||
+            item.type === TreeItemType.EXCFOLDER) {
+            const dir = <File>item.val.obj;
+            if (type === 'abs') {
+                copiedPath = dir.path;
+            } else {
+                copiedPath = project?.toRelativePath(dir.path) || dir.path;
+            }
+        }
+        else if (item.type === TreeItemType.V_FOLDER || 
+            item.type === TreeItemType.V_FOLDER_ROOT ||
+            item.type === TreeItemType.V_EXCFOLDER) {
+            const vinfo = <VirtualFolderInfo>item.val.obj;
+            copiedPath = vinfo.path;
+        }
+        else if (item.type === TreeItemType.V_FILE_ITEM || 
+            item.type === TreeItemType.V_EXCFILE_ITEM) {
+            const vinfo = <VirtualFileInfo>item.val.obj;
+            if (type === 'abs') {
+                copiedPath = project?.toAbsolutePath(vinfo.vFile.path) || vinfo.vFile.path;
+            } else {
+                copiedPath = vinfo.path;
+            }
+        } 
+        else if (item.val.value instanceof File) { // if value is a file, use it
+            if (type === 'abs') {
+                copiedPath = item.val.value.path;
+            } else {
+                copiedPath = project?.toRelativePath(item.val.value.path) || item.val.value.path;
+            }
+        }
+
+        if (copiedPath)
+            vscode.env.clipboard.writeText(copiedPath);
+    }
+
     private async showDisassemblyForElf(elfPath: string, prj: AbstractProject) {
 
         try {

src/extension.ts

@@ -210,6 +210,8 @@ export async function activate(context: vscode.ExtensionContext) {
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.file.modify.extraArgs', (item) => projectExplorer.modifyExtraCompilerArgs('file', item)));
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.file.compile', (item) => projectExplorer.compileSingleFile(item)));
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.folder.modify.extraArgs', (item) => projectExplorer.modifyExtraCompilerArgs('folder', item)));
+    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.copyPath', (item) => projectExplorer.copyPath('abs', item)));
+    subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.source.copyRelativePath', (item) => projectExplorer.copyPath('relative', item)));
 
     // file other operations
     subscriptions.push(vscode.commands.registerCommand('_cl.eide.project.excludeSource', (item, items) => projectExplorer.ExcludeSourceFile(item, items)));