Skip to content

Commit 7d61f09

Browse files
authored
Merge pull request #428 from HenryRiley0/bugfix
fixing gdb check and type errors
2 parents f204573 + 25e1f28 commit 7d61f09

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Versioning].
1212

1313
### Added
1414

15+
- fix gdb check error when debug beginning ([@henryriley0])
16+
- fix implicitly type error in log message when build vsix ([@henryriley0])
1517
- check for configured debugger before start to provide a nicer error message
1618
([@GitMensch])
1719

@@ -242,6 +244,7 @@ Versioning].
242244
[@gentoo90]: https://github.com/gentoo90
243245
[@gitmensch]: https://github.com/GitMensch
244246
[@haronk]: https://github.com/HaronK
247+
[@henryriley0]: https://github.com/HenryRiley0
245248
[@jelleroets]: https://github.com/JelleRoets
246249
[@karljs]: https://github.com/karljs
247250
[@kvinwang]: https://github.com/kvinwang

src/backend/mi2/mi2.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class LogMessage {
3333
protected logReplaceTest = /{([^}]*)}/g;
3434
public logMsgBrkList: Breakpoint[] = [];
3535

36-
logMsgOutput(record){
36+
logMsgOutput(record:any){
3737
if ((record.type === 'console')) {
3838
if(record.content.startsWith("$")){
3939
const content = record.content;
@@ -54,7 +54,7 @@ class LogMessage {
5454
}
5555
}
5656

57-
logMsgProcess(parsed){
57+
logMsgProcess(parsed:any){
5858
this.logMsgBrkList.forEach((brk)=>{
5959
if(parsed.outOfBandRecord[0].output[0][1] == "breakpoint-hit" && parsed.outOfBandRecord[0].output[2][1] == brk.id){
6060
this.logMsgVar = brk?.logMessage;
@@ -626,7 +626,7 @@ export class MI2 extends EventEmitter implements IBackend {
626626
return this.sendCommand("break-condition " + bkptNum + " " + condition);
627627
}
628628

629-
setLogPoint(bkptNum, command): Thenable<any> {
629+
setLogPoint(bkptNum:number, command:string): Thenable<any> {
630630
const regex = /{([a-z0-9A-Z-_\.\>\&\*\[\]]*)}/gm;
631631
let m:RegExpExecArray;
632632
let commands:string = "";

src/gdb.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class GDBDebugSession extends MI2DebugSession {
5555

5656
protected override launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
5757
const dbgCommand = args.gdbpath || "gdb";
58-
if (this.checkCommand(dbgCommand)) {
58+
if (!this.checkCommand(dbgCommand)) {
5959
this.sendErrorResponse(response, 104, `Configured debugger ${dbgCommand} not found.`);
6060
return;
6161
}
@@ -101,7 +101,7 @@ class GDBDebugSession extends MI2DebugSession {
101101

102102
protected override attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
103103
const dbgCommand = args.gdbpath || "gdb";
104-
if (this.checkCommand(dbgCommand)) {
104+
if (!this.checkCommand(dbgCommand)) {
105105
this.sendErrorResponse(response, 104, `Configured debugger ${dbgCommand} not found.`);
106106
return;
107107
}

src/lldb.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class LLDBDebugSession extends MI2DebugSession {
4949

5050
protected override launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
5151
const dbgCommand = args.lldbmipath || "lldb-mi";
52-
if (this.checkCommand(dbgCommand)) {
52+
if (!this.checkCommand(dbgCommand)) {
5353
this.sendErrorResponse(response, 104, `Configured debugger ${dbgCommand} not found.`);
5454
return;
5555
}
@@ -95,7 +95,7 @@ class LLDBDebugSession extends MI2DebugSession {
9595

9696
protected override attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
9797
const dbgCommand = args.lldbmipath || "lldb-mi";
98-
if (this.checkCommand(dbgCommand)) {
98+
if (!this.checkCommand(dbgCommand)) {
9999
this.sendErrorResponse(response, 104, `Configured debugger ${dbgCommand} not found.`);
100100
return;
101101
}

src/mago.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MagoDebugSession extends MI2DebugSession {
5151

5252
protected override launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
5353
const dbgCommand = args.magomipath || "mago-mi";
54-
if (this.checkCommand(dbgCommand)) {
54+
if (!this.checkCommand(dbgCommand)) {
5555
this.sendErrorResponse(response, 104, `Configured debugger ${dbgCommand} not found.`);
5656
return;
5757
}
@@ -75,7 +75,7 @@ class MagoDebugSession extends MI2DebugSession {
7575

7676
protected override attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
7777
const dbgCommand = args.magomipath || "mago-mi";
78-
if (this.checkCommand(dbgCommand)) {
78+
if (!this.checkCommand(dbgCommand)) {
7979
this.sendErrorResponse(response, 104, `Configured debugger ${dbgCommand} not found.`);
8080
return;
8181
}

0 commit comments

Comments
 (0)