@sean-mcmanus This seems to be related to: #5521 Currently, it's by design that we collapse the entire line containing the closing bracket. Having the fold take as few lines as possible when collapsed (similar to VS) was desired. Also, if we did not include the last line, code immediately preceding a closing brace would not get included in the fold.

	if (i == 0) {
		i = 1 
		j = 2 }

But, not including the last line only when overlapping the start of another folding range, seems OK to me.

Ah, I see, it behaves unideally when

if (i == 0) {
    i = 1 
    j = 2 } else {
    return 0;
}

is used; however, that seems like more desirable behavior than the pre-existing one which hides the else/else if, which is likely very important for the user to see and not be collapsed.