Merge branch 'dev' of github.com:github0null/eide into dev

Author: github0null

src/EIDEProjectMigration.ts

@@ -24,6 +24,8 @@ export async function doMigration(projectRootDir: File) {
     }
 
     const prjCfg = ProjectConfiguration.parseProjectFile(projCfgFile.Read());
+
+    // version < 4.0 ?
     if (compareVersion(prjCfg.version, '4.0') < 0) {
         for (const key in prjCfg.targets) {
             const target = prjCfg.targets[key];
@@ -55,6 +57,10 @@ export async function doMigration(projectRootDir: File) {
                 (<any>target)['custom_dep'] = undefined;
             }
         }
+    }
+
+    // save
+    if (compareVersion(prjCfg.version, EIDE_CONF_VERSION) < 0) {
         prjCfg.version = EIDE_CONF_VERSION;
         projCfgFile.Write(ProjectConfiguration.dumpProjectFile(prjCfg));
     }

src/EIDETypeDefine.ts

@@ -511,7 +511,36 @@ export class ProjectConfiguration<T extends BuilderConfigData>
     }
 
     static dumpProjectFile<T>(obj: ProjectConfigData<T>): string {
-        return yaml.stringify(obj, { indent: 2, lineWidth: 1000 });
+        const keyOrder = [
+            'version',
+            'name',
+            'type',
+            'deviceName',
+            'packDir',
+            'srcDirs',
+            'virtualFolder',
+            'dependenceList',
+            'outDir',
+            'miscInfo',
+            'targets'
+        ];
+        return yaml.stringify(obj, {
+            indent: 2,
+            lineWidth: 1000,
+            sortMapEntries: (a: any, b: any) => {
+                const i_a = keyOrder.findIndex(e => e == a.key);
+                const i_b = keyOrder.findIndex(e => e == b.key);
+                if (i_a == -1 && i_b == -1) {
+                    return a.key < b.key ? -1 : a.key > b.key ? 1 : 0;
+                } else if (i_a == -1) {
+                    return 1;
+                } else if (i_b == -1) {
+                    return -1;
+                } else {
+                    return i_a - i_b;
+                }
+            } 
+        });
     }
 
     private __fileChgEvtEmitDelayTimer: NodeJS.Timeout | undefined;
@@ -757,7 +786,8 @@ export class ProjectConfiguration<T extends BuilderConfigData>
         this.config.compileConfig = this.compileConfigModel.data; // bind obj
 
         // update
-        this.compileConfigModel.copyCommonCompileConfigFrom(oldToolchain, oldModel);
+        if (!oldCfg)
+            this.compileConfigModel.copyCommonCompileConfigFrom(oldToolchain, oldModel);
         this.compileConfigModel.copyListenerFrom(oldModel);
     }
 
@@ -1372,7 +1402,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
     }
 
     getProjectUsrCtx(): ProjectUserContextData {
-        const key = `eide.user-ctx.${this.config.miscInfo.uid || 'tmp'}`;
+        const key = `project.${this.config.miscInfo.uid || 'unknown'}`;
         const val = this.workspaceState.get<string>(key);
         if (!val)
             return {};
@@ -1385,7 +1415,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
     };
 
     setProjectUsrCtx(data: ProjectUserContextData) {
-        const key = `eide.user-ctx.${this.config.miscInfo.uid || 'tmp'}`;
+        const key = `project.${this.config.miscInfo.uid || 'unknown'}`;
         const val = this.workspaceState.get<string>(key);
         const saveVal = JSON.stringify(data);
         if (val !== saveVal) {

src/extension.ts

@@ -310,7 +310,7 @@ export async function activate(context: vscode.ExtensionContext) {
     projectExplorer.enableAutoSave(true);
 
     // load project in this workspace
-    projectExplorer.loadWorkspace(context.workspaceState);
+    projectExplorer.loadWorkspace(context.globalState);
 
     // hook
     postLaunchHook(context);