[release] src/goDebugConfiguration: pick fix for #1729

During release, part of the fix was dropped. Restored the fix by copying the snapshot of the repo at master before release (171cc61) and pick cfee3e1 the main fix intended for v0.28.1. Updates #1729 Change-Id: I54728fa5d11903967a62004bddd6016b43a56dae Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/352056 Trust: Hyang-Ah Hana Kim <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]> Reviewed-by: Suzy Mueller <[email protected]> Reviewed-by: Rebecca Stambler <[email protected]>
golang · Sep 24, 2021 · e92ab67 · e92ab67
1 parent 665e267
commit e92ab67
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ A list of all issues and changes can be found in the [v0.28.1 milestone](https:/
 
 ### Fixes
 - Skipped launch configuration adjustment to address build errors when debugging using externally launched delve DAP servers. (Issue [1793](https://github.com/golang/vscode-go/issues/1793))
+- Restore the fix for Issue [1729](https://github.com/golang/vscode-go/issues/1729) that was accidentally dropped during merge for release.
 
 ## v0.28.0 - 20 Sep, 2021
 

diff --git a/src/goDebugConfiguration.ts b/src/goDebugConfiguration.ts
@@ -158,12 +158,6 @@ export class GoDebugConfigurationProvider implements vscode.DebugConfigurationPr
 			// for local mode, default to dlv-dap.
 			debugConfiguration['debugAdapter'] = debugConfiguration['mode'] !== 'remote' ? 'dlv-dap' : 'legacy';
 		}
-		if (debugConfiguration['debugAdapter'] === 'dlv-dap' && debugConfiguration['port']) {
-			this.showWarning(
-				'ignorePortInDlvDapWarning',
-				"`port` is ignored with the 'dlv-dap' debugAdapter, which does not yet support remote debugging. Please file an issue if you have a use case that requires port."
-			);
-		}
 		if (debugConfiguration['debugAdapter'] === 'dlv-dap' && debugConfiguration['mode'] === 'remote') {
 			this.showWarning(
 				'ignoreDlvDAPInRemoteModeWarning',

diff --git a/src/goDebugFactory.ts b/src/goDebugFactory.ts
@@ -38,6 +38,9 @@ export class GoDebugAdapterDescriptorFactory implements vscode.DebugAdapterDescr
 	private async createDebugAdapterDescriptorDlvDap(
 		configuration: vscode.DebugConfiguration
 	): Promise<vscode.ProviderResult<vscode.DebugAdapterDescriptor>> {
+		if (configuration.port) {
+			return new vscode.DebugAdapterServer(configuration.port, configuration.host ?? '127.0.0.1');
+		}
 		const logger = new TimestampedLogger(configuration.trace, this.outputChannel);
 		logger.debug(`Config: ${JSON.stringify(configuration)}`);
 		const d = new DelveDAPOutputAdapter(configuration, logger);

diff --git a/src/goInstallTools.ts b/src/goInstallTools.ts
@@ -29,7 +29,6 @@ import {
 	Tool,
 	ToolAtVersion
 } from './goTools';
-import { getFromWorkspaceState } from './stateUtils';
 import {
 	getBinPath,
 	getBinPathWithExplanation,