Browse Source

Merge pull request #64099 from A-Lamia/lsp_uri_path_fixes

Rémi Verschelde 3 years ago
parent
commit
f8383a7c72

+ 3 - 1
modules/gdscript/language_server/gdscript_language_protocol.cpp

@@ -184,7 +184,9 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 	if (root_uri.length() && is_same_workspace) {
 	if (root_uri.length() && is_same_workspace) {
 		workspace->root_uri = root_uri;
 		workspace->root_uri = root_uri;
 	} else {
 	} else {
-		workspace->root_uri = "file://" + workspace->root;
+		String r_root = workspace->root;
+		r_root = r_root.lstrip("/");
+		workspace->root_uri = "file:///" + r_root;
 
 
 		Dictionary params;
 		Dictionary params;
 		params["path"] = workspace->root;
 		params["path"] = workspace->root;

+ 1 - 3
modules/gdscript/language_server/gdscript_workspace.cpp

@@ -500,10 +500,8 @@ Error GDScriptWorkspace::parse_local_script(const String &p_path) {
 
 
 String GDScriptWorkspace::get_file_path(const String &p_uri) const {
 String GDScriptWorkspace::get_file_path(const String &p_uri) const {
 	String path = p_uri;
 	String path = p_uri;
-	path = path.replace("///", "//");
-	path = path.replace("%3A", ":");
-	path = path.replacen(root_uri + "/", "res://");
 	path = path.uri_decode();
 	path = path.uri_decode();
+	path = path.replacen(root_uri + "/", "res://");
 	return path;
 	return path;
 }
 }