Author: Ely Ronnen Date: 2025-04-20T08:33:28-07:00 New Revision: 839f52147c0cdbe7d4590cfdda089f250e5ec119
URL: https://github.com/llvm/llvm-project/commit/839f52147c0cdbe7d4590cfdda089f250e5ec119 DIFF: https://github.com/llvm/llvm-project/commit/839f52147c0cdbe7d4590cfdda089f250e5ec119.diff LOG: [lldb-dap] fix inconsistent debugAdapterHostname argument name (#135544) the argument is written as `debugAdapterHostname` in package.json but used as `debugAdapterHost` Added: Modified: lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts Removed: ################################################################################ diff --git a/lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts b/lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts index e23d717a70101..3a86d1f3f418f 100644 --- a/lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts +++ b/lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts @@ -211,7 +211,7 @@ export class LLDBDapDescriptorFactory if (session.configuration.debugAdapterPort) { return new vscode.DebugAdapterServer( session.configuration.debugAdapterPort, - session.configuration.debugAdapterHost, + session.configuration.debugAdapterHostname, ); } diff --git a/lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts b/lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts index 0272509ee55f7..8d92139c02a00 100644 --- a/lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts +++ b/lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts @@ -32,11 +32,11 @@ export class LLDBDapConfigurationProvider ): Promise<vscode.DebugConfiguration | null | undefined> { try { if ( - "debugAdapterHost" in debugConfiguration && + "debugAdapterHostname" in debugConfiguration && !("debugAdapterPort" in debugConfiguration) ) { throw new ErrorWithNotification( - "A debugAdapterPort must be provided when debugAdapterHost is set. Please update your launch configuration.", + "A debugAdapterPort must be provided when debugAdapterHostname is set. Please update your launch configuration.", new ConfigureButton(), ); } @@ -83,7 +83,7 @@ export class LLDBDapConfigurationProvider // and list of arguments. delete debugConfiguration.debugAdapterExecutable; delete debugConfiguration.debugAdapterArgs; - debugConfiguration.debugAdapterHost = serverInfo.host; + debugConfiguration.debugAdapterHostname = serverInfo.host; debugConfiguration.debugAdapterPort = serverInfo.port; } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
