Included end tag in HTML folding range

Signed-off-by: Alexander Chen <[email protected]>
microsoft · Apr 4, 2022 · 861f79c · 861f79c
1 parent 88d4621
commit 861f79c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/src/services/htmlFolding.ts b/src/services/htmlFolding.ts
@@ -120,9 +120,8 @@ export function getFoldingRanges(document: TextDocument, context: { rangeLimit?:
 				if (i >= 0) {
 					const stackElement = stack[i];
 					stack.length = i;
-					const line = document.positionAt(scanner.getTokenOffset()).line;
 					const startLine = stackElement.startLine;
-					const endLine = line - 1;
+					const endLine = document.positionAt(scanner.getTokenOffset()).line;
 					if (endLine > startLine && prevStart !== startLine) {
 						addRange({ startLine, endLine });
 					}

diff --git a/src/test/folding.test.ts b/src/test/folding.test.ts
@@ -42,7 +42,7 @@ suite('HTML Folding', () => {
 			/*1*/'Hello',
 			/*2*/'</html>'
 		];
-		assertRanges(input, [r(0, 1)]);
+		assertRanges(input, [r(0, 2)]);
 	});
 
 	test('Fold two level', () => {
@@ -53,7 +53,7 @@ suite('HTML Folding', () => {
 			/*3*/'</head>',
 			/*4*/'</html>'
 		];
-		assertRanges(input, [r(0, 3), r(1, 2)]);
+		assertRanges(input, [r(0, 4), r(1, 3)]);
 	});
 
 	test('Fold siblings', () => {
@@ -67,7 +67,7 @@ suite('HTML Folding', () => {
 			/*6*/'</body>',
 			/*7*/'</html>'
 		];
-		assertRanges(input, [r(0, 6), r(1, 2), r(4, 5)]);
+		assertRanges(input, [r(0, 7), r(1, 3), r(4, 6)]);
 	});
 
 	test('Fold self-closing tags', () => {
@@ -82,7 +82,7 @@ suite('HTML Folding', () => {
 			/*7*/'>',
 			/*8*/'</div>'
 		];
-		assertRanges(input, [r(0, 7), r(5, 6)]);
+		assertRanges(input, [r(0, 8), r(5, 7)]);
 	});
 
 	test('Fold comment', () => {
@@ -116,7 +116,7 @@ suite('HTML Folding', () => {
 			/*3*/'</div>',
 			/*4*/'</body>',
 		];
-		assertRanges(input, [r(0, 3)]);
+		assertRanges(input, [r(0, 4)]);
 	});
 
 	test('Fold incomplete 2', () => {
@@ -125,7 +125,7 @@ suite('HTML Folding', () => {
 			/*1*/'<!-- #endregion -->',
 			/*2*/'</div>',
 		];
-		assertRanges(input, [r(0, 1)]);
+		assertRanges(input, [r(0, 2)]);
 	});
 
 	test('Fold intersecting region', () => {
@@ -137,7 +137,7 @@ suite('HTML Folding', () => {
 			/*4*/'</body>',
 			/*5*/'<!-- #endregion -->',
 		];
-		assertRanges(input, [r(0, 3)]);
+		assertRanges(input, [r(0, 4)]);
 	});
 
 	test('Fold intersecting region 2', () => {
@@ -176,15 +176,15 @@ suite('HTML Folding', () => {
 			/*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(6, 7), 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), r(2, 3), r(5, 11), r(13, 14)], 'limit 5', 5);
-		assertRanges(input, [r(0, 19), r(1, 18), r(2, 3), r(5, 11)], 'limit 4', 4);
-		assertRanges(input, [r(0, 19), r(1, 18), r(2, 3)], 'limit 3', 3);
-		assertRanges(input, [r(0, 19), r(1, 18)], 'limit 2', 2);
-		assertRanges(input, [r(0, 19)], 'limit 1', 1);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4), r(5, 12), r(6, 8), r(9, 11), r(13, 15), r(16, 18)], 'no limit', void 0);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4), r(5, 12), r(6, 8), r(9, 11), r(13, 15), r(16, 18)], 'limit 8', 8);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4), r(5, 12), r(6, 8), r(13, 15), r(16, 18)], 'limit 7', 7);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4), r(5, 12), r(13, 15), r(16, 18)], 'limit 6', 6);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4), r(5, 12), r(13, 15)], 'limit 5', 5);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4), r(5, 12)], 'limit 4', 4);
+		assertRanges(input, [r(0, 20), r(1, 19), r(2, 4)], 'limit 3', 3);
+		assertRanges(input, [r(0, 20), r(1, 19)], 'limit 2', 2);
+		assertRanges(input, [r(0, 20)], 'limit 1', 1);
 	});
 
 });