Skip to content

Commit

Permalink
add header to console.log
Browse files Browse the repository at this point in the history
  • Loading branch information
@F4r3n
F4r3n committed Feb 27, 2024
1 parent 933b7f6 commit d969b3d
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 25 deletions.
1 change: 0 additions & 1 deletion editor/src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ export class Config {
const match = content.match(/CFBundleShortVersionString<\/key>\s*<string>(.*)<\/string>/mi);
if (match !== null && match.length > 1) {
let matchVersion = match[1].match(/(([0-9]*R[0-9])|[0-9]+)\.([0-9]{2,})/)
console.log(matchVersion)
if (matchVersion) {
if (matchVersion[2]) {
labeledVersion = LabeledVersion.fromString(matchVersion[2]);
Expand Down
20 changes: 10 additions & 10 deletions editor/src/ctx.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { workspace } from 'vscode';
import * as child_process from 'child_process';
import * as net from 'net';

import * as Logger from "./logger"
export type CommandCallback = {
call: (ctx: Ctx) => Commands.Cmd;
};
Expand Down Expand Up @@ -97,32 +97,32 @@ export class Ctx {
const serverPath: string = this._getServerPath(isDebug);
const port: number = this._getPort(isDebug);

console.log("SERVER PATH", serverPath);
Logger.debugLog("SERVER PATH", serverPath);

const serverOptions = () =>
new Promise<child_process.ChildProcess | StreamInfo>((resolve, reject) => {
// Use a TCP socket because of problems with blocking STDIO
const server = net.createServer(socket => {
// 'connection' listener
console.log('4D process connected');
Logger.debugLog('4D process connected');
socket.on('end', () => {
console.log('4D process disconnected');
Logger.debugLog('4D process disconnected');
server.close();
});
socket.on('close', () => {
console.log('4D process disconnected');
Logger.debugLog('4D process disconnected');
server.close();
});
socket.on('error', (e) => {
console.log(e);
Logger.debugLog(e);
server.close();
});
resolve({ reader: socket, writer: socket, detached: false });
});

// Listen on random port
server.listen(port, '127.0.0.1', () => {
console.log(`Listens on port: ${(server.address() as net.AddressInfo).port}`);
Logger.debugLog(`Listens on port: ${(server.address() as net.AddressInfo).port}`);

if (serverPath != '') {
const childProcess = child_process.spawn(serverPath, [
Expand All @@ -131,7 +131,7 @@ export class Ctx {

childProcess.stderr.on('data', (chunk: Buffer) => {
const str = chunk.toString();
console.log('4D Language Server:', str);
Logger.debugLog('4D Language Server:', str);
this._client.outputChannel.appendLine(str);
});

Expand All @@ -146,7 +146,7 @@ export class Ctx {


server.on('close', function () {
console.log("KILL");
Logger.debugLog("KILL");
childProcess.kill();
});

Expand Down Expand Up @@ -183,7 +183,7 @@ export class Ctx {
if (this._config.IsTool4DEnabled()) {
this.prepareTool4D(this._config.tool4DWanted(), this._config.tool4DLocation(), this._config.tool4DDownloadChannel())
.then(result => {
console.log("PATH ", result.path);
Logger.debugLog("PATH ", result.path);

this._config.setTool4DPath(result.path);
this._launch4D();
Expand Down
7 changes: 7 additions & 0 deletions editor/src/logger.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@


export function debugLog(...inArgs) {
var args = Array.prototype.slice.call(inArgs);
args.unshift("[4D-Analyzer]")
console.log.apply(console, args);
}
3 changes: 1 addition & 2 deletions editor/src/test/goToDef.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ suite('Go To Def', () => {

async function testGoToDef(docUri: vscode.Uri) {

let pos = new vscode.Position(35,0)
//console.log(activate)
const pos = new vscode.Position(35,0)
await activate(docUri);
await setContentAtpos("__method_goToDef_1()", pos);

Expand Down
1 change: 0 additions & 1 deletion editor/src/test/runTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ async function main() {
// The path to test runner
// Passed to --extensionTestsPath
const extensionTestsPath = path.resolve(__dirname, './index');
//console.log("ENV " + process.env["ANALYZER_4D_PATH"])
//process.env.ANALYZER_4D_PATH=process.env["ANALYZER_4D_PATH"]
// Download VS Code, unzip it and run the integration test
await runTests({ extensionDevelopmentPath, extensionTestsPath });
Expand Down
26 changes: 15 additions & 11 deletions editor/src/toolPreparator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { existsSync, mkdirSync, readdirSync } from "fs";
import * as child_process from 'child_process';
import * as path from 'path';
import * as vscode from 'vscode';

import * as Logger from './logger'

export class LabeledVersion {
public version: number = 0;
Expand Down Expand Up @@ -336,7 +336,7 @@ export class ToolPreparator {
return new Promise((resolve, reject) => {
if (!existsSync(input))
reject();
console.log("Untar", input);
Logger.debugLog("Untar", input);
const childProcess = child_process.spawn("tar", [
'-xf', input, '-C', inDirectory
]);
Expand All @@ -359,7 +359,6 @@ export class ToolPreparator {
.filter(dirent => dirent.isDirectory())
.map(dirent => dirent.name);
}

return [];
}

Expand All @@ -370,6 +369,7 @@ export class ToolPreparator {
.map(version => LabeledVersion.fromString(version))
.filter(version => labeledVersion.channel === "beta" ? true : version.channel === "stable")
.sort((a, b) => a.version - b.version);

if (versions.length > 0) {
localLabelVersion = versions[versions.length - 1];
if (labeledVersion.isMain()) {
Expand All @@ -391,7 +391,9 @@ export class ToolPreparator {
.map(version => LabeledVersion.fromString(version))
.filter(version => labeledVersion.channel === "beta" ? true : version.channel === "stable")
.sort((a, b) => a.releaseVersion - b.releaseVersion);

if (versions.length > 0) {

localLabelVersion = versions[versions.length - 1];
return this._getTool4DAvailableLocally(inRootFolder, localLabelVersion);
}
Expand Down Expand Up @@ -474,7 +476,7 @@ export class ToolPreparator {
const labeledVersionWanted: LabeledVersion = this._versionWanted.clone();
const labelVersionAvailableLocally = this._getTool4DAvailableLocally(tool4DMainFolder, labeledVersionWanted);

console.log("Version wanted", this._versionWanted)
Logger.debugLog("Version wanted", this._versionWanted)
let lastMajorVersion = labeledVersionWanted.version;
let tool4DExecutable = ""
let labelVersionToGet = labelVersionAvailableLocally;
Expand All @@ -483,42 +485,42 @@ export class ToolPreparator {
if (labeledVersionWanted.isLatest() && !labeledVersionWanted.isMain()) {
lastMajorVersion = await this._getLastMajorVersionAvailable(21, labeledVersionWanted.channel);
labeledVersionWanted.version = lastMajorVersion;
console.log("lastVersion available is", labeledVersionWanted.version)
Logger.debugLog("lastVersion available is", labeledVersionWanted.version)
}

const labeledVersionCloud = await this._getLastVersionCloud(labeledVersionWanted)
if (labeledVersionCloud.changelist === 0 && labelVersionAvailableLocally.changelist === 0) { //version unknown
throw new Error(`Tool4D ${labeledVersionWanted.toString(false)} does not exist`);
}

console.log("Version available cloud", labeledVersionCloud)
console.log("Version available locally", labelVersionAvailableLocally)
console.log("compare", labeledVersionCloud.compare(labelVersionAvailableLocally))
Logger.debugLog("Version available cloud", labeledVersionCloud)
Logger.debugLog("Version available locally", labelVersionAvailableLocally)
Logger.debugLog("compare", labeledVersionCloud.compare(labelVersionAvailableLocally))
if (labelVersionAvailableLocally.changelist > 0
&& labeledVersionCloud.isRRelease == labelVersionAvailableLocally.isRRelease
&& labeledVersionCloud.compare(labelVersionAvailableLocally) > 0) {
result.updateAvailable = true;
}

let labelVersionToGet = labelVersionAvailableLocally;
labelVersionToGet = labelVersionAvailableLocally;
if ((result.updateAvailable && inUpdateIfNeeded) || labelVersionAvailableLocally.changelist === 0) {
labelVersionToGet = labeledVersionCloud;
}

console.log("Version to get", labelVersionToGet)
result.currentVersion = labelVersionToGet;
result.lastVersion = labeledVersionCloud;
} catch (error) {
throw new Error(`Tool4D ${labeledVersionWanted.toString(false)} does not exist`);
}
Logger.debugLog("Version to get", labelVersionToGet)

tool4DExecutable = this._getTool4DExe(path.join(this._getTool4DPath(tool4DMainFolder, labelVersionToGet, true), "tool4d"));

if (existsSync(tool4DExecutable)) {
result.path = tool4DExecutable;
return result;
}


if (!existsSync(globalStoragePath)) {
mkdirSync(globalStoragePath);
}
Expand All @@ -530,11 +532,13 @@ export class ToolPreparator {
const zipPath = path.join(tool4D, "tool4d.compressed");
tool4DExecutable = this._getTool4DExe(tool4D);
if (!existsSync(tool4DExecutable)) {
Logger.debugLog(3)

if (!existsSync(zipPath)) {

try {
const url = this._getURLTool4D(labelVersionToGet);
Logger.debugLog(url)
await this._download(url, zipPath);
}
catch (error) {
Expand Down

0 comments on commit d969b3d

Please sign in to comment.