godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75836 from rsubtil/bugfix-dap_windows_path 

Fix DAP path mismatch on Windows
This commit is contained in:
Fabio Alessandrelli 2023-06-19 16:38:19 +02:00 committed by GitHub
parent cdc68c2887 b8ae1c218c
commit 7b170d12cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/debugger/debug_adapter/debug_adapter_parser.cpp
View File

@ -340,6 +340,12 @@ Dictionary DebugAdapterParser::req_setBreakpoints(const Dictionary &p_params) co
return prepare_error_response(p_params, DAP::ErrorType::WRONG_PATH, variables);
}
// If path contains \, it's a Windows path, so we need to convert it to /, and make the drive letter uppercase
if (source.path.find("\\") != -1) {
source.path = source.path.replace("\\", "/");
source.path = source.path.substr(0, 1).to_upper() + source.path.substr(1);
}
Array breakpoints = args["breakpoints"], lines;
for (int i = 0; i < breakpoints.size(); i++) {
DAP::SourceBreakpoint breakpoint;

6
editor/debugger/debug_adapter/debug_adapter_parser.h
View File

@ -45,6 +45,12 @@ private:
friend DebugAdapterProtocol;
_FORCE_INLINE_ bool is_valid_path(const String &p_path) const {
// If path contains \, it's a Windows path, so we need to convert it to /, and check as case-insensitive.
if (p_path.contains("\\")) {
String project_path = ProjectSettings::get_singleton()->get_resource_path();
String path = p_path.replace("\\", "/");
return path.findn(project_path) != -1;
}
return p_path.begins_with(ProjectSettings::get_singleton()->get_resource_path());
}