summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/language_server/gdscript_workspace.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-08-30 10:01:11 +0200
committerGitHub <noreply@github.com>2022-08-30 10:01:11 +0200
commit432b25d3649319517827dbf7bc275e81e0a2b92e (patch)
treed0ed3596d938caca1123f00497c11fe6b9026633 /modules/gdscript/language_server/gdscript_workspace.cpp
parent0b5d7281b9936f17176187338ef9706410a8fc75 (diff)
parent10a56981dc7bf2d0f0decd56a005ea1c2986e279 (diff)
downloadredot-engine-432b25d3649319517827dbf7bc275e81e0a2b92e.tar.gz
Merge pull request #65066 from aaronfranke/str-path-join
Diffstat (limited to 'modules/gdscript/language_server/gdscript_workspace.cpp')
-rw-r--r--modules/gdscript/language_server/gdscript_workspace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index 44b60369ab..fd213e7b37 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -228,9 +228,9 @@ void GDScriptWorkspace::list_script_files(const String &p_root_dir, List<String>
String file_name = dir->get_next();
while (file_name.length()) {
if (dir->current_is_dir() && file_name != "." && file_name != ".." && file_name != "./") {
- list_script_files(p_root_dir.plus_file(file_name), r_files);
+ list_script_files(p_root_dir.path_join(file_name), r_files);
} else if (file_name.ends_with(".gd")) {
- String script_file = p_root_dir.plus_file(file_name);
+ String script_file = p_root_dir.path_join(file_name);
r_files.push_back(script_file);
}
file_name = dir->get_next();