development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-06-30 23:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

In WSL --wait is still enforced for stdin (fix #209925) (#210016)

Browse Source
This commit is contained in:
Benjamin Pasero 2024-04-10 11:18:35 +02:00 committed by GitHub
parent 3117776ea2
commit b9226f2929
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/server/node/server.cli.ts
View File

@ -15,6 +15,7 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
import { createWaitMarkerFileSync } from 'vs/platform/environment/node/wait';
import { PipeCommand } from 'vs/workbench/api/node/extHostCLIServer';
import { hasStdinWithoutTty, getStdinFilePath, readFromStdin } from 'vs/platform/environment/node/stdin';
import { DeferredPromise } from 'vs/base/common/async';
/*
* Implements a standalone CLI app that opens VS Code from a remote terminal.
@ -181,26 +182,33 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
parsedArgs['_'] = [];
let readFromStdinPromise: Promise<void> | undefined;
if (hasReadStdinArg && hasStdinWithoutTty()) {
try {
let stdinFilePath = cliStdInFilePath;
if (!stdinFilePath) {
stdinFilePath = getStdinFilePath();
await readFromStdin(stdinFilePath, verbose); // throws error if file can not be written
const readFromStdinDone = new DeferredPromise<void>();
await readFromStdin(stdinFilePath, verbose, () => readFromStdinDone.complete()); // throws error if file can not be written
if (!parsedArgs.wait) {
// if `--wait` is not provided, we keep this process alive
// for at least as long as the stdin stream is open to
// ensure that we read all the data.
readFromStdinPromise = readFromStdinDone.p;
}
}
// Make sure to open tmp file
translatePath(stdinFilePath, mapFileUri, folderURIs, fileURIs);
// Enable --wait to get all data and ignore adding this to history
parsedArgs.wait = true;
// Ignore adding this to history
parsedArgs['skip-add-to-recently-opened'] = true;
console.log(`Reading from stdin via: ${stdinFilePath}`);
} catch (e) {
console.log(`Failed to create file to read via stdin: ${e.toString()}`);
}
}
if (parsedArgs.extensionDevelopmentPath) {
@ -339,6 +347,10 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
if (waitMarkerFilePath) {
waitForFileDeleted(waitMarkerFilePath);
}
if (readFromStdinPromise) {
await readFromStdinPromise;
}
}
}