Skip to content

DebugAdapter variables overhaul #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaelonSuzuka merged 9 commits into from
Feb 22, 2025
Merged

DebugAdapter variables overhaul #793

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
94579ea
Error handling for get_variable() request
MichaelXt Jan 23, 2025
faf5f92
remove unused error variable
MichaelXt Jan 23, 2025
5916f0f
Merge branch 'master' of https://github.com/MichaelXt/godot-vscode-pl…
MichaelXt Feb 10, 2025
e7989f6
Godot variables overhaul
MichaelXt Feb 13, 2025
fe2cfe3
ci node version update
MichaelXt Feb 13, 2025
5b8d535
bump test timeouts due to macos slowness
MichaelXt Feb 13, 2025
dd32904
Merge branch 'master' into mikp/da_var_redesign
MichaelXt Feb 21, 2025
d79ebc6
Re-added local development launch target
DaelonSuzuka Feb 22, 2025
a50a7d0
Commit *.uid files
DaelonSuzuka Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Error handling for get_variable() request 
Fixes the VSCode watch window freeze due to missing response in case of exception. See related #779
  • Loading branch information
@MichaelXt
MichaelXt committed Jan 23, 2025
commit 94579ea54f0f6dde8cba3daa8e0af5afbb2218b0
12 changes: 5 additions & 7 deletions src/debugger/godot3/debug_session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,16 @@ export class GodotDebugSession extends LoggingDebugSession {
await debug.activeDebugSession.customRequest("scopes", { frameId: 0 });

if (this.all_scopes) {
const variable = this.get_variable(args.expression, null, null, null);

if (variable.error == null) {
try {
const variable = this.get_variable(args.expression, null, null, null);
const parsed_variable = parse_variable(variable.variable);
response.body = {
result: parsed_variable.value,
variablesReference: !is_variable_built_in_type(variable.variable) ? variable.index : 0,
};
} else {
} catch (error) {
response.success = false;
response.message = variable.error;
response.message = error.toString();
}
}

Expand Down Expand Up @@ -489,8 +488,7 @@ export class GodotDebugSession extends LoggingDebugSession {
(x) => x.sanitized.name === propertyName && x.sanitized.scope_path === path,
)?.real;
if (!result.variable) {
result.error = `Could not find: ${propertyName}`;
return result;
throw new Error(`Could not find: ${propertyName}`);
}

if (root.value.entries) {
Expand Down
12 changes: 5 additions & 7 deletions src/debugger/godot4/debug_session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,16 @@ export class GodotDebugSession extends LoggingDebugSession {
await debug.activeDebugSession.customRequest("scopes", { frameId: 0 });

if (this.all_scopes) {
const variable = this.get_variable(args.expression, null, null, null);

if (variable.error == null) {
try {
const variable = this.get_variable(args.expression, null, null, null);
const parsed_variable = parse_variable(variable.variable);
response.body = {
result: parsed_variable.value,
variablesReference: !is_variable_built_in_type(variable.variable) ? variable.index : 0,
};
} else {
} catch (error) {
response.success = false;
response.message = variable.error;
response.message = error.toString();
}
}

Expand Down Expand Up @@ -489,8 +488,7 @@ export class GodotDebugSession extends LoggingDebugSession {
(x) => x.sanitized.name === propertyName && x.sanitized.scope_path === path,
)?.real;
if (!result.variable) {
result.error = `Could not find: ${propertyName}`;
return result;
throw new Error(`Could not find: ${propertyName}`);
}

if (root.value.entries) {
Expand Down