Merge branch 'master' into release/0.25

extensions/mssql/snippets/mssql.json

@@ -243,6 +243,33 @@
 		"description": "Lists all the columns and their types for tables matching a LIKE statement"
 	},
 
+	"Declare a cursor": {
+		"prefix": "sqlCursor",
+		"body": [
+			"-- Declare a cursor for a Table or a View '${1:TableOrViewName}' in schema '${2:SchemaName}'",
+			"DECLARE @Column1 NVARCHAR(50), @Column2 NVARCHAR(50)",
+			"",
+			"DECLARE db_cursor CURSOR FOR",
+			"SELECT Column1, Column2",
+			"FROM $2.$1",
+			"",
+			"OPEN db_cursor",
+			"FETCH NEXT FROM db_cursor INTO @Column1, @Column2",
+			"",
+			"WHILE @@FETCH_STATUS = 0",
+			"BEGIN",
+			"\t-- add instructions to be executed for every row",
+			"\t$3",
+			"\tFETCH NEXT FROM db_cursor INTO @Column1, @Column2",
+			"END",
+			"",
+			"CLOSE db_cursor",
+			"DEALLOCATE db_cursor",
+			"GO"
+		],
+		"description": "Declare a cursor"
+	},
+
 	"Show space used by tables": {
 		"prefix": "sqlGetSpaceUsed",
 		"body": [

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "dependencies": {
     "@angular/animations": {
       "version": "4.1.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "electronVersion": "1.7.9",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {

src/vs/code/electron-main/launch.ts

@@ -83,10 +83,10 @@ export class LaunchService implements ILaunchService {
 		this.logService.log('Received data from other instance: ', args, userEnv);
 
 		// Check early for open-url which is handled in URL service
-		const openUrlArg = args['open-url'] || [];
+		if (args['open-url'] && args._urls && args._urls.length > 0) {
-		const openUrl = typeof openUrlArg === 'string' ? [openUrlArg] : openUrlArg;
+			// --open-url must contain -- followed by the url(s)
-		if (openUrl.length > 0) {
+			// process.argv is used over args._ as args._ are resolved to file paths at this point
-			openUrl.forEach(url => this.urlService.open(url));
+			args._urls.forEach(url => this.urlService.open(url));
 
 			return TPromise.as(null);
 		}

src/vs/code/electron-main/main.ts

@@ -49,7 +49,7 @@ function createServices(args: ParsedArgs): IInstantiationService {
 	services.set(IStorageService, new SyncDescriptor(StorageService));
 	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
 	services.set(IRequestService, new SyncDescriptor(RequestService));
-	services.set(IURLService, new SyncDescriptor(URLService, args['open-url']));
+	services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : []));
 	services.set(IBackupMainService, new SyncDescriptor(BackupMainService));
 
 	return new InstantiationService(services, true);

src/vs/code/node/paths.ts

@@ -15,6 +15,11 @@ import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { realpathSync } from 'vs/base/node/extfs';
 
 export function validatePaths(args: ParsedArgs): ParsedArgs {
+	// Track URLs if they're going to be used
+	if (args['open-url']) {
+		args._urls = args._;
+		args._ = [];
+	}
 
 	// Realpath/normalize paths and watch out for goto line mode
 	const paths = doValidatePaths(args._, args.goto);

src/vs/platform/environment/common/environment.ts

@@ -8,6 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 export interface ParsedArgs {
 	[arg: string]: any;
 	_: string[];
+	_urls?: string[];
 	help?: boolean;
 	version?: boolean;
 	wait?: boolean;
@@ -38,7 +39,7 @@ export interface ParsedArgs {
 	'install-extension'?: string | string[];
 	'uninstall-extension'?: string | string[];
 	'enable-proposed-api'?: string | string[];
-	'open-url'?: string | string[];
+	'open-url'?: boolean;
 	'skip-getting-started'?: boolean;
 	'sticky-quickopen'?: boolean;
 	'disable-telemetry'?: boolean;

src/vs/platform/environment/node/argv.ts

@@ -24,7 +24,6 @@ const options: minimist.Opts = {
 		'debugBrkPluginHost',
 		'debugSearch',
 		'debugBrkSearch',
-		'open-url',
 		'enable-proposed-api',
 		'export-default-configuration',
 		'install-source'
@@ -39,6 +38,7 @@ const options: minimist.Opts = {
 		'new-window',
 		'unity-launch',
 		'reuse-window',
+		'open-url',
 		'performance',
 		'prof-startup',
 		'verbose',

src/vs/platform/url/electron-main/urlService.ts

@@ -26,7 +26,7 @@ export class URLService implements IURLService {
 			...globalBuffer
 		];
 
-		app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--open-url']);
+		app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--open-url', '--']);
 
 		const rawOnOpenUrl = fromEventEmitter(app, 'open-url', (event: Electron.Event, url: string) => ({ event, url }));