Skip to content

Use ProjectionRegion in folding tests #3073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iloveeclipse merged 1 commit into from
Jul 20, 2026
Merged

Use ProjectionRegion in folding tests #3073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions ...clipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/folding/CustomFoldingRegionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

import org.eclipse.jface.preference.IPreferenceStore;

import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
Expand Down Expand Up @@ -101,7 +100,7 @@ public void testNoCustomFoldingRegions() throws Exception {
package org.example.test;
public class Test { }
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
assertEquals(0, projectionRanges.size());
}

Expand All @@ -118,7 +117,7 @@ class Test {
// endregion
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 1, 3); // region 1
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 5, 7); // region 2
}
Expand All @@ -136,7 +135,7 @@ class Test {
// endregion inner
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
assertEquals(3, projectionRanges.size());
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 2, 8);//class Test
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 7);//outer
Expand All @@ -157,7 +156,7 @@ class Test {
// endregion inner
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 3);//outer
}

Expand All @@ -173,7 +172,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 5); // region 1
}

Expand All @@ -184,7 +183,7 @@ public void testNoCustomFoldingRegionsSingleImport() throws Exception {

import java.util.List;
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
assertEquals(0, projectionRanges.size());
}

Expand All @@ -197,7 +196,7 @@ public void testCustomFoldingRegionAroundSingleImport() throws Exception {
import java.util.List;
// endregion
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 2, 4); // imports
}

Expand Down Expand Up @@ -225,7 +224,7 @@ class D {

}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 6, 15); // region 1
}

Expand All @@ -247,7 +246,7 @@ void a(){
}
// endregion outside class
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
assertEquals(5, projectionRanges.size());
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 2, 12);//class Test
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 1, 13);//outside class
Expand All @@ -269,7 +268,7 @@ void a(){
}
// endregion outside class
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 4);//region inside method
}

Expand All @@ -289,7 +288,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
if (extendedFoldingActive) {
assertEquals(5, projectionRanges.size());
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 2, 11);//class SpecialCommentTypes
Expand Down Expand Up @@ -323,7 +322,7 @@ class Inner{
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 4, 7);//region 1
}

Expand All @@ -348,7 +347,7 @@ class B {

}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 3);// region outside
}

Expand All @@ -367,7 +366,7 @@ void b(){
// endregion
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 9);//region 1
}

Expand All @@ -387,7 +386,7 @@ class Test {
// endregion should be ignored
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 4); // this is the region
}

Expand All @@ -403,7 +402,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 5);//region 1
}

Expand All @@ -419,7 +418,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 3);
}

Expand All @@ -435,7 +434,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 3);
}

Expand All @@ -451,7 +450,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 5);//region 1
}

Expand All @@ -468,7 +467,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 4, 6);//region 1
}

Expand All @@ -485,7 +484,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 4, 6);//region 1
}

Expand All @@ -501,7 +500,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 4);//region 1
}

Expand All @@ -515,7 +514,7 @@ void a(){/* region 1*/}
/* endregion */
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 2);
}

Expand All @@ -529,7 +528,7 @@ class Test {
void a(){/* endregion*/}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 2);
}

Expand All @@ -549,7 +548,7 @@ void a(){
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 4);//region 1
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 5, 6);//region 1
}
Expand All @@ -574,7 +573,7 @@ void a() {
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 3);// region 1
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 6);// region 2
FoldingTestUtils.assertDoesNotContainRegionUsingStartLine(projectionRanges, str, 9);// region 3
Expand All @@ -591,7 +590,7 @@ class Test {
/* endregion */ void test(){}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 4); // region 1
}

Expand All @@ -611,7 +610,7 @@ class Test {

}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 4);//first start
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 5, 6);//second start
}
Expand Down Expand Up @@ -641,7 +640,7 @@ void test() {
// ----
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 7);//variables
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 8, 13);//methods
}
Expand Down Expand Up @@ -675,7 +674,7 @@ void otherMethod() {
}
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 6, 9);//inner
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 10, 12);//inner 2
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 15, 19);//outer 2
Expand All @@ -699,7 +698,7 @@ class Test {

}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 3, 8);//no end marker
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 5, 6);//first
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 7, 8);//second
Expand All @@ -721,7 +720,7 @@ public void testStartMarkerStartsWithEndMarkerWithoutTopLevelType() throws Excep

// regend second
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionWithOffsetAndLength(projectionRanges, 2, 7, //no end marker
FoldingTestUtils.findLineStartIndex(str, 2), str.length() - 1);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 4, 5);//first
Expand Down Expand Up @@ -751,7 +750,7 @@ class Test {
// reg end
}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 6, 7);//first
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 10, 11);//second
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 12, 13);//third
Expand All @@ -767,7 +766,7 @@ public void testSameStartAndEndMarkerTerminatesAtEOF() throws Exception {
// reg my region

// some comment without line break""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 0, 2);
}

Expand All @@ -782,7 +781,7 @@ public void testSameStartAndEndMarkerTerminatesAtEOFEmptyLine() throws Exception


""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 0, 3);
}

Expand All @@ -809,7 +808,7 @@ public String test(boolean b) {

}
""";
List<IRegion> projectionRanges= getProjectionRangesOfFile(str);
List<FoldingTestUtils.ProjectionRegion> projectionRanges= getProjectionRangesOfFile(str);
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(projectionRanges, str, 4, 12);//custom region
}

Expand Down Expand Up @@ -838,7 +837,7 @@ void someMethod() {
try {
ProjectionAnnotationModel model= editor.getAdapter(ProjectionAnnotationModel.class);

List<IRegion> initialRegions= FoldingTestUtils.extractRegions(model);
List<FoldingTestUtils.ProjectionRegion> initialRegions= FoldingTestUtils.extractRegions(model);

FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(initialRegions, code, 2, 15);//outer
FoldingTestUtils.assertContainsRegionUsingStartAndEndLine(initialRegions, code, 5, 12);//middle
Expand All @@ -856,8 +855,8 @@ void someMethod() {

// check that regions are in the same order as before and not modified in another way
for(int i= 0; i < positions.size(); i++) {
assertEquals(initialRegions.get(i).getOffset(), positions.get(i).getOffset());
assertEquals(initialRegions.get(i).getLength() + additionalText.length(), positions.get(i).getLength());
assertEquals(initialRegions.get(i).offset(), positions.get(i).getOffset());
assertEquals(initialRegions.get(i).length() + additionalText.length(), positions.get(i).getLength());
}
} finally {
editor.close(false);
Expand Down Expand Up @@ -946,8 +945,9 @@ private List<Position> getFoldingPositionsFromModel(ProjectionAnnotationModel mo
return positions;
}

private List<IRegion> getProjectionRangesOfFile(String str) throws Exception {
private List<FoldingTestUtils.ProjectionRegion> getProjectionRangesOfFile(String str) throws Exception {
return FoldingTestUtils.getProjectionRangesOfPackage(fPackageFragment, str);
}

}

Loading
Loading