asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #879 from DCubix/master

Browse source 
GDScript Editor Goodies
This commit is contained in:
Juan Linietsky 2014-11-13 01:52:17 -02:00
commit 3daab56f17
4 changed files with 2260 additions and 2085 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4162
scene/gui/text_edit.cpp
View file

File diff suppressed because it is too large Load diff

4
scene/gui/text_edit.h
View file

@ -138,7 +138,7 @@ class TextEdit : public Control {
int size() const { return text.size(); }
void clear();
void clear_caches();
_FORCE_INLINE_ const String& operator[](int p_line) const { return text[p_line].data; }
_FORCE_INLINE_ const String& operator[](int p_line) const { return text[p_line].data; }
Text() { tab_size=4; }
};
@ -299,6 +299,7 @@ public:
void set_text(String p_text);
void insert_text_at_cursor(const String& p_text);
void insert_at(const String& p_text, int at);
int get_line_count() const;
void set_line_as_marked(int p_line,bool p_marked);
void set_line_as_breakpoint(int p_line,bool p_breakpoint);
@ -306,6 +307,7 @@ public:
void get_breakpoints(List<int> *p_breakpoints) const;
String get_text();
String get_line(int line) const;
void set_line(int line, String new_text);
void backspace_at_cursor();
inline void set_auto_brace_completion(bool p_enabled) {

173
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -237,7 +237,7 @@ void ScriptTextEditor::_load_theme_settings() {
//colorize engine types
Color type_color= EDITOR_DEF("text_editor/engine_type_color",Color(0.0,0.2,0.4));
List<String> types;
List<String> types;
ObjectTypeDB::get_type_list(&types);
for(List<String>::Element *E=types.front();E;E=E->next()) {
@ -661,13 +661,10 @@ void ScriptEditor::_menu_option(int p_option) {
} break;
case EDIT_UNDO: {
current->get_text_edit()->undo();
} break;
case EDIT_REDO: {
current->get_text_edit()->redo();
} break;
case EDIT_CUT: {
@ -686,6 +683,163 @@ void ScriptEditor::_menu_option(int p_option) {
current->get_text_edit()->select_all();
} break;
case EDIT_MOVE_LINE_UP: {
TextEdit *tx = current->get_text_edit();
Ref<Script> scr = current->get_edited_script();
if (scr.is_null())
return;
int line_id = tx->cursor_get_line();
int next_id = line_id - 1;
if (line_id == 0 || next_id < 0)
return;
String tmp = tx->get_line(line_id);
String tmp2 = tx->get_line(next_id);
tx->set_line(next_id, tmp);
tx->set_line(line_id, tmp2);
tx->update();
tx->cursor_set_line(next_id);
} break;
case EDIT_MOVE_LINE_DOWN: {
TextEdit *tx = current->get_text_edit();
Ref<Script> scr = current->get_edited_script();
if (scr.is_null())
return;
int line_id = tx->cursor_get_line();
int next_id = line_id + 1;
if (line_id == tx->get_line_count() || next_id > tx->get_line_count())
return;
String tmp = tx->get_line(line_id);
String tmp2 = tx->get_line(next_id);
tx->set_line(next_id, tmp);
tx->set_line(line_id, tmp2);
tx->update();
tx->cursor_set_line(next_id);
} break;
case EDIT_INDENT_LEFT: {
TextEdit *tx = current->get_text_edit();
Ref<Script> scr = current->get_edited_script();
if (scr.is_null())
return;
int begin, end;
begin = tx->get_selection_from_line();
if (tx->is_selection_active())
{
end = tx->get_selection_to_line();
for (int i = begin; i <= end; i++)
{
String line_text = tx->get_line(i);
line_text = line_text.substr(1, line_text.length());
tx->set_line(i, line_text);
}
}
else
{
begin = tx->cursor_get_line();
String line_text = tx->get_line(begin);
line_text = line_text.substr(1, line_text.length());
tx->set_line(begin, line_text);
}
tx->update();
tx->deselect();
} break;
case EDIT_INDENT_RIGHT: {
TextEdit *tx = current->get_text_edit();
Ref<Script> scr = current->get_edited_script();
if (scr.is_null())
return;
int begin, end;
begin = tx->get_selection_from_line();
if (tx->is_selection_active())
{
end = tx->get_selection_to_line();
for (int i = begin; i <= end; i++)
{
String line_text = tx->get_line(i);
line_text = '\t' + line_text;
tx->set_line(i, line_text);
}
}
else
{
begin = tx->cursor_get_line();
String line_text = tx->get_line(begin);
line_text = '\t' + line_text;
tx->set_line(begin, line_text);
}
tx->update();
tx->deselect();
} break;
case EDIT_CLONE_DOWN: {
TextEdit *tx = current->get_text_edit();
Ref<Script> scr = current->get_edited_script();
if (scr.is_null())
return;
int line = tx->cursor_get_line();
int next_line = line + 1;
if (line == tx->get_line_count() || next_line > tx->get_line_count())
return;
String line_clone = tx->get_line(line);
tx->insert_at(line_clone, next_line);
tx->update();
} break;
case EDIT_TOGGLE_COMMENT: {
TextEdit *tx = current->get_text_edit();
Ref<Script> scr = current->get_edited_script();
if (scr.is_null())
return;
int begin, end;
begin = tx->get_selection_from_line();
if (tx->is_selection_active())
{
end = tx->get_selection_to_line();
for (int i = begin; i <= end; i++)
{
String line_text = tx->get_line(i);
if (line_text.begins_with("#"))
line_text = line_text.strip_edges().substr(1, line_text.length());
else
line_text = "#" + line_text;
tx->set_line(i, line_text);
}
}
else
{
begin = tx->cursor_get_line();
String line_text = tx->get_line(begin);
if (line_text.begins_with("#"))
line_text = line_text.strip_edges().substr(1, line_text.length());
else
line_text = "#" + line_text;
tx->set_line(begin, line_text);
}
tx->update();
tx->deselect();
} break;
case EDIT_COMPLETE: {
current->get_text_edit()->query_code_comple();
@ -1335,14 +1489,21 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
edit_menu = memnew( MenuButton );
menu_hb->add_child(edit_menu);
edit_menu->set_text("Edit");
edit_menu->get_popup()->add_item("Undo");
edit_menu->get_popup()->add_item("Redo");
edit_menu->get_popup()->add_item("Undo",EDIT_UNDO,KEY_MASK_CMD|KEY_Z);
edit_menu->get_popup()->add_item("Redo",EDIT_REDO,KEY_MASK_CMD|KEY_Y);
edit_menu->get_popup()->add_separator();
edit_menu->get_popup()->add_item("Cut",EDIT_CUT,KEY_MASK_CMD|KEY_X);
edit_menu->get_popup()->add_item("Copy",EDIT_COPY,KEY_MASK_CMD|KEY_C);
edit_menu->get_popup()->add_item("Paste",EDIT_PASTE,KEY_MASK_CMD|KEY_V);
edit_menu->get_popup()->add_separator();
edit_menu->get_popup()->add_item("Select All",EDIT_SELECT_ALL,KEY_MASK_CMD|KEY_A);
edit_menu->get_popup()->add_separator();
edit_menu->get_popup()->add_item("Move Line Up",EDIT_MOVE_LINE_UP,KEY_MASK_ALT|KEY_UP);
edit_menu->get_popup()->add_item("Move Line Down",EDIT_MOVE_LINE_DOWN,KEY_MASK_ALT|KEY_DOWN);
edit_menu->get_popup()->add_item("Indent Left",EDIT_INDENT_LEFT,KEY_MASK_ALT|KEY_LEFT);
edit_menu->get_popup()->add_item("Indent Right",EDIT_INDENT_RIGHT,KEY_MASK_ALT|KEY_RIGHT);
edit_menu->get_popup()->add_item("Toggle Comment",EDIT_TOGGLE_COMMENT,KEY_MASK_CMD|KEY_SLASH);
edit_menu->get_popup()->add_item("Clone Down",EDIT_CLONE_DOWN,KEY_MASK_CMD|KEY_B);
edit_menu->get_popup()->add_separator();
edit_menu->get_popup()->add_item("Complete Symbol",EDIT_COMPLETE,KEY_MASK_CMD|KEY_SPACE);
edit_menu->get_popup()->add_item("Auto Indent",EDIT_AUTO_INDENT,KEY_MASK_CMD|KEY_I);

6
tools/editor/plugins/script_editor_plugin.h
View file

@ -123,6 +123,12 @@ class ScriptEditor : public VBoxContainer {
EDIT_SELECT_ALL,
EDIT_COMPLETE,
EDIT_AUTO_INDENT,
EDIT_TOGGLE_COMMENT,
EDIT_MOVE_LINE_UP,
EDIT_MOVE_LINE_DOWN,
EDIT_INDENT_RIGHT,
EDIT_INDENT_LEFT,
EDIT_CLONE_DOWN,
SEARCH_FIND,
SEARCH_FIND_NEXT,
SEARCH_REPLACE,