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 ++++++++-
 tools/editor/code_editor.cpp | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

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();
 
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 994e3e1e68..7e6a7a30b8 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -492,7 +492,7 @@ void CodeTextEditor::_complete_request(const String& p_request, int p_line) {
 
 	List<String> entries;
 	_code_complete_script(text_editor->get_text(),p_request,p_line,&entries);
-	print_line("COMPLETE: "+p_request);
+	// print_line("COMPLETE: "+p_request);
 	Vector<String> strs;
 	strs.resize(entries.size());
 	int i=0;
-- 
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 --
 tools/editor/code_editor.cpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

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;
 					}
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 7e6a7a30b8..734bf48975 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -242,7 +242,7 @@ bool FindReplaceDialog::_search() {
 
 
 	if (found) {
-		print_line("found");
+		// print_line("found");
 		text_edit->cursor_set_line(line);
 		text_edit->cursor_set_column(col+text.length());
 		text_edit->select(line,col,line,col+text.length());
-- 
cgit v1.2.3