From dfff07098121f59f8fd324c76cf25c8ed0e69ed6 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Sat, 30 Apr 2016 10:50:03 +0300 Subject: [PATCH] Commit document when necessary --- .../editorActions/enter/EnterBetweenBracesHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java index e481fb02d0c0..70e3526de127 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java @@ -49,9 +49,13 @@ public class EnterBetweenBracesHandler extends EnterHandlerDelegateAdapter { int prevCharOffset = CharArrayUtil.shiftBackward(text, caretOffset - 1, " \t"); int nextCharOffset = CharArrayUtil.shiftForward(text, caretOffset, " \t"); - if (!isValidOffset(prevCharOffset, text) || !isValidOffset(nextCharOffset, text) || - !isBracePair(text.charAt(prevCharOffset), text.charAt(nextCharOffset)) || - file.findElementAt(prevCharOffset) == file.findElementAt(nextCharOffset)) { + if (!isValidOffset(prevCharOffset, text) || !isValidOffset(nextCharOffset, text) || + !isBracePair(text.charAt(prevCharOffset), text.charAt(nextCharOffset))) { + return Result.Continue; + } + + PsiDocumentManager.getInstance(file.getProject()).commitDocument(editor.getDocument()); + if (file.findElementAt(prevCharOffset) == file.findElementAt(nextCharOffset)) { return Result.Continue; }