Browse Source

call during autocompletion

jonyrock 11 years ago
parent
commit
0121d96288
2 changed files with 9 additions and 2 deletions
  1. 8 1
      scene/gui/text_edit.cpp
  2. 1 1
      tools/editor/code_editor.cpp

+ 8 - 1
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();
 

+ 1 - 1
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;