Fix for Visual Bug in Code Folding

[jakub-suliga]

Fix folding of 2 consecutive methods

If the second method starts in the same line the first one ends then there will still be 2 foldings.

Fixes #1539

How to test

1. Create a class with two or more methods. Ensure that the second method begins immediately after the first method ends. For example:

public class b {
	void a() {
		
	}void b() {
		
	}
}

2. Fold the first method. The second method should remain visible.

[fedejeanne]

Add a test (you should create the class FoldingTest from #1562 in this PR)

Change the commit text to:

Fix folding of 2 consecutive methods

If the second method starts in the same line the first one ends then there will still be 2 foldings.

Fixes https://github.com/eclipse-jdt/eclipse.jdt.ui/issues/1539

The last line is important so GH recognizes the issue and closes it automatically when you PR is merged ;-)

[fedejeanne]

The code does what it should and the test is appreciated.

I only have some minor comments regarding code formatting.

Maybe a committer (@jukzi?) would like to approve this PR and let it run the tests right after you process my comments ?

[jukzi]

i am not familiar with this code, please ask someone else for review.

[fedejeanne]

Maybe @noopur2507 / @carstenartur / @vogella ? Those are the only names I could recognize from the History view of this class.

The good thing is that this PR has a proper regression test and the issue is clearly defined so manual testing seems easy enough :-) .

[fedejeanne]

I tested manually and this PR produces the intended result.

This is on master (broken ❌ )

---

This one is after applying this PR (Fixed ✔️ )

[vogella]

I'm not a jdt committer

[jakub-suliga]

@iloveeclipse could your review this too?

[iloveeclipse]

This introduces (at least one) regression.
The imports section folding lost last import, so if you have N imports, it should be folded by default to 1 (first) line, but it misses to fold last line now and we have first and last line shown. Also folding indicator (bracket line shown on mouse over) on the left side is shown for only N-1 lines.

[iloveeclipse]

I saw in a second PR (#1562) you had lot of folding tests added.

I believe what would be good if you could have a dedicated PR that adds FoldingTest alone (no production code changes) that provides basic folding tests for existing folding regions / functionality.

In two other PR's you could then add dedicated tests for new or fixed functionality.

[jakub-suliga]

This introduces (at least one) regression. The imports section folding lost last import, so if you have N imports, it should be folded by default to 1 (first) line, but it misses to fold last line now and we have first and last line shown. Also folding indicator (bracket line shown on mouse over) on the left side is shown for only N-1 lines.

Should be fixed now.

[jakub-suliga]

I saw in a second PR (#1562) you had lot of folding tests added.

I believe what would be good if you could have a dedicated PR that adds FoldingTest alone (no production code changes) that provides basic folding tests for existing folding regions / functionality.

In two other PR's you could then add dedicated tests for new or fixed functionality.

I have created another PR #1960 for the FoldingTest. I will add later some more tests for the folding.

[jjohnstn]

This introduces (at least one) regression. The imports section folding lost last import, so if you have N imports, it should be folded by default to 1 (first) line, but it misses to fold last line now and we have first and last line shown. Also folding indicator (bracket line shown on mouse over) on the left side is shown for only N-1 lines.

Should be fixed now.

Confirmed in my tests.

[jjohnstn]

Though the import problem is fixed, there is a regression with javadoc comments. They are now showing the last line ( */ ) which they don't do in my current Eclipse.

With that fixed, I can merge the patch. I am ok with adding a FoldingTest now and then changing it when your while/if/for folding patch is fixed.

[fedejeanne]

Though the import problem is fixed, there is a regression with javadoc comments. They are now showing the last line ( */ ) which they don't do in my current Eclipse.

BTW I rebased on master and checked for the bug. It's still there:

@jakub-suliga please also add some tests that check for the bugs reported during this PR. I assume the method FoldingTestUtils::assertContainsRegionUsingStartAndEndLine (introduced in #1960 ) can help with that?

[jakub-suliga]

there is a regression with javadoc comments.

Forgot to push the fix.

please also add some tests that check for the bugs reported during this PR.

The tests introcued in #1960 should check everything.

[fedejeanne]

The tests introcued in #1960 should check everything.

They do, thank you!

[jjohnstn]

Hi @jakub-suliga I think this one can also be merged if you resolve the conflicts above and the build can go through clean.

[jjohnstn]

Hi @iloveeclipse Can you approve your change request has been completed. If you don't have time, I can dismiss your review and complete the merge next week.

[jakub-suliga]

@jjohnstn This pr is unnecessary. See last comment of #1562

[iloveeclipse]

@jjohnstn This pr is unnecessary. See last comment of #1562

So let close it.