Skip to content

Commit 9314392

Browse files
use LLDB DAP extension by default (#1406)
1 parent 32cb840 commit 9314392

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/debugger/debugAdapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export class DebugAdapter {
4444
*/
4545
public static getLaunchConfigType(swiftVersion: Version): LaunchConfigType {
4646
const lldbDapIsAvailable = swiftVersion.isGreaterThanOrEqual(new Version(6, 0, 0));
47-
if (lldbDapIsAvailable && configuration.debugger.debugAdapter === "lldb-dap") {
47+
if (lldbDapIsAvailable && configuration.debugger.debugAdapter !== "CodeLLDB") {
4848
return LaunchConfigType.LLDB_DAP;
4949
} else {
5050
return LaunchConfigType.CODE_LLDB;

test/unit-tests/debugger/debugAdapter.test.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,23 @@ suite("DebugAdapter Unit Test Suite", () => {
4040
});
4141

4242
suite("getLaunchConfigType()", () => {
43-
test("returns SWIFT_EXTENSION when Swift version >=6.0.0 and swift.debugger.debugAdapter is set to lldb-dap", () => {
43+
test("returns LLDB_DAP when Swift version >=6.0.0 and swift.debugger.debugAdapter is set to lldb-dap", () => {
4444
mockDebugConfig.debugAdapter = "lldb-dap";
4545
expect(DebugAdapter.getLaunchConfigType(new Version(6, 0, 1))).to.equal(
4646
LaunchConfigType.LLDB_DAP
4747
);
4848
});
4949

50-
test("returns CODE_LLDB when Swift version >=6.0.0 and swift.debugger.debugAdapter is set to auto or CodeLLDB", () => {
51-
// Try with the setting set to auto
50+
test("returns LLDB_DAP when Swift version >=6.0.0 and swift.debugger.debugAdapter is set to auto", () => {
5251
mockDebugConfig.debugAdapter = "auto";
53-
expect(DebugAdapter.getLaunchConfigType(new Version(5, 10, 0))).to.equal(
54-
LaunchConfigType.CODE_LLDB
52+
expect(DebugAdapter.getLaunchConfigType(new Version(6, 0, 1))).to.equal(
53+
LaunchConfigType.LLDB_DAP
5554
);
56-
// Try with the setting set to CodeLLDB
55+
});
56+
57+
test("returns CODE_LLDB when Swift version >=6.0.0 and swift.debugger.debugAdapter is set to CODE_LLDB", () => {
5758
mockDebugConfig.debugAdapter = "CodeLLDB";
58-
expect(DebugAdapter.getLaunchConfigType(new Version(5, 10, 0))).to.equal(
59+
expect(DebugAdapter.getLaunchConfigType(new Version(6, 0, 1))).to.equal(
5960
LaunchConfigType.CODE_LLDB
6061
);
6162
});

0 commit comments

Comments
 (0)