Merge pull request #1490 from supercollider/topic/fix-newlines-before…

…-closing-bracket ide: better newline behavior within brackets
supercollider · May 26, 2015 · ed6442f · ed6442f
2 parents d4d2abc + 3090eff
commit ed6442f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/editors/sc-ide/widgets/code_editor/sc_editor.cpp b/editors/sc-ide/widgets/code_editor/sc_editor.cpp
@@ -174,8 +174,15 @@ void ScCodeEditor::keyPressEvent( QKeyEvent *e )
     {
         QTextBlock cursorBlock = cursor.block();
         int cursorPosInBlock = cursor.position() - cursorBlock.position();
+
+        TokenIterator prevToken = TokenIterator::leftOf(cursorBlock, cursorPosInBlock);
         TokenIterator nextToken = TokenIterator::rightOf(cursorBlock, cursorPosInBlock);
-        if ( nextToken.block() == cursorBlock && nextToken.type() == Token::ClosingBracket )
+
+        if (   nextToken.block() == cursorBlock
+            && nextToken.type() == Token::ClosingBracket
+            && prevToken.type() != Token::ClosingBracket // no double-newline if cursor is between closing brackets, i.e. ])
+            && !(prevToken.block().firstLineNumber() < nextToken.block().firstLineNumber()) // no double-nl if only whitespace to the left
+        )
         {
             cursor.beginEditBlock();
             cursor.insertBlock();