Skip to content
Merged
Changes from all commits
Commits
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
22 changes: 12 additions & 10 deletions Extension/src/LanguageServer/cppBuildTaskProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -296,14 +296,15 @@ class CustomBuildTaskTerminal implements Pseudoterminal {
private closeEmitter = new EventEmitter<number>();
public get onDidWrite(): Event<string> { return this.writeEmitter.event; }
public get onDidClose(): Event<number> { return this.closeEmitter.event; }
private endOfLine: string = "\r\n";

constructor(private command: string, private args: string[], private options: cp.ExecOptions | undefined) {
}

async open(_initialDimensions: TerminalDimensions | undefined): Promise<void> {
telemetry.logLanguageServerEvent("cppBuildTaskStarted");
// At this point we can start using the terminal.
this.writeEmitter.fire("Starting build...\r\n");
this.writeEmitter.fire(`Starting build...${this.endOfLine}`);
await this.doBuild();
}

Expand All @@ -325,23 +326,24 @@ class CustomBuildTaskTerminal implements Pseudoterminal {
this.options.cwd = util.resolveVariables(this.options.cwd, this.AdditionalEnvironment);
}

const splitWriteEmitter = (lines: string | Buffer) => {
for (const line of lines.toString().split(/\r?\n/g)) {
this.writeEmitter.fire(line + this.endOfLine);
}
};
try {
const result: number = await new Promise<number>((resolve, reject) => {
cp.exec(activeCommand, this.options, (_error, stdout, _stderr) => {
const endOfLine: string = os.platform() === 'win32' ? "\r\n" : "\n";
if (_error) {
telemetry.logLanguageServerEvent("cppBuildTaskError");
const dot: string = (stdout || _stderr) ? ":" : ".";
this.writeEmitter.fire("Build finished with error" + dot + endOfLine);
this.writeEmitter.fire(stdout.toString());
for (const line of _stderr.toString().split(endOfLine)) {
this.writeEmitter.fire(line);
this.writeEmitter.fire(endOfLine);
}
this.writeEmitter.fire(`Build finished with error${dot}${this.endOfLine}`);
splitWriteEmitter(stdout);
splitWriteEmitter(_stderr);
resolve(-1);
} else {
this.writeEmitter.fire(stdout.toString());
this.writeEmitter.fire(endOfLine + "Build finished successfully." + endOfLine);
splitWriteEmitter(stdout);
this.writeEmitter.fire(`Build finished successfully.${this.endOfLine}`);
resolve(0);
}
});
Expand Down