Merge branch '#234' into develop

CHANGELOG.md

@@ -30,6 +30,7 @@ Also want to check the development status, check the [commit history](https://gi
 * [#220](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/220) Grouping of messages using Debug Directive is not working, such as `; @Debug-Output:start`, `; @Debug-Output:end`
 * [#229](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/229) Raw error message on Critical Error
 * [#232](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/232) Output of members in bracketed notation in Output directive, Watch expression, etc. may not be evaluated correctly
+* [#234](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/234) Breakpoint do not work when `runtime` is a UNC path (e.g. `//server/folder`)
 
 ## [1.11.0] - 2022-02-11
 ### Added

README.md

@@ -23,6 +23,7 @@ This extension is a debugger adapter for [VSCode](https://code.visualstudio.com/
     * Fixed: [#220](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/220) Grouping of messages using Debug Directive is not working, such as `; @Debug-Output:start`, `; @Debug-Output:end`
     * Fixed: [#229](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/229) Raw error message on Critical Error
     * Fixed: [#232](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/232) Output of members in bracketed notation in Output directive, Watch expression, etc. may not be evaluated correctly
+    * Fixed: [#234](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/234) Breakpoint do not work when `runtime` is a UNC path (e.g. `//server/folder`)
 
 * `1.11.0` - 2022-02-11
     * Added: [#201](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/201) Add `useLoadedScripts` to launch.json

src/ahkDebug.ts

@@ -33,7 +33,7 @@ import { TraceLogger } from './util/TraceLogger';
 import { completionItemProvider } from './CompletionItemProvider';
 import * as dbgp from './dbgpSession';
 import { AutoHotkeyLauncher, AutoHotkeyProcess } from './util/AutoHotkeyLuncher';
-import { isPrimitive, now, timeoutPromise } from './util/util';
+import { isPrimitive, now, timeoutPromise, toFileUri } from './util/util';
 import matcher from 'matcher';
 import { Categories, Category, MetaVariable, MetaVariableValue, MetaVariableValueMap, Scope, StackFrames, Variable, VariableManager, formatProperty } from './util/VariableManager';
 import { CategoryData } from './extension';
@@ -303,7 +303,8 @@ export class AhkDebugSession extends LoggingDebugSession {
       }
 
       const filePath = args.source.path ?? '';
-      const fileUri = URI.file(filePath).toString();
+      const fileUri = toFileUri(filePath);
+
       const removedBreakpoints = await this.breakpointManager!.unregisterBreakpointsInFile(fileUri);
 
       const vscodeBreakpoints: DebugProtocol.Breakpoint[] = [];

src/dbgpSession.ts

@@ -7,7 +7,7 @@ import convertHrTime from 'convert-hrtime';
 import { uniq, uniqBy } from 'lodash';
 import { AhkVersion } from '@zero-plusplus/autohotkey-utilities';
 import { CaseInsensitiveMap } from './util/CaseInsensitiveMap';
-import { isNumberLike, joinVariablePathArray, splitVariablePath } from './util/util';
+import { isNumberLike, joinVariablePathArray, splitVariablePath, toFileUri } from './util/util';
 import { equalsIgnoreCase } from './util/stringUtils';
 import { TraceLogger } from './util/TraceLogger';
 import { isComObject, unescapeAhk } from './util/VariableManager';
@@ -410,7 +410,7 @@ export class Breakpoint {
     this.id = parseInt(id, 10);
     this.type = type as BreakpointType;
     this.state = state as BreakpointState;
-    this.fileUri = filename;
+    this.fileUri = toFileUri(filename);
     this.line = parseInt(lineno, 10);
     this.temporary = Boolean(parseInt(temporary, 10));
   }
@@ -667,7 +667,7 @@ export class Session extends EventEmitter {
     return new BreakpointGetResponse(await this.sendCommand('breakpoint_get', `-d ${breakpointId}`));
   }
   public async sendBreakpointSetCommand(fileUri: string, line: number): Promise<BreakpointSetResponse> {
-    return new BreakpointSetResponse(await this.sendCommand('breakpoint_set', `-t line -f ${fileUri} -n ${line}`));
+    return new BreakpointSetResponse(await this.sendCommand('breakpoint_set', `-t line -f ${toFileUri(fileUri)} -n ${line}`));
   }
   public async sendBreakpointRemoveCommand(id: number): Promise<Response> {
     return new Response(await this.sendCommand('breakpoint_remove', `-d ${id}`));

src/util/BreakpointManager.ts

@@ -2,6 +2,7 @@ import * as dbgp from '../dbgpSession';
 import { URI } from 'vscode-uri';
 import { CaseInsensitiveMap } from './CaseInsensitiveMap';
 import { equalsIgnoreCase } from './stringUtils';
+import { toFileUri } from './util';
 
 export type BreakpointLogGroup = 'start' | 'startCollapsed' | 'end' | undefined;
 export interface BreakpointAdvancedData {
@@ -101,7 +102,7 @@ export class BreakpointManager {
   public getLineBreakpoints(fileUri: string, line: number): LineBreakpoints | null {
     const key = this.createKey(fileUri, line);
     for (const [ targetKey, lineBreakpoints ] of this.breakpointsMap) {
-      if (key === targetKey) {
+      if (equalsIgnoreCase(key, targetKey)) {
         return lineBreakpoints;
       }
     }
@@ -187,13 +188,12 @@ export class BreakpointManager {
     }
     return removedBreakpoints;
   }
-  private createKey(fileUri: string, line: number): string {
+  private createKey(file: string, line: number): string {
     // The following encoding differences have been converted to path
     // file:///W%3A/project/vscode-autohotkey-debug/demo/demo.ahk"
     // file:///w:/project/vscode-autohotkey-debug/demo/demo.ahk
 
-    const uri = URI.parse(fileUri);
-    const filePath = uri.scheme === 'file' ? uri.fsPath.toLowerCase() : fileUri.toLowerCase();
-    return `${filePath},${line}`;
+    const fileUri = toFileUri(file);
+    return `${fileUri},${line}`;
   }
 }

src/util/VariableManager.ts

@@ -5,7 +5,7 @@ import { URI } from 'vscode-uri';
 import * as dbgp from '../dbgpSession';
 import { rtrim } from 'underscore.string';
 import { AhkVersion } from '@zero-plusplus/autohotkey-utilities';
-import { isNumberLike, isPrimitive, toArray } from './util';
+import { isNumberLike, isPrimitive, toArray, toFileUri } from './util';
 import { equalsIgnoreCase } from './stringUtils';
 import { CategoryData, MatcherData, ScopeSelector } from '../extension';
 import { CaseInsensitiveMap } from './CaseInsensitiveMap';
@@ -127,7 +127,7 @@ export class StackFrame implements DebugProtocol.StackFrame {
     this.id = handles.create(this);
     this.name = dbgpStackFrame.name;
     this.line = dbgpStackFrame.line;
-    const filePath = URI.parse(dbgpStackFrame.fileUri).fsPath;
+    const filePath = URI.parse(toFileUri(dbgpStackFrame.fileUri)).fsPath;
     this.source = new DebugAdapter.Source(path.basename(filePath), filePath);
 
     this.session = session;

src/util/util.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { AhkVersion } from '@zero-plusplus/autohotkey-utilities';
 import { statSync } from 'fs';
+import { URI } from 'vscode-uri';
 
 export const isDirectory = (dirPath): boolean => {
   try {
@@ -161,3 +162,21 @@ export const now = (): string => {
   const milliSeconds = String(now.getMilliseconds()).padStart(3, '0');
   return `${now.getFullYear()}/${month}/${date} ${hours}:${minutes}:${seconds}.${milliSeconds}`;
 };
+
+export const toFileUri = (file: string): string => {
+  const isUncPath = file.startsWith('\\\\');
+  if (isUncPath) {
+    return file;
+  }
+
+  const isUri = file.startsWith('file:');
+  if (isUri) {
+    const isUncUri = (/^file:\/\/\/(?!\w%3A)/iu).test(file);
+    if (isUncUri) {
+      return `${file.replace(/^file:\/\/(\/)?/u, '')}`;
+    }
+    return file;
+  }
+
+  return URI.file(file).toString();
+};