development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 09:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[html] limit ranges

Browse source
This commit is contained in:
Martin Aeschlimann 2018-03-14 22:56:21 +01:00
parent 7de696a202
commit fb4f66dc11
2 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/html/server/src/modes/htmlFolding.ts
View file

@ -45,39 +45,40 @@ function limitRanges(ranges: FoldingRange[], maxRanges: number) {
let nestingLevels: number[] = [];
let nestingLevelCounts: number[] = [];
let setNestingLevel = (level: number) => {
nestingLevels.push(level);
let setNestingLevel = (index: number, level: number) => {
nestingLevels[index] = level;
if (level < 30) {
nestingLevelCounts[level] = (nestingLevelCounts[level] || 0) + 1;
}
};
// compute nesting levels and sanitize
for (let i = 0; i < ranges.length; i++) {
let entry = ranges[i];
if (!top) {
top = entry;
setNestingLevel(0);
setNestingLevel(i, 0);
} else {
if (entry.startLine > top.startLine) {
if (entry.endLine <= top.endLine) {
previous.push(top);
top = entry;
setNestingLevel(previous.length);
} else if (entry.startLine > top.startLine) {
setNestingLevel(i, previous.length);
} else if (entry.startLine > top.endLine) {
do {
top = previous.pop();
} while (top && entry.startLine > top.endLine);
previous.push(top);
top = entry;
setNestingLevel(previous.length);
setNestingLevel(i, previous.length);
}
}
}
}
let entries = 0;
let maxLevel = 0;
for (let i = 0; i < nestingLevels.length; i++) {
let n = nestingLevels[i];
for (let i = 0; i < nestingLevelCounts.length; i++) {
let n = nestingLevelCounts[i];
if (n) {
if (n + entries > maxRanges) {
maxLevel = i;

72
extensions/html/server/src/test/folding.test.ts
View file

@ -17,7 +17,7 @@ interface ExpectedIndentRange {
type?: string;
}
function assertRanges(lines: string[], expected: ExpectedIndentRange[], nRanges?: number): void {
function assertRanges(lines: string[], expected: ExpectedIndentRange[], message?: string, nRanges?: number): void {
let document = TextDocument.create('test://foo/bar.json', 'json', 1, lines.join('\n'));
let languageModes = getLanguageModes({ css: true, javascript: true });
let actual = getFoldingRegions(languageModes, document, nRanges, null)!.ranges;
@ -27,7 +27,7 @@ function assertRanges(lines: string[], expected: ExpectedIndentRange[], nRanges?
actualRanges[i] = r(actual[i].startLine, actual[i].endLine, actual[i].type);
}
actualRanges = actualRanges.sort((r1, r2) => r1.startLine - r2.startLine);
assert.deepEqual(actualRanges, expected);
assert.deepEqual(actualRanges, expected, message);
}
function r(startLine: number, endLine: number, type?: string): ExpectedIndentRange {
@ -102,39 +102,39 @@ suite('Object Folding', () => {
// assertRanges(input, [r(0, 3, 'region')]);
// });
// test('Test limit', () => {
// let input = [
// /* 0*/'[',
// /* 1*/' [',
// /* 2*/' [',
// /* 3*/' ',
// /* 4*/' ],',
// /* 5*/' [',
// /* 6*/' [',
// /* 7*/' ',
// /* 8*/' ],',
// /* 9*/' [',
// /*10*/' ',
// /*11*/' ],',
// /*12*/' ],',
// /*13*/' [',
// /*14*/' ',
// /*15*/' ],',
// /*16*/' [',
// /*17*/' ',
// /*18*/' ]',
// /*19*/' ]',
// /*20*/']',
// ];
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(6, 7, 'array'), r(9, 10, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], void 0);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(6, 7, 'array'), r(9, 10, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], 8);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], 7);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], 6);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 5);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 4);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 3);
// assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 2);
// assertRanges(input, [r(0, 19, 'array')], 1);
// });
test('Test limit', () => {
let input = [
/* 0*/'<div>',
/* 1*/' <span>',
/* 2*/' <b>',
/* 3*/' ',
/* 4*/' </b>,',
/* 5*/' <b>',
/* 6*/' <pre>',
/* 7*/' ',
/* 8*/' </pre>,',
/* 9*/' <pre>',
/*10*/' ',
/*11*/' </pre>,',
/*12*/' </b>,',
/*13*/' <b>',
/*14*/' ',
/*15*/' </b>,',
/*16*/' <b>',
/*17*/' ',
/*18*/' </b>',
/*19*/' </span>',
/*20*/'</div>',
];
assertRanges(input, [r(0, 19), r(1, 18), r(2, 3), r(5, 11), r(6, 7), r(9, 10), r(13, 14), r(16, 17)], 'no limit', void 0);
assertRanges(input, [r(0, 19), r(1, 18), r(2, 3), r(5, 11), r(6, 7), r(9, 10), r(13, 14), r(16, 17)], 'limit 8', 8);
assertRanges(input, [r(0, 19), r(1, 18), r(2, 3), r(5, 11), r(13, 14), r(16, 17)], 'limit 7',7);
assertRanges(input, [r(0, 19), r(1, 18), r(2, 3), r(5, 11), r(13, 14), r(16, 17)], 'limit 6',6);
assertRanges(input, [r(0, 19), r(1, 18)], 'limit 5', 5);
assertRanges(input, [r(0, 19), r(1, 18)], 'limit 4', 4);
assertRanges(input, [r(0, 19), r(1, 18)], 'limit 3', 3);
assertRanges(input, [r(0, 19), r(1, 18)], 'limit 2', 2);
assertRanges(input, [r(0, 19)], 'limit 1', 1);
});
});