Merge branch 'master' into ben/electron

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as crypto from 'crypto';
-import * as fs from 'fs';
+import * as fs from 'original-fs';
 import * as path from 'path';
 import * as os from 'os';
 import { app } from 'electron';
@@ -263,7 +263,8 @@ function parsePathArguments(cwd: string, args: string[], gotoLineMode?: boolean)
 			realPath = path.normalize(path.isAbsolute(pathCandidate) ? pathCandidate : path.join(cwd, pathCandidate));
 		}
 
-		if (!paths.isValidBasename(path.basename(realPath))) {
+		const basename = path.basename(realPath);
+		if (basename /* can be empty if code is opened on root */ && !paths.isValidBasename(basename)) {
 			return null; // do not allow invalid file names
 		}
 

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import * as fs from 'fs';
+import * as fs from 'original-fs';
 import { app, ipcMain as ipc } from 'electron';
 import { assign } from 'vs/base/common/objects';
 import { mkdirp } from 'vs/base/node/pfs';

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

@@ -193,7 +193,7 @@ export class VSCodeMenu {
 
 		// Goto
 		let gotoMenu = new Menu();
-		let gotoMenuItem = new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Goto")), submenu: gotoMenu });
+		let gotoMenuItem = new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go")), submenu: gotoMenu });
 		this.setGotoMenu(gotoMenu);
 
 		// Mac: Window

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as path from 'path';
-import * as fs from 'fs';
+import * as fs from 'original-fs';
 import { EventEmitter } from 'events';
 import { IEnvironmentService } from 'vs/code/electron-main/env';
 import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation';

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

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as fs from 'fs';
+import * as fs from 'original-fs';
 import * as path from 'path';
 import * as electron from 'electron';
 import * as platform from 'vs/base/common/platform';

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as path from 'path';
-import * as fs from 'fs';
+import * as fs from 'original-fs';
 import * as platform from 'vs/base/common/platform';
 import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';

src/vs/code/node/cliProcessMain.ts

@@ -32,7 +32,7 @@ import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppen
 
 const notFound = id => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = id => localize('notInstalled', "Extension '{0}' is not installed.", id);
-const useId = localize('useId', "Make sure you use the full extension ID, eg: {0}", 'ms-vscode.csharp');
+const useId = localize('useId', "Make sure you use the full extension ID, including the publisher, eg: {0}", 'ms-vscode.csharp');
 
 function getId(manifest: IExtensionManifest): string {
 	return `${ manifest.publisher }.${ manifest.name }`;