sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[#1778] fix folding range line calculation

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2021-11-30 12:59:18 +01:00
parent 4d3eadbd81
commit b3d4bcb8eb
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
org.eclipse.xtext.ide.tests/src/org/eclipse/xtext/ide/tests/server/FoldingTest.java
View file

@ -24,4 +24,13 @@ public class FoldingTest extends AbstractTestLangLanguageServerTest {
});
}
@Test
public void testFoldingService2() {
testFolding(it -> {
it.setModel("package a\n.b {\n\n}\n");// significate region with size > 1 line
String expectedText = "[null 0..3]\n";
it.setExpectedFoldings(expectedText);
});
}
}

4
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/folding/DefaultFoldingRangeProvider.java
View file

@ -112,8 +112,8 @@ public class DefaultFoldingRangeProvider implements IFoldingRangeProvider {
int endLine;
if (significantRegion instanceof ITextRegionWithLineInformation) {
ITextRegionWithLineInformation lineInfoRegion = (ITextRegionWithLineInformation) significantRegion;
startLine = lineInfoRegion.getLineNumber();
endLine = lineInfoRegion.getEndLineNumber();
startLine = lineInfoRegion.getLineNumber() + 1;
endLine = lineInfoRegion.getEndLineNumber() + 1;
} else {
startLine = NodeModelUtils.getLineAndColumn(node, offset).getLine();
endLine = NodeModelUtils.getLineAndColumn(node, endOffset).getLine();