Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Run jake in interactive mode so output isn't lost.#2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jon (jbondc) wants to merge 1 commit into from
Closed

Run jake in interactive mode so output isn't lost. #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions Jakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,14 +235,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");

var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {interactive: true});
ex.addListener("cmdEnd", function() {
if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
for (var i in prefixes) {
Expand DownExpand Up@@ -304,18 +297,9 @@ compileFile(processDiagnosticMessagesJs,
file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
var cmd = "node " + processDiagnosticMessagesJs + " " + diagnosticMessagesJson;
console.log(cmd);
var ex = jake.createExec([cmd]);
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, {async: true})

desc("Generates a diagnostic file in TypeScript based on an input JSON file");
Expand DownExpand Up@@ -476,14 +460,7 @@ desc("Builds the test infrastructure using the built compiler");
task("tests", ["local", run].concat(libraryTargets));

function exec(cmd, completeHandler) {
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
// Add listeners for output and error
ex.addListener("stdout", function(output) {
process.stdout.write(output);
});
ex.addListener("stderr", function(error) {
process.stderr.write(error);
});
var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
ex.addListener("cmdEnd", function() {
if (completeHandler) {
completeHandler();
Expand DownExpand Up@@ -677,13 +654,12 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
var options = "--outdir " + temp + ' ' + loggedIOpath;
var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
console.log(cmd + "\n");
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {

exec(cmd, function() {
fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
jake.rmRf(temp);
complete();
});
ex.run();
}, {async: true});

var instrumenterPath = harnessDirectory + 'instrumenter.ts';
Expand All@@ -694,9 +670,7 @@ desc("Builds an instrumented tsc.js");
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
console.log(cmd);
var ex = jake.createExec([cmd]);
ex.addListener("cmdEnd", function() {
exec(cmd, function() {
complete();
});
ex.run();
}, { async: true });
5 changes: 4 additions & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,10 @@ module ts {
}

export function executeCommandLine(args: string[]): void {
var commandLine = parseCommandLine(args);
return executeCommand(parseCommandLine(args));
}

export function executeCommand(commandLine: ParsedCommandLine): void {
var configFileName: string; // Configuration file name (if any)
var configFileWatcher: FileWatcher; // Configuration file watcher
var cachedProgram: Program; // Program cached from last compilation
Expand Down
49 changes: 21 additions & 28 deletions tests/perfsys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,29 +20,9 @@ module perftest {
export var getCurrentDirectory = ts.sys.getCurrentDirectory;
var exit = ts.sys.exit;

var args = ts.sys.args;

// augment sys so first ts.executeCommandLine call will be finish silently
ts.sys.write = (s: string) => { };
ts.sys.exit = (code: number) => { };
ts.sys.args = []

export function restoreSys() {
ts.sys.args = args;
ts.sys.write = write;
}

export function hasLogIOFlag() {
return args.length > 2 && args[0] === "--logio";
}

export function getArgsWithoutLogIOFlag() {
return args.slice(2);
}

export function getArgsWithoutIOLogFile() {
return args.slice(1);
}

var resolvePathLog: ts.Map<string> = {};

Expand All@@ -54,22 +34,33 @@ module perftest {
};
}

export function writeIOLog(fileNames: string[]) {
var path = args[1];
export function writeIOLog(fileNames: string[], dstPath: string) {
var log: IOLog = {
fileNames: fileNames,
resolvePath: resolvePathLog
};

writeFile(path, JSON.stringify(log));
writeFile(dstPath, JSON.stringify(log));
}

export function prepare(): IO {
var log = <IOLog>JSON.parse(readFile(args[0]));
export function prepare(cmd: ts.ParsedCommandLine): IO {
var content = readFile(cmd.fileNames[0]);
if (content === undefined) {
throw new Error('Invalid file: ' + cmd.fileNames[0])
}
try {
var log = <IOLog>JSON.parse(content);
} catch (err) {
write("Invalid IO log file, expecting JSON")
}

cmd.fileNames = []
var files: ts.Map<string> = {};
log.fileNames.forEach(f => { files[f] = readFile(f); })

log.fileNames.forEach(f => {
files[f] = readFile(f);
cmd.fileNames.push(f)
})

ts.sys.createDirectory = (s: string) => { };
ts.sys.directoryExists = (s: string) => true;
ts.sys.fileExists = (s: string) => true;
Expand All@@ -96,7 +87,9 @@ module perftest {

var out: string = "";

ts.sys.write = (s: string) => { out += s; };
ts.sys.write = (s: string) => {
out += s;
};

return {
getOut: () => out,
Expand Down
27 changes: 19 additions & 8 deletions tests/perftsc.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,29 +2,40 @@
/// <reference path="..\src\compiler\tsc.ts"/>

// resolve all files used in this compilation
if (perftest.hasLogIOFlag()) {

ts.optionDeclarations.push({
name: "logio",
type: "string",
isFilePath: true
})

var commandLine = ts.parseCommandLine(ts.sys.args);
commandLine.options.diagnostics = true

var logIoPath = commandLine.options['logio'];
if (logIoPath) {
perftest.interceptIO();

var compilerHost: ts.CompilerHost = {
getSourceFile: (s, v) => {
var content = perftest.readFile(s);
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
},
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
getDefaultLibFileName: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
getCurrentDirectory: () => perftest.getCurrentDirectory(),
getCanonicalFileName: (f: string) => ts.sys.useCaseSensitiveFileNames ? f : f.toLowerCase(),
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
getNewLine: () => ts.sys.newLine
};

var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
var program = ts.createProgram(commandLine.filenames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.filename);
perftest.writeIOLog(fileNames);
var program = ts.createProgram(commandLine.fileNames, commandLine.options, compilerHost);
var fileNames = program.getSourceFiles().map(f => f.fileName);
perftest.writeIOLog(fileNames, "" + logIoPath);
}
else {
var io = perftest.prepare();
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
var io = perftest.prepare(commandLine);
ts.executeCommand(commandLine);

perftest.write(io.getOut());
}