optimize project load

Author: github0null

src/EIDEProject.ts

@@ -371,8 +371,8 @@ class SourceRootList implements SourceProvider {
     //      val: SourceRootInfo
     private srcFolderMaps: Map<string, SourceRootInfo>;
 
-    private isAutoSearchIncPath: boolean;
-    private isAutoSearchObjFile: boolean;
+    private isAutoSearchIncPath: boolean = false;
+    private isAutoSearchObjFile: boolean = false;
 
     on(event: 'dataChanged', listener: (event: SourceChangedEvent) => void): void;
     on(event: any, listener: (arg: any) => void): void {
@@ -383,8 +383,6 @@ class SourceRootList implements SourceProvider {
         this.project = _project;
         this._event = new events.EventEmitter();
         this.srcFolderMaps = new Map();
-        this.isAutoSearchIncPath = SettingManager.GetInstance().isAutoSearchIncludePath();
-        this.isAutoSearchObjFile = SettingManager.GetInstance().isAutoSearchObjFile();
     }
 
     isAutoSearchObjectFile(): boolean {
@@ -393,6 +391,9 @@ class SourceRootList implements SourceProvider {
 
     load(notEmitEvt?: boolean) {
 
+        this.isAutoSearchIncPath = SettingManager.GetInstance().isAutoSearchIncludePath();
+        this.isAutoSearchObjFile = SettingManager.GetInstance().isAutoSearchObjFile();
+
         this.DisposeAll();
 
         // load source folders from filesystem
@@ -961,6 +962,20 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
                     envFile.Write(cont.join(os.EOL));
                 }
             }
+
+            // add some compatiable settings for old project
+            {
+                const workspaceConfig = this.GetWorkspaceConfig();
+                const settings = workspaceConfig.config.settings;
+
+                // auto search includePath and libPath for old ver project
+                if (this.oldProjectVersion &&
+                    compareVersion('3.3', this.oldProjectVersion) > 0) { // old ver < 3.3
+                    settings['EIDE.SourceTree.AutoSearchIncludePath'] = true;
+                    settings['EIDE.SourceTree.AutoSearchObjFile'] = true;
+                    workspaceConfig.Save(true); // save it now
+                }
+            }
         }
     }
 
@@ -1826,6 +1841,7 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
 
     protected isNewProject?: boolean | undefined;
     protected isOldVersionProject?: boolean | undefined;
+    protected oldProjectVersion?: string | undefined;
 
     protected async BeforeLoad(wsFile: File): Promise<void> {
 
@@ -1842,6 +1858,7 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
                 conf.version = EIDE_CONF_VERSION;
                 eideFile.Write(JSON.stringify(conf));
                 this.isOldVersionProject = true;
+                this.oldProjectVersion = prj_version;
             }
         }
 
@@ -2492,14 +2509,14 @@ class EIDEProject extends AbstractProject {
         // register cfg watcher
         this.onSrcExtraOptionsChanged('changed'); // notify cpptools update now
 
-        // update workspace settings
+        // init settings for new project
         if (this.isNewProject) {
 
             const workspaceConfig = this.GetWorkspaceConfig();
             const settings = workspaceConfig.config.settings;
 
             // --- eide settings
-
+            // TODO
 
             // --- vscode settings
 

src/EIDETypeDefine.ts

@@ -137,14 +137,16 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
     private _eventCache: EventItem[];
     protected _event: events.EventEmitter;
 
-    protected eideJsonFile: File;
+    protected cfgFile: File;
     protected watcher: FileWatcher;
 
+    protected isDelUnknownKeysWhenLoad: boolean = true;
+
     constructor(configFile: File, type?: ProjectType) {
         this._event = new events.EventEmitter();
         this._eventMergeFlag = false;
         this._eventCache = [];
-        this.eideJsonFile = configFile;
+        this.cfgFile = configFile;
         this.FILE_NAME = configFile.name;
         this.watcher = new FileWatcher(configFile, false);
         this.watcher.on('error', (err) => GlobalEvent.emit('error', err));
@@ -154,8 +156,8 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
 
     public load(): Configuration<ConfigType, EventType> {
 
-        if (this.eideJsonFile.IsFile()) {
-            this.InitConfig(this.eideJsonFile.Read());
+        if (this.cfgFile.IsFile()) {
+            this.InitConfig(this.cfgFile.Read());
         } else {
             this.Save(true);
         }
@@ -168,7 +170,7 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
     }
 
     GetFile(): File {
-        return this.eideJsonFile;
+        return this.cfgFile;
     }
 
     Watch() {
@@ -221,9 +223,11 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
         const _configFromFile: any = (typeof json === 'string') ? this.Parse(json) : json;
 
         // clear invalid property
-        for (const key in (<any>_configFromFile)) {
-            if ((<any>this.config)[key] === undefined) {
-                _configFromFile[key] = undefined;
+        if (this.isDelUnknownKeysWhenLoad) {
+            for (const key in (<any>_configFromFile)) {
+                if ((<any>this.config)[key] === undefined) {
+                    _configFromFile[key] = undefined;
+                }
             }
         }
 
@@ -237,7 +241,7 @@ export abstract class Configuration<ConfigType = any, EventType = any> {
     }
 
     Save(force?: boolean): void {
-        this.eideJsonFile.Write(this.ToJson());
+        this.cfgFile.Write(this.ToJson());
     }
 
     protected afterInitConfigData() {
@@ -399,7 +403,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
 
         super(eideJsonFile, type);
 
-        this.rootDir = new File(NodePath.dirname(this.eideJsonFile.dir));
+        this.rootDir = new File(NodePath.dirname(this.cfgFile.dir));
 
         this.project = {
             getRootDir: () => this.rootDir,
@@ -1352,6 +1356,8 @@ export interface WorkspaceConfig {
 
 export class WorkspaceConfiguration extends Configuration<WorkspaceConfig> {
 
+    isDelUnknownKeysWhenLoad = false;
+
     protected readTypeFromFile(configFile: File): ProjectType | undefined {
         return undefined;
     }

src/extension.ts

@@ -437,7 +437,7 @@ async function checkAndInstallBinaries(forceInstall?: boolean): Promise<boolean>
         // try fetch update after 5sec delay
         if (localVersion) {
             setTimeout(async (curLocalVersion: string) => {
-                const done = await tryUpdateBinaries(binFolder, curLocalVersion);
+                const done = await tryUpdateBinaries(binFolder, curLocalVersion, true); // no prompt
                 if (!done) {
                     const msg = `Update eide-binaries failed, please restart vscode to try again !`;
                     const sel = await vscode.window.showErrorMessage(msg, 'Restart', 'Cancel');