OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Remove tryParse

Browse Source 
Now that the exception handling happens further up there doesn't seem to
be an advantage in having this in a separate method.
This commit is contained in:
Asher 2020-10-09 17:05:21 -05:00
parent 466a04f874
commit 26c735b434
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node/entry.ts
View File

@ -240,16 +240,11 @@ const main = async (args: Args, configArgs: Args): Promise<void> => {
} }
async function entry(): Promise<void> { async function entry(): Promise<void> {
const tryParse = async (): Promise<[Args, Args, Args]> => { const cliArgs = parse(process.argv.slice(2))
const cliArgs = parse(process.argv.slice(2)) const configArgs = await readConfigFile(cliArgs.config)
const configArgs = await readConfigFile(cliArgs.config) // This prioritizes the flags set in args over the ones in the config file.
// This prioritizes the flags set in args over the ones in the config file. let args = Object.assign(configArgs, cliArgs)
let args = Object.assign(configArgs, cliArgs) args = await setDefaults(args)
args = await setDefaults(args)
return [args, cliArgs, configArgs]
}
const [args, cliArgs, configArgs] = await tryParse()
// There's no need to check flags like --help or to spawn in an existing // There's no need to check flags like --help or to spawn in an existing
// instance for the child process because these would have already happened in // instance for the child process because these would have already happened in