Quellcode durchsuchen

Remove exception guards (#839)

* Bump tar-fs from 2.1.1 to 2.1.2

Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.1 to 2.1.2.
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: tar-fs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Removing exception tracking from debug_session.

* Replicate changes for Godot 3

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: David Kincaid <[email protected]>
Joseph Straceski vor 4 Monaten
Ursprung
Commit
0a7eb9c0e4

+ 4 - 3
package-lock.json

@@ -6226,10 +6226,11 @@
 			}
 		},
 		"node_modules/tar-fs": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
+			"integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
 			"dependencies": {
 				"chownr": "^1.1.1",

+ 11 - 28
src/debugger/godot3/debug_session.ts

@@ -32,7 +32,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 	public controller = new ServerController(this);
 	public debug_data = new GodotDebugData(this);
 	public sceneTree: SceneTreeProvider;
-	private exception = false;
 	private got_scope: Subject = new Subject();
 	private ongoing_inspections: bigint[] = [];
 	private previous_inspections: bigint[] = [];
@@ -88,7 +87,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 		this.mode = "launch";
 
 		this.debug_data.projectPath = args.project;
-		this.exception = false;
 		await this.controller.launch(args);
 
 		this.sendResponse(response);
@@ -99,7 +97,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 
 		this.mode = "attach";
 
-		this.exception = false;
 		await this.controller.attach(args);
 
 		this.sendResponse(response);
@@ -114,11 +111,9 @@ export class GodotDebugSession extends LoggingDebugSession {
 	}
 
 	protected continueRequest(response: DebugProtocol.ContinueResponse, args: DebugProtocol.ContinueArguments) {
-		if (!this.exception) {
-			response.body = { allThreadsContinued: true };
-			this.controller.continue();
-			this.sendResponse(response);
-		}
+		response.body = { allThreadsContinued: true };
+		this.controller.continue();
+		this.sendResponse(response);
 	}
 
 	protected async evaluateRequest(response: DebugProtocol.EvaluateResponse, args: DebugProtocol.EvaluateArguments) {
@@ -149,17 +144,13 @@ export class GodotDebugSession extends LoggingDebugSession {
 	}
 
 	protected nextRequest(response: DebugProtocol.NextResponse, args: DebugProtocol.NextArguments) {
-		if (!this.exception) {
-			this.controller.next();
-			this.sendResponse(response);
-		}
+		this.controller.next();
+		this.sendResponse(response);
 	}
 
 	protected pauseRequest(response: DebugProtocol.PauseResponse, args: DebugProtocol.PauseArguments) {
-		if (!this.exception) {
-			this.controller.break();
-			this.sendResponse(response);
-		}
+		this.controller.break();
+		this.sendResponse(response);
 	}
 
 	protected async scopesRequest(response: DebugProtocol.ScopesResponse, args: DebugProtocol.ScopesArguments) {
@@ -234,17 +225,13 @@ export class GodotDebugSession extends LoggingDebugSession {
 	}
 
 	protected stepInRequest(response: DebugProtocol.StepInResponse, args: DebugProtocol.StepInArguments) {
-		if (!this.exception) {
-			this.controller.step();
-			this.sendResponse(response);
-		}
+		this.controller.step();
+		this.sendResponse(response);
 	}
 
 	protected stepOutRequest(response: DebugProtocol.StepOutResponse, args: DebugProtocol.StepOutArguments) {
-		if (!this.exception) {
-			this.controller.step_out();
-			this.sendResponse(response);
-		}
+		this.controller.step_out();
+		this.sendResponse(response);
 	}
 
 	protected terminateRequest(response: DebugProtocol.TerminateResponse, args: DebugProtocol.TerminateArguments) {
@@ -303,10 +290,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 		this.sendResponse(response);
 	}
 
-	public set_exception(exception: boolean) {
-		this.exception = true;
-	}
-
 	public set_scopes(stackVars: GodotStackVars) {
 		this.all_scopes = [
 			undefined,

+ 0 - 1
src/debugger/godot3/server_controller.ts

@@ -589,7 +589,6 @@ export class ServerController {
 		if (this.exception.length === 0) {
 			this.session.sendEvent(new StoppedEvent("breakpoint", 0));
 		} else {
-			this.session.set_exception(true);
 			this.session.sendEvent(new StoppedEvent("exception", 0, this.exception));
 		}
 	}

+ 11 - 28
src/debugger/godot4/debug_session.ts

@@ -23,7 +23,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 	public controller = new ServerController(this);
 	public debug_data = new GodotDebugData(this);
 	public sceneTree: SceneTreeProvider;
-	private exception = false;
 	private configuration_done: Subject = new Subject();
 	private mode: "launch" | "attach" | "" = "";
 
@@ -81,7 +80,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 		this.mode = "launch";
 
 		this.debug_data.projectPath = args.project;
-		this.exception = false;
 		await this.controller.launch(args);
 
 		this.sendResponse(response);
@@ -94,7 +92,6 @@ export class GodotDebugSession extends LoggingDebugSession {
 		this.mode = "attach";
 
 		this.debug_data.projectPath = args.project;
-		this.exception = false;
 		await this.controller.attach(args);
 
 		this.sendResponse(response);
@@ -111,27 +108,21 @@ export class GodotDebugSession extends LoggingDebugSession {
 
 	protected continueRequest(response: DebugProtocol.ContinueResponse, args: DebugProtocol.ContinueArguments) {
 		log.info("continueRequest", args);
-		if (!this.exception) {
-			response.body = { allThreadsContinued: true };
-			this.controller.continue();
-			this.sendResponse(response);
-		}
+		response.body = { allThreadsContinued: true };
+		this.controller.continue();
+		this.sendResponse(response);
 	}
 
 	protected nextRequest(response: DebugProtocol.NextResponse, args: DebugProtocol.NextArguments) {
 		log.info("nextRequest", args);
-		if (!this.exception) {
-			this.controller.next();
-			this.sendResponse(response);
-		}
+		this.controller.next();
+		this.sendResponse(response);
 	}
 
 	protected pauseRequest(response: DebugProtocol.PauseResponse, args: DebugProtocol.PauseArguments) {
 		log.info("pauseRequest", args);
-		if (!this.exception) {
-			this.controller.break();
-			this.sendResponse(response);
-		}
+		this.controller.break();
+		this.sendResponse(response);
 	}
 
 	protected setBreakPointsRequest(
@@ -176,18 +167,14 @@ export class GodotDebugSession extends LoggingDebugSession {
 
 	protected stepInRequest(response: DebugProtocol.StepInResponse, args: DebugProtocol.StepInArguments) {
 		log.info("stepInRequest", args);
-		if (!this.exception) {
-			this.controller.step();
-			this.sendResponse(response);
-		}
+		this.controller.step();
+		this.sendResponse(response);
 	}
 
 	protected stepOutRequest(response: DebugProtocol.StepOutResponse, args: DebugProtocol.StepOutArguments) {
 		log.info("stepOutRequest", args);
-		if (!this.exception) {
-			this.controller.step_out();
-			this.sendResponse(response);
-		}
+		this.controller.step_out();
+		this.sendResponse(response);
 	}
 
 	protected terminateRequest(response: DebugProtocol.TerminateResponse, args: DebugProtocol.TerminateArguments) {
@@ -297,8 +284,4 @@ export class GodotDebugSession extends LoggingDebugSession {
 		log.info("evaluateRequest response", response);
 		this.sendResponse(response);
 	}
-
-	public set_exception(exception: boolean) {
-		this.exception = true;
-	}
 }

+ 0 - 1
src/debugger/godot4/server_controller.ts

@@ -718,7 +718,6 @@ export class ServerController {
 		if (this.exception.length === 0) {
 			this.session.sendEvent(new StoppedEvent("breakpoint", 0));
 		} else {
-			this.session.set_exception(true);
 			this.session.sendEvent(new StoppedEvent("exception", 0, this.exception));
 		}
 	}