Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as assert from 'assert';
import { TextModel } from 'vs/editor/common/model/textModel';
import { computeRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
@@ -20,7 +18,7 @@ let markers: FoldingMarkers = {
suite('FoldingRanges', () => {
test('test max folding regions', () => {
let lines = [];
let lines: string[] = [];
let nRegions = MAX_FOLDING_REGIONS;
for (let i = 0; i < nRegions; i++) {
lines.push('#region');
@@ -85,7 +83,7 @@ suite('FoldingRanges', () => {
});
test('setCollapsed', () => {
let lines = [];
let lines: string[] = [];
let nRegions = 500;
for (let i = 0; i < nRegions; i++) {
lines.push('#region');