Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ScriptLanguage::supports_builtin_mode and improve ScriptCreateDialog #12365

Merged
merged 1 commit into from
Oct 24, 2017
Merged

Add ScriptLanguage::supports_builtin_mode and improve ScriptCreateDialog #12365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/script_language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ class ScriptLanguage {
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL) const = 0;
virtual Script *create_script() const = 0;
virtual bool has_named_classes() const = 0;
virtual bool supports_builtin_mode() const = 0;
virtual bool can_inherit_from_file() { return false; }
virtual int find_function(const String &p_function, const String &p_code) const = 0;
virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const = 0;
Expand Down
35 changes: 27 additions & 8 deletions editor/script_create_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,13 @@ void ScriptCreateDialog::ok_pressed() {

void ScriptCreateDialog::_create_new() {

String cname;
if (has_named_classes)
cname = class_name->get_text();
String cname_param;

if (has_named_classes) {
cname_param = class_name->get_text();
} else {
cname_param = ProjectSettings::get_singleton()->localize_path(file_path->get_text()).get_file().get_basename();
}

Ref<Script> scr;
if (script_template != "") {
Expand All @@ -159,13 +163,16 @@ void ScriptCreateDialog::_create_new() {
return;
}
scr = scr->duplicate();
ScriptServer::get_language(language_menu->get_selected())->make_template(cname, parent_name->get_text(), scr);
ScriptServer::get_language(language_menu->get_selected())->make_template(cname_param, parent_name->get_text(), scr);
} else {
scr = ScriptServer::get_language(language_menu->get_selected())->get_template(cname, parent_name->get_text());
scr = ScriptServer::get_language(language_menu->get_selected())->get_template(cname_param, parent_name->get_text());
}

if (cname != "")
scr->set_name(cname);
if (has_named_classes) {
String cname = class_name->get_text();
if (cname.length())
scr->set_name(cname);
}

if (!is_built_in) {
String lpath = ProjectSettings::get_singleton()->localize_path(file_path->get_text());
Expand Down Expand Up @@ -201,12 +208,20 @@ void ScriptCreateDialog::_lang_changed(int l) {

l = language_menu->get_selected();
ScriptLanguage *language = ScriptServer::get_language(l);

if (language->has_named_classes()) {
has_named_classes = true;
} else {
has_named_classes = false;
}

if (language->supports_builtin_mode()) {
supports_built_in = true;
} else {
supports_built_in = false;
is_built_in = false;
}

if (ScriptServer::get_language(l)->can_inherit_from_file()) {
can_inherit_from_file = true;
} else {
Expand Down Expand Up @@ -496,14 +511,17 @@ void ScriptCreateDialog::_update_dialog() {
}
}

if (!supports_built_in)
internal->set_pressed(false);

/* Is Script created or loaded from existing file */

if (is_new_script_created) {
// New Script Created
get_ok()->set_text(TTR("Create"));
parent_name->set_editable(true);
parent_browse_button->set_disabled(false);
internal->set_disabled(false);
internal->set_disabled(!supports_built_in);
if (is_built_in) {
_msg_path_valid(true, TTR("Built-in script (into scene file)"));
} else {
Expand Down Expand Up @@ -734,6 +752,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
is_path_valid = false;

has_named_classes = false;
supports_built_in = false;
can_inherit_from_file = false;
is_built_in = false;

Expand Down
1 change: 1 addition & 0 deletions editor/script_create_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class ScriptCreateDialog : public ConfirmationDialog {
bool is_new_script_created;
bool is_path_valid;
bool has_named_classes;
bool supports_built_in;
bool can_inherit_from_file;
bool is_parent_name_valid;
bool is_class_name_valid;
Expand Down
1 change: 1 addition & 0 deletions modules/gdnative/include/pluginscript/godot_pluginscript.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ typedef struct {
const char **comment_delimiters; // NULL terminated array
const char **string_delimiters; // NULL terminated array
godot_bool has_named_classes;
godot_bool supports_builtin_mode;

godot_string (*get_template_source_code)(godot_pluginscript_language_data *p_data, const godot_string *p_class_name, const godot_string *p_base_class_name);
godot_bool (*validate)(godot_pluginscript_language_data *p_data, const godot_string *p_script, int *r_line_error, int *r_col_error, godot_string *r_test_error, const godot_string *p_path, godot_pool_string_array *r_functions);
Expand Down
3 changes: 3 additions & 0 deletions modules/gdnative/nativescript/nativescript.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,9 @@ Script *NativeScriptLanguage::create_script() const {
bool NativeScriptLanguage::has_named_classes() const {
return true;
}
bool NativeScriptLanguage::supports_builtin_mode() const {
return true;
}
int NativeScriptLanguage::find_function(const String &p_function, const String &p_code) const {
return -1;
}
Expand Down
1 change: 1 addition & 0 deletions modules/gdnative/nativescript/nativescript.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ class NativeScriptLanguage : public ScriptLanguage {
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions) const;
virtual Script *create_script() const;
virtual bool has_named_classes() const;
virtual bool supports_builtin_mode() const;
virtual int find_function(const String &p_function, const String &p_code) const;
virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const;
Expand Down
4 changes: 4 additions & 0 deletions modules/gdnative/pluginscript/pluginscript_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ bool PluginScriptLanguage::has_named_classes() const {
return _desc.has_named_classes;
}

bool PluginScriptLanguage::supports_builtin_mode() const {
return _desc.supports_builtin_mode;
}

int PluginScriptLanguage::find_function(const String &p_function, const String &p_code) const {
if (_desc.find_function) {
return _desc.find_function(_data, (godot_string *)&p_function, (godot_string *)&p_code);
Expand Down
1 change: 1 addition & 0 deletions modules/gdnative/pluginscript/pluginscript_language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class PluginScriptLanguage : public ScriptLanguage {
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL) const;
virtual Script *create_script() const;
virtual bool has_named_classes() const;
virtual bool supports_builtin_mode() const;
virtual bool can_inherit_from_file() { return true; }
virtual int find_function(const String &p_function, const String &p_code) const;
virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
Expand Down
5 changes: 5 additions & 0 deletions modules/gdscript/gd_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ bool GDScriptLanguage::has_named_classes() const {
return false;
}

bool GDScriptLanguage::supports_builtin_mode() const {

return true;
}

int GDScriptLanguage::find_function(const String &p_function, const String &p_code) const {

GDTokenizerText tokenizer;
Expand Down
1 change: 1 addition & 0 deletions modules/gdscript/gd_script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ class GDScriptLanguage : public ScriptLanguage {
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL) const;
virtual Script *create_script() const;
virtual bool has_named_classes() const;
virtual bool supports_builtin_mode() const;
virtual bool can_inherit_from_file() { return true; }
virtual int find_function(const String &p_function, const String &p_code) const;
virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
Expand Down
11 changes: 9 additions & 2 deletions modules/mono/csharp_script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,13 @@ Ref<Script> CSharpLanguage::get_template(const String &p_class_name, const Strin
" }\n"
"}\n";

script_template = script_template.replace("%BASE_CLASS_NAME%", p_base_class_name).replace("%CLASS_NAME%", p_class_name);
script_template = script_template.replace("%BASE_CLASS_NAME%", p_base_class_name)
.replace("%CLASS_NAME%", p_class_name);

Ref<CSharpScript> script;
script.instance();
script->set_source_code(script_template);
script->set_name(p_class_name);

return script;
}
Expand All @@ -295,7 +297,12 @@ Script *CSharpLanguage::create_script() const {

bool CSharpLanguage::has_named_classes() const {

return true;
return false;
}

bool CSharpLanguage::supports_builtin_mode() const {

return false;
}

static String variant_type_to_managed_name(const String &p_var_type_name) {
Expand Down
1 change: 1 addition & 0 deletions modules/mono/csharp_script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ class CSharpLanguage : public ScriptLanguage {
/* TODO */ virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions) const { return true; }
virtual Script *create_script() const;
virtual bool has_named_classes() const;
virtual bool supports_builtin_mode() const;
/* TODO? */ virtual int find_function(const String &p_function, const String &p_code) const { return -1; }
virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
/* TODO? */ Error complete_code(const String &p_code, const String &p_base_path, Object *p_owner, List<String> *r_options, String &r_call_hint) { return ERR_UNAVAILABLE; }
Expand Down
4 changes: 4 additions & 0 deletions modules/visual_script/visual_script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2412,6 +2412,10 @@ bool VisualScriptLanguage::has_named_classes() const {

return false;
}
bool VisualScriptLanguage::supports_builtin_mode() const {

return true;
}
int VisualScriptLanguage::find_function(const String &p_function, const String &p_code) const {

return -1;
Expand Down
1 change: 1 addition & 0 deletions modules/visual_script/visual_script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ class VisualScriptLanguage : public ScriptLanguage {
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL) const;
virtual Script *create_script() const;
virtual bool has_named_classes() const;
virtual bool supports_builtin_mode() const;
virtual int find_function(const String &p_function, const String &p_code) const;
virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const;
Expand Down