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

Create onready variables when dropping nodes and holding Ctrl

Browse source
This commit is contained in:
Haoyu Qiu 2022-05-03 09:04:44 +08:00
parent 4a96db7196
commit b611b4cddc
3 changed files with 68 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/ustring.cpp
View file

@ -3377,6 +3377,31 @@ bool String::is_abs_path() const {
}
}
static _FORCE_INLINE_ bool _is_valid_identifier_bit(int p_index, CharType p_char) {
if (p_index == 0 && p_char >= '0' && p_char <= '9') {
return false; // No start with number plz.
}
return (p_char >= '0' && p_char <= '9') || (p_char >= 'a' && p_char <= 'z') || (p_char >= 'A' && p_char <= 'Z') || p_char == '_';
}
String String::validate_identifier() const {
if (empty()) {
return "_"; // Empty string is not a valid identifier.
}
String result = *this;
int len = result.length();
wchar_t *buffer = result.ptrw();
for (int i = 0; i < len; i++) {
if (!_is_valid_identifier_bit(i, buffer[i])) {
buffer[i] = '_';
}
}
return result;
}
bool String::is_valid_identifier() const {
int len = length();
@ -3387,15 +3412,7 @@ bool String::is_valid_identifier() const {
const wchar_t *str = &operator[](0);
for (int i = 0; i < len; i++) {
if (i == 0) {
if (str[0] >= '0' && str[0] <= '9') {
return false; // no start with number plz
}
}
bool valid_char = (str[i] >= '0' && str[i] <= '9') || (str[i] >= 'a' && str[i] <= 'z') || (str[i] >= 'A' && str[i] <= 'Z') || str[i] == '_';
if (!valid_char) {
if (!_is_valid_identifier_bit(i, str[i])) {
return false;
}
}

1
core/ustring.h
View file

@ -349,6 +349,7 @@ public:
// node functions
static const String invalid_node_name_characters;
String validate_node_name() const;
String validate_identifier() const;
bool is_valid_identifier() const;
bool is_valid_integer() const;

54
editor/plugins/script_text_editor.cpp
View file

@ -1497,6 +1497,8 @@ static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const
}
void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
Dictionary d = p_data;
TextEdit *te = code_editor->get_text_edit();
@ -1520,7 +1522,6 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
}
if (d.has("type") && (String(d["type"]) == "files" || String(d["type"]) == "files_and_dirs")) {
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
Array files = d["files"];
String text_to_drop;
@ -1552,19 +1553,47 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
Array nodes = d["nodes"];
String text_to_drop;
for (int i = 0; i < nodes.size(); i++) {
if (i > 0) {
text_to_drop += ",";
}
NodePath np = nodes[i];
Node *node = get_node(np);
if (!node) {
continue;
}
if (Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
bool use_type = EDITOR_GET("text_editor/completion/add_type_hints");
for (int i = 0; i < nodes.size(); i++) {
NodePath np = nodes[i];
Node *node = get_node(np);
if (!node) {
continue;
}
String path = sn->get_path_to(node);
text_to_drop += "\"" + path.c_escape() + "\"";
String path = sn->get_path_to(node);
Vector<String> segments = path.split("/");
for (int j = 0; j < segments.size(); j++) {
if (!segments[j].is_valid_identifier()) {
path = path.c_escape().quote(quote_style);
break;
}
}
String variable_name = String(node->get_name()).camelcase_to_underscore(true).validate_identifier();
if (use_type) {
text_to_drop += vformat("onready var %s: %s = $%s\n", variable_name, node->get_class_name(), path);
} else {
text_to_drop += vformat("onready var %s = $%s\n", variable_name, path);
}
}
} else {
for (int i = 0; i < nodes.size(); i++) {
if (i > 0) {
text_to_drop += ",";
}
NodePath np = nodes[i];
Node *node = get_node(np);
if (!node) {
continue;
}
String path = sn->get_path_to(node);
text_to_drop += path.c_escape().quote(quote_style);
}
}
te->cursor_set_line(row);
@ -1573,7 +1602,6 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
}
if (d.has("type") && String(d["type"]) == "obj_property") {
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
const String text_to_drop = String(d["property"]).c_escape().quote(quote_style);
te->cursor_set_line(row);