From cfe8e2b37a714943a79afce88ce49a7ed74ef759 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Thu, 19 Sep 2013 22:01:22 +0400 Subject: [PATCH] WEB-9335 Bad insert pair brace in CSS --- .../editorActions/enter/EnterAfterUnmatchedBraceHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java index 14617b043d38..5789bc4631e2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java @@ -179,12 +179,13 @@ public class EnterAfterUnmatchedBraceHandler extends EnterHandlerDelegateAdapter } for (PsiElement parent = element.getParent(); parent != null; parent = parent.getParent()) { ASTNode parentNode = parent.getNode(); - if (parentNode == null || parentNode.getStartOffset() != offset) { + if (parentNode == null || (parentNode.getStartOffset() != offset && parentNode.getStartOffset() != offset - 2)) { + // (offset - 2) means that parent block starts with opening brace and hence should be ends with closing brace break; } element = parent; } - if (element.getTextOffset() != offset) { + if (element.getTextOffset() != offset && element.getTextOffset() != offset - 2) { return CharArrayUtil.shiftForwardUntil(text, offset, "\n"); } else {