ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-14 03:58:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/environment/common/environment.ts
View File

@@ -7,7 +7,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
import { URI } from 'vs/base/common/uri';
export interface ParsedArgs {
[arg: string]: any;
_: string[];
'folder-uri'?: string | string[];
'file-uri'?: string | string[];
@@ -19,6 +18,7 @@ export interface ParsedArgs {
waitMarkerFilePath?: string;
diff?: boolean;
add?: boolean;
gitCredential?: string;
goto?: boolean;
'new-window'?: boolean;
'unity-launch'?: boolean; // Always open a new window, except if opening the first window or opening a file or folder as part of the launch.

5
src/vs/platform/environment/node/argv.ts
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 {