more logs and fix

Author: guillaume-kotulski

editor/src/config.ts

@@ -157,23 +157,31 @@ export class Config {
     }
 
     private async onDidChangeActiveTextEditor(event: vscode.TextEditor) {
-        if(event)
-        {
-            await this._ctx?.client.sendNotification("experimental/didChangeActiveTextEditor", 
-            this._ctx?.client.code2ProtocolConverter.asTextDocumentIdentifier(
-                event.document));
+        if (!event) {
+            return;
+        }
+
+        const client = this._ctx?.client;
+        if (!client) {
+            return;
         }
+
+        await client.sendNotification("experimental/didChangeActiveTextEditor",
+            client.code2ProtocolConverter.asTextDocumentIdentifier(event.document));
     }
 
 
     private async onDidChangeConfiguration(event: vscode.ConfigurationChangeEvent) {
+        const client = this._ctx?.client;
 
         const requiresReloadOpt = this.requiresReloadOpts.find(
             opt => event.affectsConfiguration(opt)
         );
-        await this._ctx?.client.sendNotification(lc.DidChangeConfigurationNotification.type, {
-            settings: this.cfg,
-        });
+        if (client) {
+            await client.sendNotification(lc.DidChangeConfigurationNotification.type, {
+                settings: this.cfg,
+            });
+        }
 
 
         if (!requiresReloadOpt) return;

editor/src/ctx.ts

@@ -264,8 +264,9 @@ export class Ctx {
             vscode.StatusBarAlignment.Left,
             0
         );
+
         this._client.onNotification(ext.notif_needFetchNotification, async (params) => {
-            Logger.debugLog("Fetch...", params.uri);
+            Logger.log("Fetch...", params.uri);
             statusBarItem.text = "$(sync~spin) Fetch components ...";
             statusBarItem.show();
 
@@ -287,7 +288,6 @@ export class Ctx {
             const packageFolder = path.dirname(path.dirname(parsed));
 
             try {
-                Logger.debugLog("4D Version", this.get4DVersion().toString(false));
 
                 const packageManager = new PackageManager(packageFolder,
                     this.get4DVersion().toString(false), session.accessToken, undefined, (dependencyName) => {
@@ -301,7 +301,7 @@ export class Ctx {
                 });
             } catch (error) {
                 statusBarItem.hide();
-                Logger.debugLog(error);
+                Logger.log(error);
                 vscode.window.showErrorMessage(error);
             }
 
@@ -310,27 +310,31 @@ export class Ctx {
 
         this._client.onNotification(ext.notif_installComponents_before, async (params) => {
             statusBarItem.text = "$(sync~spin) Install components...";
+            Logger.log("Install components...");
             statusBarItem.show();
             this._client.sendNotification(ext.notif_installComponents, params);
-            this.dependencyWatcher(params.uri);
             return true;
         });
 
-        this._client.onNotification(ext.notif_installComponents_done, async (_params) => {
+        this._client.onNotification(ext.notif_installComponents_done, async (params) => {
+            Logger.log("Install components done", params.uri);
+            this.dependencyWatcher(params.uri);
+
             statusBarItem.hide();
             return true;
         });
         this._client.start();
     }
 
     dependencyWatcher(project_id: string) {
-        Logger.debugLog("Watch dependencies for ", project_id);
         const projectFolder = path.resolve(vscode.Uri.parse(project_id).fsPath, "../../");
         const dependencyFile = new vscode.RelativePattern(projectFolder, 'Project/Sources/dependencies.json');
         const watcher = vscode.workspace.createFileSystemWatcher(dependencyFile);
+        Logger.log("Watch dependencies for ", dependencyFile.baseUri);
 
         const disposable = watcher.onDidChange(async uri => {
-            Logger.debugLog("Watch dependencies for ", project_id, " changed ", uri);
+            Logger.log("File has changed ", uri);
+
             this._debouncedRestart();
         });
         this._listWatcher.push(disposable);
@@ -356,7 +360,6 @@ export class Ctx {
             const envWatcher = vscode.workspace.createFileSystemWatcher(environmentPattern);
 
             const envDisposable = envWatcher.onDidChange(async uri => {
-                //const fetchInfo = await this._client.sendRequest(ext.checkNeedFetch, TextDocumentIdentifier.create(project_id));
                 this._debouncedRestart();
             });
 

editor/src/logger.ts

@@ -27,11 +27,11 @@ export class Logger {
 
     }
 
-    public log(...o: any) {
-        
+    public static log(...o: any) {
+        let logger = Logger.get();
         const prefix = `[${new Date().toLocaleString()}]`;
-        this._log.append(prefix + ' ');
-        this._logInOutputChannel(...o);
+        logger._log.append(prefix + ' ');
+        logger._logInOutputChannel(...o);
     }
 
     public static debugLog(...inArgs) {

editor/src/tool4D/toolPreparator.ts

@@ -65,8 +65,8 @@ export class ToolPreparator {
             const versions = getDirectories(inRootFolder)
                 .map(version => LabeledVersion.fromString(version))
                 .filter(version => labeledVersion.channel === "beta" ? true : version.channel === "stable")
-                .sort((a, b) => { if(a.version == b.version){ return a.releaseVersion - b.releaseVersion } 
-                else { return a.version - b.version } });
+                .sort((a, b) => { if(a.version == b.version){ return a.releaseVersion - b.releaseVersion; } 
+                else { return a.version - b.version; } });
 
             if (versions.length > 0) {
                 localLabelVersion = versions[versions.length - 1];
@@ -161,7 +161,7 @@ export class ToolPreparator {
         const labeledVersionWanted: LabeledVersion = this._versionWanted.clone();
         const labelVersionAvailableLocally = this._getTool4DAvailableLocally(tool4DMainFolder, labeledVersionWanted);
 
-        Logger.get().log("Version wanted", this._versionWanted);
+        Logger.log("Version wanted", this._versionWanted);
 
 
         let lastMajorVersion = labeledVersionWanted.version;
@@ -178,7 +178,7 @@ export class ToolPreparator {
                 const hasRRelease = await this._APIManager.HasRReleaseVersionAvailable(lastMajorVersion, labeledVersionWanted.channel);
                 labeledVersionWanted.version = lastMajorVersion;
                 labeledVersionWanted.isRRelease = hasRRelease;
-                Logger.get().log("lastVersion major version available is", labeledVersionWanted.version);
+                Logger.log("lastVersion major version available is", labeledVersionWanted.version);
             }
 
 
@@ -202,8 +202,8 @@ export class ToolPreparator {
                 }
             }
 
-            Logger.get().log("Version available cloud", labeledVersionCloud);
-            Logger.get().log("Version available locally", labelVersionAvailableLocally);
+            Logger.log("Version available cloud", labeledVersionCloud);
+            Logger.log("Version available locally", labelVersionAvailableLocally);
             if (labelVersionAvailableLocally.changelist > 0
                 && labeledVersionCloud.compare(labelVersionAvailableLocally) > 0) {
                 result.updateAvailable = true;
@@ -223,7 +223,7 @@ export class ToolPreparator {
         progress += 10;
         inProgress?.report({ message: `Prepare version ${labelVersionToGet.toString(true)}`, increment: 10 });
 
-        Logger.get().log("Version to get", labelVersionToGet);
+        Logger.log("Version to get", labelVersionToGet);
 
         if (os.type() === "Linux") {
             if (labelVersionToGet.compare(InfoPlistManager.fromExePath(this._getTool4DExe("")).getVersion()) === 0) {
@@ -259,7 +259,7 @@ export class ToolPreparator {
 
 
         tool4DExecutable = this._getTool4DExe(tool4D);
-        Logger.get().log("Exe path", tool4DExecutable);
+        Logger.log("Exe path", tool4DExecutable);
 
         if (!existsSync(tool4DExecutable)) {
             if (!(existsSync(tarPath) || existsSync(debPath))) {

packageManager/src/PackageManager.ts

@@ -71,7 +71,7 @@ export class PackageManager {
         }
 
         // Reconcile dependencies
-        this.reconcile(false);
+        this.reconcile(true);
     }
 
     /**