diff --git a/java/java-tests/testData/codeInsight/folding/CustomFoldingIdea208441.java b/java/java-tests/testData/codeInsight/folding/CustomFoldingIdea208441.java new file mode 100644 index 000000000000..96ab651b1194 --- /dev/null +++ b/java/java-tests/testData/codeInsight/folding/CustomFoldingIdea208441.java @@ -0,0 +1,9 @@ +public class Test { + // region First + // void foo() { + // // region MyRegion + // System.out.print("Text"); + // // endregion + // } + // endregion +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/openapi/editor/impl/JavaFoldingTest.groovy b/java/java-tests/testSrc/com/intellij/openapi/editor/impl/JavaFoldingTest.groovy index b14109c7d23b..7923a8d3016d 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/editor/impl/JavaFoldingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/openapi/editor/impl/JavaFoldingTest.groovy @@ -16,7 +16,6 @@ import com.intellij.openapi.editor.ex.DocumentEx import com.intellij.openapi.editor.ex.EditorEx import com.intellij.openapi.editor.ex.FoldingListener import com.intellij.openapi.editor.ex.FoldingModelEx -import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiClass import com.intellij.psi.PsiMethod @@ -382,6 +381,9 @@ class Test { } public void testCustomFolding() { doTest() } + + public void testCustomFoldingIdea208441() {doTest()} + public void testEmptyMethod() { doTest() } private doTest() { diff --git a/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java b/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java index e3f3efc8edb2..655b69b98c76 100644 --- a/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java +++ b/platform/lang-impl/src/com/intellij/lang/customFolding/VisualStudioCustomFoldingProvider.java @@ -31,7 +31,7 @@ public class VisualStudioCustomFoldingProvider extends CustomFoldingProvider { @Override public boolean isCustomRegionEnd(String elementText) { - return elementText.contains("endregion"); + return elementText.contains("endregion") && elementText.matches("[/*#-]*\\s*endregion.*"); } @Override