Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

This commit is contained in:
Karl Burtram
2019-04-05 10:09:18 -07:00
committed by GitHub
parent 9bd7e30d18
commit cb5bcf2248
433 changed files with 8915 additions and 8361 deletions

View File

@@ -7,7 +7,7 @@ import * as minimist from 'minimist';
import * as os from 'os';
import { localize } from 'vs/nls';
import { ParsedArgs } from 'vs/platform/environment/common/environment';
import { join } from 'path';
import { join } from 'vs/base/common/path';
import { writeFileSync } from 'fs';
/**
@@ -102,8 +102,9 @@ export const options: Option[] = [
{ id: 'user', type: 'string', alias: 'U' },
{ id: 'command', type: 'string', alias: 'c' },
{ id: 'aad', type: 'boolean' },
{ id: 'integrated', type: 'boolean', alias: 'E' }
{ id: 'integrated', type: 'boolean', alias: 'E' },
// {{SQL CARBON EDIT}} - End
{ id: '_', type: 'string' }
];
export function parseArgs(args: string[], isOptionSupported = (_: Option) => true): ParsedArgs {