1 files changed, 39 insertions, 4 deletions

diff --git a/core/string/node_path.cpp b/core/string/node_path.cpp
index 32e4564c5e..fdc72bc8dc 100644
--- a/core/string/node_path.cpp
+++ b/core/string/node_path.cpp
@@ -92,6 +92,14 @@ StringName NodePath::get_subname(int p_idx) const {
 	return data->subpath[p_idx];
 }
 
+int NodePath::get_total_name_count() const {
+	if (!data) {
+		return 0;
+	}
+
+	return data->path.size() + data->subpath.size();
+}
+
 void NodePath::unref() {
 	if (data && data->refcount.unref()) {
 		memdelete(data);
@@ -207,7 +215,10 @@ StringName NodePath::get_concatenated_names() const {
 		String concatenated;
 		const StringName *sn = data->path.ptr();
 		for (int i = 0; i < pc; i++) {
-			concatenated += i == 0 ? sn[i].operator String() : "/" + sn[i];
+			if (i > 0) {
+				concatenated += "/";
+			}
+			concatenated += sn[i].operator String();
 		}
 		data->concatenated_path = concatenated;
 	}
@@ -222,13 +233,37 @@ StringName NodePath::get_concatenated_subnames() const {
 		String concatenated;
 		const StringName *ssn = data->subpath.ptr();
 		for (int i = 0; i < spc; i++) {
-			concatenated += i == 0 ? ssn[i].operator String() : ":" + ssn[i];
+			if (i > 0) {
+				concatenated += ":";
+			}
+			concatenated += ssn[i].operator String();
 		}
 		data->concatenated_subpath = concatenated;
 	}
 	return data->concatenated_subpath;
 }
 
+NodePath NodePath::slice(int p_begin, int p_end) const {
+	const int name_count = get_name_count();
+	const int total_count = get_total_name_count();
+
+	int begin = CLAMP(p_begin, -total_count, total_count);
+	if (begin < 0) {
+		begin += total_count;
+	}
+	int end = CLAMP(p_end, -total_count, total_count);
+	if (end < 0) {
+		end += total_count;
+	}
+	const int sub_begin = MAX(begin - name_count - 1, 0);
+	const int sub_end = MAX(end - name_count, 0);
+
+	const Vector<StringName> names = get_names().slice(begin, end);
+	const Vector<StringName> sub_names = get_subnames().slice(sub_begin, sub_end);
+	const bool absolute = is_absolute() && (begin == 0);
+	return NodePath(names, sub_names, absolute);
+}
+
 NodePath NodePath::rel_path_to(const NodePath &p_np) const {
 	ERR_FAIL_COND_V(!is_absolute(), NodePath());
 	ERR_FAIL_COND_V(!p_np.is_absolute(), NodePath());
@@ -331,7 +366,7 @@ NodePath NodePath::simplified() const {
 }
 
 NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute) {
-	if (p_path.size() == 0) {
+	if (p_path.size() == 0 && !p_absolute) {
 		return;
 	}
 
@@ -343,7 +378,7 @@ NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute) {
 }
 
 NodePath::NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p_subpath, bool p_absolute) {
-	if (p_path.size() == 0 && p_subpath.size() == 0) {
+	if (p_path.size() == 0 && p_subpath.size() == 0 && !p_absolute) {
 		return;
 	}