From 0121d96288397c32ef9e3024a5866a25f7d440c5 Mon Sep 17 00:00:00 2001
From: jonyrock <ilms@live.ru>
Date: Wed, 7 May 2014 15:38:07 +0400
Subject: call during autocompletion

---
 scene/gui/text_edit.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'scene')

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 2ac9c66771..fcbef9e891 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1123,6 +1123,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 
 
 					if (k.scancode==KEY_SHIFT) {
+						print_line("accent shift and return");
 						accept_event();
 						return;
 					}
@@ -1132,11 +1133,17 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 						if (cursor.column<text[cursor.line].length() && text[cursor.line][cursor.column]==k.unicode) {
 							//same char, move ahead
 							cursor_set_column(cursor.column+1);
+							
 						} else {
 							//different char, go back
 							const CharType chr[2] = {k.unicode, 0};
-							_insert_text_at_cursor(chr);
+							if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
+								_consume_pair_symbol(chr[0]);
+							} else {
+								_insert_text_at_cursor(chr);
+							}
 						}
+
 						_update_completion_candidates();
 						accept_event();
 
-- 
cgit v1.2.3


From 6c9203fdafc3cbed2bf31d2adfa4d8f82e3e69c7 Mon Sep 17 00:00:00 2001
From: jonyrock <ilms@live.ru>
Date: Wed, 7 May 2014 15:42:55 +0400
Subject: remove degud output

---
 scene/gui/text_edit.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'scene')

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index fcbef9e891..c48d8bb1de 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -750,7 +750,6 @@ void TextEdit::_consume_pair_symbol(CharType ch) {
 	CharType ch_single_pair[2] = {_get_right_pair_symbol(ch), 0};
 	CharType ch_pair[3] = {ch, _get_right_pair_symbol(ch), 0};
 	
-	printf("Selectin if active, %d\n", is_selection_active());
 	if(is_selection_active()) {	
 		
 		int new_column,new_line;
@@ -1123,7 +1122,6 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 
 
 					if (k.scancode==KEY_SHIFT) {
-						print_line("accent shift and return");
 						accept_event();
 						return;
 					}
-- 
cgit v1.2.3