Add relative path support to SSH source file mapping.

The SSH source file mapping now utilizes the CWD of the remote machine
to determine the path kind that is being used when the supplied path
mapping is a relative path.  This assumes that the CWD is an absolute
path (which it should be) and is used as a backup when the path in the
map cannot be determined to be an absolute path.

Fixes WebFreak001#381.

Author: brownts

Diff for: CHANGELOG.md

@@ -1,5 +1,6 @@
 # [Unreleased]
 ## Fixed
+* Fixes #381 - POSIX relative paths in SSH `sourceFileMap` were not properly formatted (@brownts)
 * Fixes #348 - Not waiting for `autorun` commands to complete before continuing execution (@brownts).
 * Fixes #382 - Breakpoints not always cleared over SSH - PR #383 (@abussy-aldebaran)
 * Fixes #346 - Case-sensitivity not respected in SSH path mapping - PR #352 (@brownts)

Diff for: src/mibase.ts

@@ -734,7 +734,7 @@ export class MI2DebugSession extends DebugSession {
 		if (configMap === undefined) {
 			this.sourceFileMap = new SourceFileMap({[fallbackGDB]: fallbackIDE});
 		} else {
-			this.sourceFileMap = new SourceFileMap(configMap);
+			this.sourceFileMap = new SourceFileMap(configMap, fallbackGDB);
 		}
 	}
 

Diff for: src/source_file_map.ts

@@ -8,16 +8,18 @@ interface Mapping {
 export class SourceFileMap {
 	private sortedMappings: { [key in keyof Mapping]: Mapping[] } = {remote: [], local: []};
 	private nativePath: PathKind;
+	private remoteCwd: string|undefined;
 
-	constructor (map: { [index: string]: string }) {
+	constructor (map: { [index: string]: string }, remoteCwd?: string) {
 		const mappings: Mapping[] = [];
+		this.remoteCwd = remoteCwd;
 		this.nativePath = this.getNativePath();
 		for (let [remotePrefix, localPrefix] of Object.entries(map)) {
 			// Normalize local path, adding trailing separator if missing.
 			localPrefix = this.nativePath.normalizeDir(localPrefix);
 
 			// Try to detect remote path.
-			const debuggerPath: PathKind = SourceFileMap.toPathKind(remotePrefix);
+			const debuggerPath: PathKind = this.toPathKind(remotePrefix);
 			// Normalize remote path, adding trailing separator if missing.
 			remotePrefix = debuggerPath.normalizeDir(remotePrefix);
 
@@ -42,10 +44,17 @@ export class SourceFileMap {
 			return PathPosix.getInstance();
 	}
 
-	private static toPathKind(unknownPath: string): PathKind {
+	private toPathKind(unknownPath: string): PathKind {
 		const pathPosix: PathKind = PathPosix.getInstance();
 		const pathWin32: PathKind = PathWin32.getInstance();
-		return pathPosix.isAbsolute(unknownPath) ? pathPosix : pathWin32;
+
+		if (pathPosix.isAbsolute(unknownPath) ||
+			(this.remoteCwd && pathPosix.isAbsolute(this.remoteCwd)))
+		{
+			return pathPosix;
+		} else {
+			return pathWin32;
+		}
 	}
 
 	private pathMatch(key: keyof Mapping, caseSensitive: boolean, path: string): Mapping | undefined {
@@ -66,7 +75,7 @@ export class SourceFileMap {
 
 	public toLocalPath(remotePath: string): string {
 		// Try to detect remote path.
-		const debuggerPath: PathKind = SourceFileMap.toPathKind(remotePath);
+		const debuggerPath: PathKind = this.toPathKind(remotePath);
 		const normalizedRemotePath: string = debuggerPath.normalize(remotePath);
 		const mapping: Mapping | undefined =
 			this.pathMatch("remote", debuggerPath.caseSensitive, normalizedRemotePath);
@@ -88,7 +97,7 @@ export class SourceFileMap {
 		if (mapping) {
 			const pathSuffix = normalizedLocalPath.substring(mapping.local.length);
 			// Try to detect remote path.
-			const debuggerPath = SourceFileMap.toPathKind(mapping.remote);
+			const debuggerPath = this.toPathKind(mapping.remote);
 			return debuggerPath.join(mapping.remote, pathSuffix);
 		}