From 7223fa5c9f715fcb07f3f363e8bc07c717a44e4f Mon Sep 17 00:00:00 2001 From: Alexey Utkin Date: Tue, 24 Nov 2015 17:42:05 +0300 Subject: [PATCH] CPP-4184 Generate multiple '}' on enter for code with several '{' in one line (method rename) --- .../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 f7e74f06d3d2..35293104ffdb 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 @@ -67,7 +67,7 @@ public class EnterAfterUnmatchedBraceHandler extends EnterHandlerDelegateAdapter insertRBraces(file, editor, caretOffset, getRBraceOffset(file, editor, caretOffset), - adjustRBraceCountForPosition(editor, caretOffset, maxRBraceCount)); + generateStringToInsert(editor, caretOffset, maxRBraceCount)); return Result.DefaultForceIndent; } return Result.Continue; @@ -110,7 +110,8 @@ public class EnterAfterUnmatchedBraceHandler extends EnterHandlerDelegateAdapter * @param maxRBraceCount the maximum number of '}' for insert at position, it always positive * @return the string of '}' that has to be inserted by handler, it must have at least one '}' */ - protected String adjustRBraceCountForPosition(@NotNull final Editor editor, int caretOffset, int maxRBraceCount) { + @NotNull + protected String generateStringToInsert(@NotNull final Editor editor, int caretOffset, int maxRBraceCount) { assert maxRBraceCount > 0; CharSequence text = editor.getDocument().getCharsSequence();