Merge branch 'master' into ben/notifications

extensions/bat/language-configuration.json

@@ -11,7 +11,8 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""]
+		["\"", "\""],
+		["`", "`"]
 	],
 	"surroundingPairs": [
 		["{", "}"],

extensions/cpp/package.json

@@ -15,7 +15,7 @@
 		},
 		{
 			"id": "cpp",
-			"extensions": [ ".cpp", ".cc", ".cxx", ".hpp", ".hh", ".hxx", ".h", ".ino", ".inl" ],
+			"extensions": [ ".cpp", ".cc", ".cxx", ".hpp", ".hh", ".hxx", ".h", ".ino", ".inl", ".ipp" ],
 			"aliases": [ "C++", "Cpp", "cpp"],
 			"configuration": "./language-configuration.json"
 		}],

package.json

@@ -46,7 +46,7 @@
     "vscode-debugprotocol": "1.25.0",
     "vscode-ripgrep": "^0.7.1-patch.1.5",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.2.0-beta2",
+    "vscode-xterm": "3.2.0-beta3",
     "yauzl": "2.8.0"
   },
   "devDependencies": {

src/vs/editor/contrib/folding/folding.ts

@@ -26,6 +26,7 @@ import { HiddenRangeModel } from 'vs/editor/contrib/folding/hiddenRangeModel';
 import { IRange } from 'vs/editor/common/core/range';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { computeRanges as computeIndentRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
+import { IPosition } from 'vs/editor/common/core/position';
 
 export const ID = 'editor.contrib.folding';
 
@@ -317,15 +318,15 @@ export class FoldingController implements IEditorContribution {
 							toToggle.push(...foldingModel.getRegionsInside(region, r => r.isCollapsed === isCollapsed));
 						}
 						foldingModel.toggleCollapseState(toToggle);
-						this.reveal(lineNumber);
+						this.reveal({ lineNumber, column: 1 });
 					}
 				}
 			}
 		});
 	}
 
-	public reveal(focusLine: number): void {
-		this.editor.revealPositionInCenterIfOutsideViewport({ lineNumber: focusLine, column: 1 }, ScrollType.Smooth);
+	public reveal(position: IPosition): void {
+		this.editor.revealPositionInCenterIfOutsideViewport(position, ScrollType.Smooth);
 	}
 }
 
@@ -344,6 +345,7 @@ abstract class FoldingAction<T> extends EditorAction {
 			return foldingModelPromise.then(foldingModel => {
 				if (foldingModel) {
 					this.invoke(foldingController, foldingModel, editor, args);
+					foldingController.reveal(editor.getSelection().getStartPosition());
 				}
 			});
 		}
@@ -514,10 +516,6 @@ class FoldRecursivelyAction extends FoldingAction<void> {
 	invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor): void {
 		let selectedLines = this.getSelectedLines(editor);
 		setCollapseStateLevelsDown(foldingModel, true, Number.MAX_VALUE, selectedLines);
-		if (selectedLines.length > 0) {
-			foldingController.reveal(selectedLines[0]);
-		}
-
 	}
 }
 

yarn.lock

@@ -6003,9 +6003,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.2.0-beta2:
-  version "3.2.0-beta2"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.2.0-beta2.tgz#20e4094c1e6d4076e0fca5c109970d8efbc8e5c7"
+vscode-xterm@3.2.0-beta3:
+  version "3.2.0-beta3"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.2.0-beta3.tgz#f82a54dd56f33b8875b68651cdcdd950317c8fb4"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"