Merge branch 'master' into ben/next

Benjamin Pasero · Benjamin Pasero · commit a74e4fe3195f · 2017-02-28T06:46:39.000+01:00
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
@@ -9,7 +9,7 @@
 		"languages": [{
 			"id": "ruby",
 			"extensions": [ ".rb", ".rbx", ".rjs", ".gemspec", ".rake", ".ru" ],
-			"filenames": [ "rakefile", "gemfile", "guardfile" ],
+			"filenames": [ "rakefile", "gemfile", "guardfile", "podfile" ],
 			"aliases": [ "Ruby", "rb" ],
 			"firstLine": "^#!/.*\\bruby\\b",
 			"configuration": "./language-configuration.json"
diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json
@@ -285,6 +285,42 @@
         "category": "JavaScript"
       }
     ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "typescript.reloadProjects",
+          "when": "editorLangId == 'typescript'"
+        },
+        {
+          "command": "typescript.reloadProjects",
+          "when": "editorLangId == typescriptreact"
+        },
+        {
+          "command": "javascript.reloadProjects",
+          "when": "editorLangId == 'javascript'"
+        },
+        {
+          "command": "javascript.reloadProjects",
+          "when": "editorLangId == javascriptreact"
+        },
+        {
+          "command": "typescript.goToProjectConfig",
+          "when": "editorLangId == 'typescript'"
+        },
+        {
+          "command": "typescript.goToProjectConfig",
+          "when": "editorLangId == typescriptreact"
+        },
+        {
+          "command": "javascript.goToProjectConfig",
+          "when": "editorLangId == 'javascript'"
+        },
+        {
+          "command": "javascript.goToProjectConfig",
+          "when": "editorLangId == javascriptreact"
+        }
+      ]
+    },
     "breakpoints": [
       {
         "language": "typescript"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "electronVersion": "1.4.6",
   "distro": "3b22b6005c2104726ccc5b2aebb204df983df07e",
   "author": {
diff --git a/resources/linux/debian/control.template b/resources/linux/debian/control.template
@@ -1,7 +1,7 @@
 Package: @@NAME@@
 Version: @@VERSION@@
 Section: devel
-Depends: libnotify4, libnss3
+Depends: libnotify4, libnss3, gnupg, apt
 Priority: optional
 Architecture: @@ARCHITECTURE@@
 Maintainer: Microsoft Corporation <vscode-linux@microsoft.com>
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -10,6 +10,7 @@
 		"experimentalDecorators": true,
 		"declaration": true,
 		"noImplicitReturns": true,
+		"baseUrl": ".",
 		"typeRoots": [
 			"typings",
 			"../node_modules/@types"
diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -319,8 +319,7 @@ export class ExtensionEditor extends BaseEditor {
 			.then<void>(body => {
 				const webview = new WebView(
 					this.content,
-					document.querySelector('.monaco-editor-background'),
-					{ nodeintegration: false }
+					document.querySelector('.monaco-editor-background')
 				);
 
 				webview.style(this.themeService.getColorTheme());
diff --git a/src/vs/workbench/parts/html/browser/htmlEditorZone.ts b/src/vs/workbench/parts/html/browser/htmlEditorZone.ts
@@ -41,7 +41,7 @@ class HtmlZone implements IViewZone {
 
 	private _onVisibilityChanged(): void {
 		if (this._domNode.hasAttribute('monaco-visible-view-zone') && !this._webview) {
-			this._webview = new Webview(this.domNode, document.querySelector('.monaco-editor-background'), { nodeintegration: true });
+			this._webview = new Webview(this.domNode, document.querySelector('.monaco-editor-background'));
 			this._disposables.push(this._webview);
 			this._webview.contents = [this.htmlContent];
 		}
diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
@@ -81,7 +81,7 @@ export class HtmlPreviewPart extends BaseEditor {
 
 	private get webview(): Webview {
 		if (!this._webview) {
-			this._webview = new Webview(this._container, document.querySelector('.monaco-editor-background'), { nodeintegration: true });
+			this._webview = new Webview(this._container, document.querySelector('.monaco-editor-background'));
 			this._webview.baseUrl = this._baseUrl && this._baseUrl.toString(true);
 
 			this._webviewDisposables = [
diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
@@ -18,7 +18,6 @@ import { IColorTheme } from 'vs/workbench/services/themes/common/themeService';
 declare interface WebviewElement extends HTMLElement {
 	src: string;
 	autoSize: 'on';
-	nodeintegration: 'on';
 	preload: string;
 
 	send(channel: string, ...args: any[]);
@@ -43,10 +42,6 @@ MenuRegistry.addCommand({
 
 type ApiThemeClassName = 'vscode-light' | 'vscode-dark' | 'vscode-high-contrast';
 
-export interface WebviewOptions {
-	nodeintegration: boolean;
-}
-
 export default class Webview {
 
 	private _webview: WebviewElement;
@@ -55,17 +50,14 @@ export default class Webview {
 	private _onDidClickLink = new Emitter<URI>();
 	private _onDidLoadContent = new Emitter<{ stats: any }>();
 
-	constructor(parent: HTMLElement, private _styleElement: Element, options: WebviewOptions) {
+	constructor(parent: HTMLElement, private _styleElement: Element) {
 		this._webview = <any>document.createElement('webview');
 
 		this._webview.style.width = '100%';
 		this._webview.style.height = '100%';
 		this._webview.style.outline = '0';
 		this._webview.style.opacity = '0';
 		this._webview.autoSize = 'on';
-		if (options.nodeintegration) {
-			this._webview.nodeintegration = 'on';
-		}
 
 		this._webview.preload = require.toUrl('./webview-pre.js');
 		this._webview.src = require.toUrl('./webview.html');
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -25,7 +25,7 @@ import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/c
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import debugActions = require('vs/workbench/parts/debug/browser/debugActions');
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction } from 'vs/workbench/browser/parts/editor/editorActions';
+import { OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, FocusActiveGroupAction } from 'vs/workbench/browser/parts/editor/editorActions';
 import { DefaultConfig } from 'vs/editor/common/config/defaultConfig';
 
 let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
@@ -137,6 +137,7 @@ configurationRegistry.registerConfiguration({
 			},
 			'default': [
 				ToggleTabFocusModeAction.ID,
+				FocusActiveGroupAction.ID,
 				GlobalQuickOpenAction.ID,
 				ShowAllCommandsAction.ID,
 				CreateNewTerminalAction.ID,
@@ -170,6 +171,7 @@ configurationRegistry.registerConfiguration({
 				debugActions.RunAction.ID,
 				debugActions.RestartAction.ID,
 				debugActions.ContinueAction.ID,
+				debugActions.PauseAction.ID,
 				OpenNextRecentlyUsedEditorInGroupAction.ID,
 				OpenPreviousRecentlyUsedEditorInGroupAction.ID
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -13,14 +13,14 @@ import { TPromise } from 'vs/base/common/winjs.base';
 
 const pathPrefix = '(\\.\\.?|\\~)';
 const pathSeparatorClause = '\\/';
-const excludedPathCharactersClause = '[^\\0\\s!$`&*()+\'":;]'; // '":; are allowed in paths but they are often separators so ignore them
+const excludedPathCharactersClause = '[^\\0\\s!$`&*()\\[\\]+\'":;]'; // '":; are allowed in paths but they are often separators so ignore them
 const escapedExcludedPathCharactersClause = '(\\\\s|\\\\!|\\\\$|\\\\`|\\\\&|\\\\*|(|)|\\+)';
 /** A regex that matches paths in the form /path, ~/path, ./path, ../path */
 const UNIX_LIKE_LOCAL_LINK_REGEX = new RegExp('(' + pathPrefix + '?(' + pathSeparatorClause + '(' + excludedPathCharactersClause + '|' + escapedExcludedPathCharactersClause + ')+)+)');
 
 const winPathPrefix = '([a-zA-Z]:|\\.\\.?|\\~)';
 const winPathSeparatorClause = '(\\\\|\\/)';
-const winExcludedPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!$`&*()+\'":;]';
+const winExcludedPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!$`&*()\\[\\]+\'":;]';
 /** A regex that matches paths in the form c:\path, ~\path, .\path */
 const WINDOWS_LOCAL_LINK_REGEX = new RegExp('(' + winPathPrefix + '?(' + winPathSeparatorClause + '(' + winExcludedPathCharactersClause + ')+)+)');
 
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -85,8 +85,7 @@ export class ReleaseNotesEditor extends BaseEditor {
 			.then<void>(body => {
 				this.webview = new WebView(
 					this.content,
-					document.querySelector('.monaco-editor-background'),
-					{ nodeintegration: false }
+					document.querySelector('.monaco-editor-background')
 				);
 
 				this.webview.baseUrl = `https://code.visualstudio.com/raw/`;
diff --git a/src/vs/workbench/services/search/node/worker/searchWorker.ts b/src/vs/workbench/services/search/node/worker/searchWorker.ts
@@ -171,43 +171,41 @@ export class SearchWorkerEngine {
 				}
 
 				const buffer = new Buffer(options.bufferLength);
-				let pos: number;
-				let i: number;
 				let line = '';
 				let lineNumber = 0;
 				let lastBufferHadTrailingCR = false;
 
-				const decodeBuffer = (buffer: NodeBuffer, start: number, end: number): string => {
-					if (options.encoding === UTF8 || options.encoding === UTF8_with_bom) {
-						return buffer.toString(undefined, start, end); // much faster to use built in toString() when encoding is default
-					}
-
-					return decode(buffer.slice(start, end), options.encoding);
-				};
-
-				const lineFinished = (offset: number): void => {
-					line += decodeBuffer(buffer, pos, i + offset);
-					perLineCallback(line, lineNumber);
-					line = '';
-					lineNumber++;
-					pos = i + offset;
-				};
-
 				const readFile = (isFirstRead: boolean, clb: (error: Error) => void): void => {
 					if (this.isCanceled) {
 						return clb(null); // return early if canceled or limit reached
 					}
 
 					fs.read(fd, buffer, 0, buffer.length, null, (error: Error, bytesRead: number, buffer: NodeBuffer) => {
+						const decodeBuffer = (buffer: NodeBuffer, start: number, end: number): string => {
+							if (options.encoding === UTF8 || options.encoding === UTF8_with_bom) {
+								return buffer.toString(undefined, start, end); // much faster to use built in toString() when encoding is default
+							}
+
+							return decode(buffer.slice(start, end), options.encoding);
+						};
+
+						const lineFinished = (offset: number): void => {
+							line += decodeBuffer(buffer, pos, i + offset);
+							perLineCallback(line, lineNumber);
+							line = '';
+							lineNumber++;
+							pos = i + offset;
+						};
+
 						if (error || bytesRead === 0 || this.isCanceled) {
 							return clb(error); // return early if canceled or limit reached or no more bytes to read
 						}
 
 						let crlfCharSize = 1;
 						let crBytes = [CR];
 						let lfBytes = [LF];
-						pos = 0;
-						i = 0;
+						let pos = 0;
+						let i = 0;
 
 						// Detect encoding and mime when this is the beginning of the file
 						if (isFirstRead) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "code-oss-dev",`
`3`		`- "version": "1.10.0",`
	`3`	`+ "version": "1.11.0",`
`4`	`4`	`"electronVersion": "1.4.6",`
`5`	`5`	`"distro": "3b22b6005c2104726ccc5b2aebb204df983df07e",`
`6`	`6`	`"author": {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class HtmlZone implements IViewZone {`
`41`	`41`
`42`	`42`	`private _onVisibilityChanged(): void {`
`43`	`43`	`if (this._domNode.hasAttribute('monaco-visible-view-zone') && !this._webview) {`
`44`		`- this._webview = new Webview(this.domNode, document.querySelector('.monaco-editor-background'), { nodeintegration: true });`
	`44`	`+ this._webview = new Webview(this.domNode, document.querySelector('.monaco-editor-background'));`
`45`	`45`	`this._disposables.push(this._webview);`
`46`	`46`	`this._webview.contents = [this.htmlContent];`
`47`	`47`	`}`