From f078182ddcdf160a3783e41414b6f9aa1ced29d8 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Mon, 28 Oct 2024 19:48:42 -0700
Subject: [PATCH 01/24] Bump to latest ahk2

---
 ahk2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ahk2 b/ahk2
index c05e25ed..16c0722e 160000
--- a/ahk2
+++ b/ahk2
@@ -1 +1 @@
-Subproject commit c05e25ede71fb57a15c9e1fa18606068a2a8a88e
+Subproject commit 16c0722e2d176da1cacc976c823c8df139e1af50

From 07edad88495aa90fd6bac2a2183aaacf8dd370f6 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Mon, 28 Oct 2024 19:55:01 -0700
Subject: [PATCH 02/24] Replace substr with substring

---
 src/providers/defProvider.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 5fe5a558..b44af224 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -97,7 +97,10 @@ export class DefProvider implements vscode.DefinitionProvider {
         }
         const parent = workFolder
             ? workFolder
-            : document.uri.path.substr(0, document.uri.path.lastIndexOf('/'));
+            : document.uri.path.substring(
+                  0,
+                  document.uri.path.lastIndexOf('/'),
+              );
         const targetPath = vscode.Uri.file(
             includeMatch[0]
                 .trim()

From e5078e9337603b46ea259bbbb64f4b58d1c47ca6 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Mon, 28 Oct 2024 20:05:55 -0700
Subject: [PATCH 03/24] Document Out class

---
 src/common/out.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/common/out.ts b/src/common/out.ts
index 56d185ea..a6b7aabf 100644
--- a/src/common/out.ts
+++ b/src/common/out.ts
@@ -4,6 +4,10 @@ import * as vscode from 'vscode';
 export class Out {
     private static outputChannel: vscode.OutputChannel;
 
+    /**
+     * Logs the given value without focusing the output view.
+     * Prepends all logs with `new Date().toISOString()`.
+     */
     public static debug(value: Error | string) {
         Out.log(value, false);
     }
@@ -12,6 +16,7 @@ export class Out {
      * Logs the given value. Traces errors to console before logging.
      * Prepends all logs with `new Date().toISOString()`.
      * @param value The value to log
+     * @param focus whether to focus the output view. Defaults to true.
      */
     public static log(value: Error | string, focus = true) {
         if (value instanceof Error) {

From f2432c45d10680f7312ee41291d169f26646f3e6 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Mon, 28 Oct 2024 20:06:17 -0700
Subject: [PATCH 04/24] Add logs and documentation to tryGetFileLink

---
 src/providers/defProvider.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index b44af224..e58762e9 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
+import { Out } from '../common/out';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -85,13 +86,23 @@ export class DefProvider implements vscode.DefinitionProvider {
         return null;
     }
 
+    /**
+     * If the position is on an `#Include` line,
+     * returns a Location at the beginning of the included file.
+     * Otherwise returns undefined.
+     */
     public async tryGetFileLink(
         document: vscode.TextDocument,
         position: vscode.Position,
         workFolder?: string,
     ): Promise<vscode.Location> | undefined {
+        const funcName = 'tryGetFileLink';
         const { text } = document.lineAt(position.line);
-        const includeMatch = text.match(/(?<=#include).+?\.(ahk|ext)\b/i);
+        Out.debug(`${funcName} text: ${text}`);
+        const includeMatch = text.match(
+            /(?<=#include).+?\.(ahk|ahk1|ah1|ext)\b/i,
+        );
+        Out.debug(`${funcName} includeMatch: ${includeMatch?.[0]}`);
         if (!includeMatch) {
             return undefined;
         }

From fdf5b92632025834048a3893c57991fb99c02941 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Mon, 28 Oct 2024 20:10:00 -0700
Subject: [PATCH 05/24] Cleanup workFolder check in tryGetFileLink

---
 src/providers/defProvider.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index e58762e9..59a2198f 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -106,12 +106,9 @@ export class DefProvider implements vscode.DefinitionProvider {
         if (!includeMatch) {
             return undefined;
         }
-        const parent = workFolder
-            ? workFolder
-            : document.uri.path.substring(
-                  0,
-                  document.uri.path.lastIndexOf('/'),
-              );
+        const parent =
+            workFolder ||
+            document.uri.path.substring(0, document.uri.path.lastIndexOf('/'));
         const targetPath = vscode.Uri.file(
             includeMatch[0]
                 .trim()

From 4c21c61570cc9d37c540926cb52e13ffc6997654 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:00:43 -0700
Subject: [PATCH 06/24] Identify cause of bug

---
 src/parser/parser.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/parser/parser.ts b/src/parser/parser.ts
index 7c1a17d8..873b3d01 100644
--- a/src/parser/parser.ts
+++ b/src/parser/parser.ts
@@ -53,6 +53,7 @@ export class Parser {
         document: vscode.TextDocument,
         options: BuildScriptOptions = {},
     ): Promise<Script> {
+        const funcName = 'buildScript';
         if (options.usingCache && documentCache.get(document.uri.path)) {
             return documentCache.get(document.uri.path);
         }
@@ -135,22 +136,32 @@ export class Parser {
             }
         }
         const script: Script = { methods, labels, refs, variables, blocks };
+        Out.debug(`${funcName} document.uri.path: ${document.uri.path}`);
+        Out.debug(`${funcName} script: ${JSON.stringify(script)}`);
         documentCache.set(document.uri.path, script);
         return script;
     }
 
+    /**
+     * Finds the best reference to the method.
+     * If a method of this name exists in the current file, returns that method.
+     * Otherwise, searches through document cache to find the matching method.
+     * Matches are not case-sensitive and only need to match method name.
+     */
     public static async getMethodByName(
         document: vscode.TextDocument,
         name: string,
+        localCache = documentCache,
     ) {
         name = name.toLowerCase();
-        for (const method of documentCache.get(document.uri.path).methods) {
+        for (const method of localCache.get(document.uri.path).methods) {
             if (method.name.toLowerCase() === name) {
                 return method;
             }
         }
-        for (const filePath of documentCache.keys()) {
-            for (const method of documentCache.get(filePath).methods) {
+        // todo this should prioritize included files first.
+        for (const filePath of localCache.keys()) {
+            for (const method of localCache.get(filePath).methods) {
                 if (method.name.toLowerCase() === name) {
                     return method;
                 }

From a0764829a6800788425d1a31d7e8dac78d9f9cf3 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:07:09 -0700
Subject: [PATCH 07/24] Cleanup docs

---
 src/common/codeUtil.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/codeUtil.ts b/src/common/codeUtil.ts
index d4f86949..a089164d 100644
--- a/src/common/codeUtil.ts
+++ b/src/common/codeUtil.ts
@@ -20,10 +20,10 @@ export class CodeUtil {
     }
 
     /**
-     * Concats an array and an item or array of items. Impure, @see array is modified
+     * Concats an array and an item or array of items. Impure, `array` is modified
      * @param array The initial array
      * @param items Either an item to add to the end of the array,
-     * or another array to concat to the end of @see array
+     * or another array to concat to the end of `array`
      */
     public static join(array: unknown[], items: unknown) {
         if (!array || !items) {

From a6207b9efc9036ab6e2c1d90975fba61cc9fd884 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:07:18 -0700
Subject: [PATCH 08/24] Cleanup docs more

---
 src/common/codeUtil.ts       | 1 -
 src/providers/defProvider.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/codeUtil.ts b/src/common/codeUtil.ts
index a089164d..970f4d32 100644
--- a/src/common/codeUtil.ts
+++ b/src/common/codeUtil.ts
@@ -54,7 +54,6 @@ export class CodeUtil {
 }
 
 /** Whether the current active text editor is for an AHK v1 file */
-// todo use LSP for all v2 functionality
 export const isV1 = (): boolean =>
     vscode.window.activeTextEditor?.document.languageId === LanguageId.ahk1;
 
diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 59a2198f..efa6a45f 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -90,6 +90,7 @@ export class DefProvider implements vscode.DefinitionProvider {
      * If the position is on an `#Include` line,
      * returns a Location at the beginning of the included file.
      * Otherwise returns undefined.
+     * However, it's unclear if this ever worked.
      */
     public async tryGetFileLink(
         document: vscode.TextDocument,

From e047a595d64cac56c66e5a5d9b4ecf4b16f4e892 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:09:51 -0700
Subject: [PATCH 09/24] Cleanup tryGetFileLink

---
 src/providers/defProvider.ts | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index efa6a45f..20334918 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -92,11 +92,11 @@ export class DefProvider implements vscode.DefinitionProvider {
      * Otherwise returns undefined.
      * However, it's unclear if this ever worked.
      */
-    public async tryGetFileLink(
+    async tryGetFileLink(
         document: vscode.TextDocument,
         position: vscode.Position,
-        workFolder?: string,
     ): Promise<vscode.Location> | undefined {
+        const docPath = document.uri.path;
         const funcName = 'tryGetFileLink';
         const { text } = document.lineAt(position.line);
         Out.debug(`${funcName} text: ${text}`);
@@ -107,25 +107,15 @@ export class DefProvider implements vscode.DefinitionProvider {
         if (!includeMatch) {
             return undefined;
         }
-        const parent =
-            workFolder ||
-            document.uri.path.substring(0, document.uri.path.lastIndexOf('/'));
+        const parent = docPath.substring(0, docPath.lastIndexOf('/'));
         const targetPath = vscode.Uri.file(
             includeMatch[0]
                 .trim()
                 .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parent)
-                .replace(/(%A_LineFile%)/, document.uri.path),
+                .replace(/(%A_LineFile%)/, docPath),
         );
-        if (existsSync(targetPath.fsPath)) {
-            return new vscode.Location(targetPath, new vscode.Position(0, 0));
-        } else if (workFolder) {
-            return this.tryGetFileLink(
-                document,
-                position,
-                vscode.workspace.workspaceFolders?.[0].uri.fsPath,
-            );
-        } else {
-            return undefined;
-        }
+        return existsSync(targetPath.fsPath)
+            ? new vscode.Location(targetPath, new vscode.Position(0, 0))
+            : undefined;
     }
 }

From 93f7372133f5b0ebe083ab90719db799dc0f86c8 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:28:52 -0700
Subject: [PATCH 10/24] Fix links to included files

---
 src/providers/defProvider.ts | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 20334918..75f2ba04 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
-import { Out } from '../common/out';
+import { join } from 'path';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -96,26 +96,28 @@ export class DefProvider implements vscode.DefinitionProvider {
         document: vscode.TextDocument,
         position: vscode.Position,
     ): Promise<vscode.Location> | undefined {
+        /** @example /c:/path/to/file.ahk */
         const docPath = document.uri.path;
-        const funcName = 'tryGetFileLink';
         const { text } = document.lineAt(position.line);
-        Out.debug(`${funcName} text: ${text}`);
         const includeMatch = text.match(
             /(?<=#include).+?\.(ahk|ahk1|ah1|ext)\b/i,
         );
-        Out.debug(`${funcName} includeMatch: ${includeMatch?.[0]}`);
         if (!includeMatch) {
             return undefined;
         }
-        const parent = docPath.substring(0, docPath.lastIndexOf('/'));
-        const targetPath = vscode.Uri.file(
-            includeMatch[0]
-                .trim()
-                .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parent)
-                .replace(/(%A_LineFile%)/, docPath),
-        );
-        return existsSync(targetPath.fsPath)
-            ? new vscode.Location(targetPath, new vscode.Position(0, 0))
+        /** @example c:/path/to */
+        const parentGoodPath = docPath.substring(1, docPath.lastIndexOf('/'));
+        const expandedPath = includeMatch[0]
+            .trim()
+            .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
+            .replace(/(%A_LineFile%)/, docPath);
+        /** @example c:/path/to/included.ahk */
+        const resolvedPath = join(parentGoodPath, expandedPath);
+        return existsSync(resolvedPath)
+            ? new vscode.Location(
+                  vscode.Uri.file(resolvedPath),
+                  new vscode.Position(0, 0),
+              )
             : undefined;
     }
 }

From 44ef07b16b0c0eafd07ae8deac6e172672f6dd32 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:29:45 -0700
Subject: [PATCH 11/24] Update changelog for include hover

---
 changelog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/changelog.md b/changelog.md
index 71c3cc95..4f69cbcd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.4.0 - unreleased
+
+### New features
+
+-   Hovering over an included filename now provides a link to that document in your IDE
+
 ## 6.3.0 - 2024-10-19 🕳️
 
 ### New features

From c3c67feb9e9e6a87a3550c654b702c4d09b4a823 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 20:45:21 -0700
Subject: [PATCH 12/24] wip updates

---
 src/providers/defProvider.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 75f2ba04..29b078c3 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
 import { join } from 'path';
+import { Out } from 'src/common/out';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -100,11 +101,12 @@ export class DefProvider implements vscode.DefinitionProvider {
         const docPath = document.uri.path;
         const { text } = document.lineAt(position.line);
         const includeMatch = text.match(
-            /(?<=#include).+?\.(ahk|ahk1|ah1|ext)\b/i,
+            /(?<=#include) *?,? *(.+?\.(ahk|ahk1|ah1|ext))\b/i,
         );
         if (!includeMatch) {
             return undefined;
         }
+        Out.debug(includeMatch?.[1]);
         /** @example c:/path/to */
         const parentGoodPath = docPath.substring(1, docPath.lastIndexOf('/'));
         const expandedPath = includeMatch[0]

From 35c1fbd27d03b4da6dd2dffba28734507395fa35 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 21:11:41 -0700
Subject: [PATCH 13/24] Works with commas too ;)

---
 src/providers/defProvider.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 29b078c3..015d0e15 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -2,7 +2,6 @@ import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { Out } from 'src/common/out';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -101,15 +100,14 @@ export class DefProvider implements vscode.DefinitionProvider {
         const docPath = document.uri.path;
         const { text } = document.lineAt(position.line);
         const includeMatch = text.match(
-            /(?<=#include) *?,? *(.+?\.(ahk|ahk1|ah1|ext))\b/i,
+            /#include\s*?,?\s*([^\s]+?\.(ahk|ahk1|ah1|ext))\b/i,
         );
         if (!includeMatch) {
             return undefined;
         }
-        Out.debug(includeMatch?.[1]);
         /** @example c:/path/to */
         const parentGoodPath = docPath.substring(1, docPath.lastIndexOf('/'));
-        const expandedPath = includeMatch[0]
+        const expandedPath = includeMatch[1]
             .trim()
             .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
             .replace(/(%A_LineFile%)/, docPath);

From 2e5795cd79ed1e364546816677cd6af96732a7b7 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 21:14:31 -0700
Subject: [PATCH 14/24] Work with spaces in filename

---
 src/providers/defProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 015d0e15..6f9f8622 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -100,7 +100,7 @@ export class DefProvider implements vscode.DefinitionProvider {
         const docPath = document.uri.path;
         const { text } = document.lineAt(position.line);
         const includeMatch = text.match(
-            /#include\s*?,?\s*([^\s]+?\.(ahk|ahk1|ah1|ext))\b/i,
+            /#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i,
         );
         if (!includeMatch) {
             return undefined;

From e247325b1c4a358fa42022370a0ccdf6b3e84125 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 21:22:02 -0700
Subject: [PATCH 15/24] Extract regex from tryGetFileLink

---
 src/providers/defProvider.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 6f9f8622..dbe4c725 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -90,7 +90,7 @@ export class DefProvider implements vscode.DefinitionProvider {
      * If the position is on an `#Include` line,
      * returns a Location at the beginning of the included file.
      * Otherwise returns undefined.
-     * However, it's unclear if this ever worked.
+     ** Only works with relative paths.
      */
     async tryGetFileLink(
         document: vscode.TextDocument,
@@ -99,15 +99,12 @@ export class DefProvider implements vscode.DefinitionProvider {
         /** @example /c:/path/to/file.ahk */
         const docPath = document.uri.path;
         const { text } = document.lineAt(position.line);
-        const includeMatch = text.match(
-            /#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i,
-        );
-        if (!includeMatch) {
-            return undefined;
-        }
+        const includedFile = includedFilename(text);
+        if (!includedFile) return;
+
         /** @example c:/path/to */
         const parentGoodPath = docPath.substring(1, docPath.lastIndexOf('/'));
-        const expandedPath = includeMatch[1]
+        const expandedPath = includedFile
             .trim()
             .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
             .replace(/(%A_LineFile%)/, docPath);
@@ -121,3 +118,11 @@ export class DefProvider implements vscode.DefinitionProvider {
             : undefined;
     }
 }
+
+/**
+ * @example includedFilename('#include , a b.ahk') === 'a b.ahk'
+ * @example includedFilename('#include path/to/file.ahk') === 'path/to/file.ahk'
+ * @example includedFilename('include , a b.ahk') === undefined
+ */
+export const includedFilename = (line: string): string | undefined =>
+    line.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];

From b0603a62a3af16e87d72fdb08dc74f4a1606a488 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Tue, 29 Oct 2024 21:26:59 -0700
Subject: [PATCH 16/24] Add unit tests for regex

---
 .vscode/dev.code-snippets               |  2 +-
 src/providers/defProvider.ts            |  9 +--------
 src/providers/defProvider.utils.test.ts | 27 +++++++++++++++++++++++++
 src/providers/defProvider.utils.ts      |  7 +++++++
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 src/providers/defProvider.utils.test.ts
 create mode 100644 src/providers/defProvider.utils.ts

diff --git a/.vscode/dev.code-snippets b/.vscode/dev.code-snippets
index 8f5f4a8a..60841d9e 100644
--- a/.vscode/dev.code-snippets
+++ b/.vscode/dev.code-snippets
@@ -26,7 +26,7 @@
             "        name: string,",
             "        args: Parameters<typeof $1>,",
             "        expected: ReturnType<typeof $1>,",
-            "    ][] = [$0];",
+            "    ][] = [[$0]];",
 
             "    tests.forEach(([name, args, expected]) =>",
             "        test(name, () => assert.strictEqual($1(...args), expected)),",
diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index dbe4c725..1380a15c 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
 import { join } from 'path';
+import { includedFilename } from './defProvider.utils';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -118,11 +119,3 @@ export class DefProvider implements vscode.DefinitionProvider {
             : undefined;
     }
 }
-
-/**
- * @example includedFilename('#include , a b.ahk') === 'a b.ahk'
- * @example includedFilename('#include path/to/file.ahk') === 'path/to/file.ahk'
- * @example includedFilename('include , a b.ahk') === undefined
- */
-export const includedFilename = (line: string): string | undefined =>
-    line.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];
diff --git a/src/providers/defProvider.utils.test.ts b/src/providers/defProvider.utils.test.ts
new file mode 100644
index 00000000..dcb5537f
--- /dev/null
+++ b/src/providers/defProvider.utils.test.ts
@@ -0,0 +1,27 @@
+import { suite, test } from 'mocha';
+import assert from 'assert';
+import { includedFilename } from './defProvider.utils';
+
+suite('includedFilename', () => {
+    const tests: [
+        name: string,
+        args: Parameters<typeof includedFilename>,
+        expected: ReturnType<typeof includedFilename>,
+    ][] = [
+        ['comma', ['#include , a b.ahk'], 'a b.ahk'],
+        ['no hash', ['include , a b.ahk'], undefined],
+        [
+            'no comma nor extra space',
+            ['#include path/to/file.ahk'],
+            'path/to/file.ahk',
+        ],
+        ['ah1', ['#include a.ah1'], 'a.ah1'],
+        ['ahk1', ['#include a.ahk1'], 'a.ahk1'],
+        ['ext', ['#include a.ext'], 'a.ext'],
+    ];
+    tests.forEach(([name, args, expected]) =>
+        test(name, () =>
+            assert.strictEqual(includedFilename(...args), expected),
+        ),
+    );
+});
diff --git a/src/providers/defProvider.utils.ts b/src/providers/defProvider.utils.ts
new file mode 100644
index 00000000..c0cf05bf
--- /dev/null
+++ b/src/providers/defProvider.utils.ts
@@ -0,0 +1,7 @@
+/**
+ * @example includedFilename('#include , a b.ahk') === 'a b.ahk'
+ * @example includedFilename('#include path/to/file.ahk') === 'path/to/file.ahk'
+ * @example includedFilename('include , a b.ahk') === undefined
+ */
+export const includedFilename = (line: string): string | undefined =>
+    line.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];

From 830a9352caeac1f10d236471b27625a1d2637c43 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 21:40:20 -0700
Subject: [PATCH 17/24] Change includedFilename to includedPath

---
 src/providers/defProvider.ts            | 14 +++++++-------
 src/providers/defProvider.utils.test.ts | 12 +++++-------
 src/providers/defProvider.utils.ts      | 10 ++++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 1380a15c..e1bc7a70 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { includedFilename } from './defProvider.utils';
+import { includedPath } from './defProvider.utils';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -97,19 +97,19 @@ export class DefProvider implements vscode.DefinitionProvider {
         document: vscode.TextDocument,
         position: vscode.Position,
     ): Promise<vscode.Location> | undefined {
-        /** @example /c:/path/to/file.ahk */
+        /** @example '/c:/path/to/file.ahk' */
         const docPath = document.uri.path;
         const { text } = document.lineAt(position.line);
-        const includedFile = includedFilename(text);
-        if (!includedFile) return;
+        const includedStr = includedPath(text);
+        if (!includedStr) return;
 
-        /** @example c:/path/to */
+        /** @example 'c:/path/to' */
         const parentGoodPath = docPath.substring(1, docPath.lastIndexOf('/'));
-        const expandedPath = includedFile
+        const expandedPath = includedStr
             .trim()
             .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
             .replace(/(%A_LineFile%)/, docPath);
-        /** @example c:/path/to/included.ahk */
+        /** @example 'c:/path/to/included.ahk' */
         const resolvedPath = join(parentGoodPath, expandedPath);
         return existsSync(resolvedPath)
             ? new vscode.Location(
diff --git a/src/providers/defProvider.utils.test.ts b/src/providers/defProvider.utils.test.ts
index dcb5537f..613dcc7e 100644
--- a/src/providers/defProvider.utils.test.ts
+++ b/src/providers/defProvider.utils.test.ts
@@ -1,12 +1,12 @@
 import { suite, test } from 'mocha';
 import assert from 'assert';
-import { includedFilename } from './defProvider.utils';
+import { includedPath } from './defProvider.utils';
 
-suite('includedFilename', () => {
+suite('includedPath', () => {
     const tests: [
         name: string,
-        args: Parameters<typeof includedFilename>,
-        expected: ReturnType<typeof includedFilename>,
+        args: Parameters<typeof includedPath>,
+        expected: ReturnType<typeof includedPath>,
     ][] = [
         ['comma', ['#include , a b.ahk'], 'a b.ahk'],
         ['no hash', ['include , a b.ahk'], undefined],
@@ -20,8 +20,6 @@ suite('includedFilename', () => {
         ['ext', ['#include a.ext'], 'a.ext'],
     ];
     tests.forEach(([name, args, expected]) =>
-        test(name, () =>
-            assert.strictEqual(includedFilename(...args), expected),
-        ),
+        test(name, () => assert.strictEqual(includedPath(...args), expected)),
     );
 });
diff --git a/src/providers/defProvider.utils.ts b/src/providers/defProvider.utils.ts
index c0cf05bf..90947f09 100644
--- a/src/providers/defProvider.utils.ts
+++ b/src/providers/defProvider.utils.ts
@@ -1,7 +1,9 @@
 /**
- * @example includedFilename('#include , a b.ahk') === 'a b.ahk'
- * @example includedFilename('#include path/to/file.ahk') === 'path/to/file.ahk'
- * @example includedFilename('include , a b.ahk') === undefined
+ * Returns the string after the #include
+ * @example
+ * includedPath('#include , a b.ahk') === 'a b.ahk'
+ * includedPath('#include path/to/file.ahk') === 'path/to/file.ahk'
+ * includedPath('include , a b.ahk') === undefined
  */
-export const includedFilename = (line: string): string | undefined =>
+export const includedPath = (line: string): string | undefined =>
     line.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];

From a7b201f8bbf48a630dd15f9d44ea976aefd54f19 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 22:35:56 -0700
Subject: [PATCH 18/24] update ahk2

---
 ahk2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ahk2 b/ahk2
index 16c0722e..fe8d5c83 160000
--- a/ahk2
+++ b/ahk2
@@ -1 +1 @@
-Subproject commit 16c0722e2d176da1cacc976c823c8df139e1af50
+Subproject commit fe8d5c8387fe5df2ee7067842f81f6638017bee9

From 23c7b667b9dddb0b6b2a4e17eba1a197b1f4cad3 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 22:36:11 -0700
Subject: [PATCH 19/24] Update code snippets for func name in suite name

---
 .vscode/dev.code-snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/dev.code-snippets b/.vscode/dev.code-snippets
index 60841d9e..a62abe73 100644
--- a/.vscode/dev.code-snippets
+++ b/.vscode/dev.code-snippets
@@ -21,7 +21,7 @@
         "scope": "javascript,typescript",
         "prefix": "suite",
         "body": [
-            "suite('$1', () => {",
+            "suite($1.name, () => {",
             "    const tests: [",
             "        name: string,",
             "        args: Parameters<typeof $1>,",

From d1031b1b7dc08af5db750ef26cffa4dbdb2fa371 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 22:36:22 -0700
Subject: [PATCH 20/24] Use more utils

---
 src/providers/defProvider.ts            | 15 ++++--------
 src/providers/defProvider.utils.test.ts | 25 +++++++++++++++----
 src/providers/defProvider.utils.ts      | 32 +++++++++++++++++++++----
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index e1bc7a70..b9d24b51 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -1,8 +1,7 @@
 import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
 import { existsSync } from 'fs';
-import { join } from 'path';
-import { includedPath } from './defProvider.utils';
+import { getIncludedPath, resolvePath } from './defProvider.utils';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
@@ -100,17 +99,11 @@ export class DefProvider implements vscode.DefinitionProvider {
         /** @example '/c:/path/to/file.ahk' */
         const docPath = document.uri.path;
         const { text } = document.lineAt(position.line);
-        const includedStr = includedPath(text);
-        if (!includedStr) return;
+        const includedPath = getIncludedPath(text);
+        if (!includedPath) return;
 
-        /** @example 'c:/path/to' */
-        const parentGoodPath = docPath.substring(1, docPath.lastIndexOf('/'));
-        const expandedPath = includedStr
-            .trim()
-            .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
-            .replace(/(%A_LineFile%)/, docPath);
         /** @example 'c:/path/to/included.ahk' */
-        const resolvedPath = join(parentGoodPath, expandedPath);
+        const resolvedPath = resolvePath(docPath, includedPath);
         return existsSync(resolvedPath)
             ? new vscode.Location(
                   vscode.Uri.file(resolvedPath),
diff --git a/src/providers/defProvider.utils.test.ts b/src/providers/defProvider.utils.test.ts
index 613dcc7e..24bc4409 100644
--- a/src/providers/defProvider.utils.test.ts
+++ b/src/providers/defProvider.utils.test.ts
@@ -1,12 +1,12 @@
 import { suite, test } from 'mocha';
 import assert from 'assert';
-import { includedPath } from './defProvider.utils';
+import { getIncludedPath, resolvePath } from './defProvider.utils';
 
-suite('includedPath', () => {
+suite(getIncludedPath.name, () => {
     const tests: [
         name: string,
-        args: Parameters<typeof includedPath>,
-        expected: ReturnType<typeof includedPath>,
+        args: Parameters<typeof getIncludedPath>,
+        expected: ReturnType<typeof getIncludedPath>,
     ][] = [
         ['comma', ['#include , a b.ahk'], 'a b.ahk'],
         ['no hash', ['include , a b.ahk'], undefined],
@@ -20,6 +20,21 @@ suite('includedPath', () => {
         ['ext', ['#include a.ext'], 'a.ext'],
     ];
     tests.forEach(([name, args, expected]) =>
-        test(name, () => assert.strictEqual(includedPath(...args), expected)),
+        test(name, () =>
+            assert.strictEqual(getIncludedPath(...args), expected),
+        ),
+    );
+});
+
+suite(resolvePath.name, () => {
+    const tests: [
+        name: string,
+        args: Parameters<typeof resolvePath>,
+        expected: ReturnType<typeof resolvePath>,
+    ][] = [
+        ['relative file', ['/c:/users/main.ahk', 'a.ahk'], 'c:\\users\\a.ahk'],
+    ];
+    tests.forEach(([name, args, expected]) =>
+        test(name, () => assert.strictEqual(resolvePath(...args), expected)),
     );
 });
diff --git a/src/providers/defProvider.utils.ts b/src/providers/defProvider.utils.ts
index 90947f09..7fe7731d 100644
--- a/src/providers/defProvider.utils.ts
+++ b/src/providers/defProvider.utils.ts
@@ -1,9 +1,31 @@
+import { join } from 'path';
+
 /**
  * Returns the string after the #include
  * @example
- * includedPath('#include , a b.ahk') === 'a b.ahk'
- * includedPath('#include path/to/file.ahk') === 'path/to/file.ahk'
- * includedPath('include , a b.ahk') === undefined
+ * getIncludedPath('#include , a b.ahk') === 'a b.ahk'
+ * getIncludedPath('#include path/to/file.ahk') === 'path/to/file.ahk'
+ * getIncludedPath('include , a b.ahk') === undefined
  */
-export const includedPath = (line: string): string | undefined =>
-    line.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];
+export const getIncludedPath = (ahkLine: string): string | undefined =>
+    ahkLine.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];
+
+export const resolvePath = (
+    /**
+     * The path of the current script, namely `vscode.document.uri.path`:
+     * @example '/c:/path/to/file.ahk'
+     */
+    basePath: string,
+    /** Extracted string from `getIncludedPath` */
+    includedPath: string,
+): string | undefined => {
+    /** @example 'c:/path/to' */
+    const parentGoodPath = basePath.substring(1, basePath.lastIndexOf('/'));
+    const expandedPath = includedPath
+        .trim()
+        .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
+        .replace(/(%A_LineFile%)/, basePath);
+    /** @example 'c:/path/to/included.ahk' */
+    const resolvedPath = join(parentGoodPath, expandedPath);
+    return resolvedPath;
+};

From d5ce4c67df632a74578f5dd1f2e111bccea45d70 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 23:03:07 -0700
Subject: [PATCH 21/24] Support directories and absolute paths

---
 src/providers/defProvider.ts            | 57 ++++++++++++++-----------
 src/providers/defProvider.utils.test.ts |  8 +++-
 src/providers/defProvider.utils.ts      | 29 ++++++++++---
 3 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index b9d24b51..0afdc22a 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -1,14 +1,15 @@
 import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
-import { existsSync } from 'fs';
 import { getIncludedPath, resolvePath } from './defProvider.utils';
+import { Out } from 'src/common/out';
+import { stat } from 'fs/promises';
 
 export class DefProvider implements vscode.DefinitionProvider {
     public async provideDefinition(
         document: vscode.TextDocument,
         position: vscode.Position,
     ): Promise<vscode.Location | vscode.Location[] | vscode.LocationLink[]> {
-        const fileLink = await this.tryGetFileLink(document, position);
+        const fileLink = await tryGetFileLink(document, position);
         if (fileLink) {
             return fileLink;
         }
@@ -85,30 +86,34 @@ export class DefProvider implements vscode.DefinitionProvider {
 
         return null;
     }
+}
 
-    /**
-     * If the position is on an `#Include` line,
-     * returns a Location at the beginning of the included file.
-     * Otherwise returns undefined.
-     ** Only works with relative paths.
-     */
-    async tryGetFileLink(
-        document: vscode.TextDocument,
-        position: vscode.Position,
-    ): Promise<vscode.Location> | undefined {
-        /** @example '/c:/path/to/file.ahk' */
-        const docPath = document.uri.path;
-        const { text } = document.lineAt(position.line);
-        const includedPath = getIncludedPath(text);
-        if (!includedPath) return;
+//* Utilities requiring the vscode API
 
-        /** @example 'c:/path/to/included.ahk' */
-        const resolvedPath = resolvePath(docPath, includedPath);
-        return existsSync(resolvedPath)
-            ? new vscode.Location(
-                  vscode.Uri.file(resolvedPath),
-                  new vscode.Position(0, 0),
-              )
-            : undefined;
-    }
+/**
+ * If the position is on an `#Include` line,
+ * returns a Location at the beginning of the included file.
+ * Otherwise returns undefined.
+ ** Currently only works with relative paths.
+ */
+async function tryGetFileLink(
+    document: vscode.TextDocument,
+    position: vscode.Position,
+): Promise<vscode.Location> | undefined {
+    /** @example '/c:/path/to/file.ahk' */
+    const docPath = document.uri.path;
+    const { text } = document.lineAt(position.line);
+    const includedPath = getIncludedPath(text);
+    if (!includedPath) return;
+
+    /** @example 'c:/path/to/included.ahk' */
+    const resolvedPath = resolvePath(docPath, includedPath);
+    Out.debug(`resolvedPath: ${resolvedPath}`);
+    const fsStat = await stat(resolvedPath);
+    return fsStat.isFile()
+        ? new vscode.Location(
+              vscode.Uri.file(resolvedPath),
+              new vscode.Position(0, 0),
+          )
+        : undefined;
 }
diff --git a/src/providers/defProvider.utils.test.ts b/src/providers/defProvider.utils.test.ts
index 24bc4409..2d894016 100644
--- a/src/providers/defProvider.utils.test.ts
+++ b/src/providers/defProvider.utils.test.ts
@@ -18,6 +18,9 @@ suite(getIncludedPath.name, () => {
         ['ah1', ['#include a.ah1'], 'a.ah1'],
         ['ahk1', ['#include a.ahk1'], 'a.ahk1'],
         ['ext', ['#include a.ext'], 'a.ext'],
+        ['preceding whitespace', ['   #include a.ahk'], 'a.ahk'],
+        ['directory', ['#include a'], 'a'],
+        ['non-whitespace preceding char', [';#include a'], undefined],
     ];
     tests.forEach(([name, args, expected]) =>
         test(name, () =>
@@ -32,7 +35,10 @@ suite(resolvePath.name, () => {
         args: Parameters<typeof resolvePath>,
         expected: ReturnType<typeof resolvePath>,
     ][] = [
-        ['relative file', ['/c:/users/main.ahk', 'a.ahk'], 'c:\\users\\a.ahk'],
+        ['relative file', ['/c:/main.ahk', 'a.ahk'], 'c:\\a.ahk'],
+        ['absolute file', ['/c:/users/main.ahk', 'd:/b.ahk'], 'd:\\b.ahk'],
+        ['with single dot', ['/c:/main.ahk', './c.ahk'], 'c:\\c.ahk'],
+        ['with double dot', ['/c:/users/main.ahk', '../d.ahk'], 'c:\\d.ahk'],
     ];
     tests.forEach(([name, args, expected]) =>
         test(name, () => assert.strictEqual(resolvePath(...args), expected)),
diff --git a/src/providers/defProvider.utils.ts b/src/providers/defProvider.utils.ts
index 7fe7731d..4bf7a183 100644
--- a/src/providers/defProvider.utils.ts
+++ b/src/providers/defProvider.utils.ts
@@ -1,15 +1,32 @@
-import { join } from 'path';
+//* Utilities not requiring the vscode API
+
+import { join, normalize } from 'path';
 
 /**
- * Returns the string after the #include
+ * Returns the string after the `#include`.
+ * Only works for actual `#include` directives, not comments or strings containing `#include`
  * @example
  * getIncludedPath('#include , a b.ahk') === 'a b.ahk'
- * getIncludedPath('#include path/to/file.ahk') === 'path/to/file.ahk'
- * getIncludedPath('include , a b.ahk') === undefined
+ * getIncludedPath('  #include path/to/file.ahk') === 'path/to/file.ahk'
+ * getIncludedPath('include , a b.ahk') === undefined // no `#`
+ * getIncludedPath('; #include , a b.ahk') === undefined
+ * getIncludedPath('x := % "#include , a b.ahk"') === undefined
  */
 export const getIncludedPath = (ahkLine: string): string | undefined =>
-    ahkLine.match(/#include\s*,?\s*(.+?\.(ahk|ahk1|ah1|ext))\b/i)?.[1];
+    ahkLine.match(/^\s*#include\s*,?\s*(.+)/i)?.[1];
 
+/**
+ * Resolves the path of a file included by a #include directive
+ *
+ * @param basePath
+ * The path to include from, usually the script's path.
+ *
+ * This may be a different path if the including script has a preceding `#include dir`
+ *
+ * @param includedPath The path that's included in the `#include` directive
+ *
+ * @returns The path of the file to include
+ */
 export const resolvePath = (
     /**
      * The path of the current script, namely `vscode.document.uri.path`:
@@ -25,6 +42,8 @@ export const resolvePath = (
         .trim()
         .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
         .replace(/(%A_LineFile%)/, basePath);
+
+    if (includedPath.includes(':')) return normalize(includedPath);
     /** @example 'c:/path/to/included.ahk' */
     const resolvedPath = join(parentGoodPath, expandedPath);
     return resolvedPath;

From 526be97f6c49b554416f07bf4eec127d6ba731cd Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 23:25:38 -0700
Subject: [PATCH 22/24] Clarify hovering

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 4f69cbcd..428e6dee 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,7 @@
 
 ### New features
 
--   Hovering over an included filename now provides a link to that document in your IDE
+-   Hovering over a filename in an `#include` directive now provides a link to that document in your IDE
 
 ## 6.3.0 - 2024-10-19 🕳️
 

From 387031f1ae41d02fe7c96820e94ae9ef22887ad3 Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Wed, 30 Oct 2024 23:35:37 -0700
Subject: [PATCH 23/24] Ignore comments in getIncludedPath

---
 src/providers/defProvider.ts            | 15 ++++---
 src/providers/defProvider.utils.test.ts | 21 ++++++---
 src/providers/defProvider.utils.ts      | 57 ++++++++++++++++---------
 3 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/src/providers/defProvider.ts b/src/providers/defProvider.ts
index 0afdc22a..1af0bef9 100644
--- a/src/providers/defProvider.ts
+++ b/src/providers/defProvider.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import { Parser } from '../parser/parser';
-import { getIncludedPath, resolvePath } from './defProvider.utils';
+import { resolveIncludedPath } from './defProvider.utils';
 import { Out } from 'src/common/out';
 import { stat } from 'fs/promises';
 
@@ -91,10 +91,14 @@ export class DefProvider implements vscode.DefinitionProvider {
 //* Utilities requiring the vscode API
 
 /**
- * If the position is on an `#Include` line,
+ * If the position is on an `#Include` line
+ * and the included path is an existing file,
  * returns a Location at the beginning of the included file.
+ *
  * Otherwise returns undefined.
- ** Currently only works with relative paths.
+ *
+ ** Currently assumes the working directory is the script path and
+ * does not respect previous `#include dir` directives
  */
 async function tryGetFileLink(
     document: vscode.TextDocument,
@@ -103,11 +107,8 @@ async function tryGetFileLink(
     /** @example '/c:/path/to/file.ahk' */
     const docPath = document.uri.path;
     const { text } = document.lineAt(position.line);
-    const includedPath = getIncludedPath(text);
-    if (!includedPath) return;
-
     /** @example 'c:/path/to/included.ahk' */
-    const resolvedPath = resolvePath(docPath, includedPath);
+    const resolvedPath = resolveIncludedPath(docPath, text);
     Out.debug(`resolvedPath: ${resolvedPath}`);
     const fsStat = await stat(resolvedPath);
     return fsStat.isFile()
diff --git a/src/providers/defProvider.utils.test.ts b/src/providers/defProvider.utils.test.ts
index 2d894016..44215954 100644
--- a/src/providers/defProvider.utils.test.ts
+++ b/src/providers/defProvider.utils.test.ts
@@ -1,6 +1,6 @@
 import { suite, test } from 'mocha';
 import assert from 'assert';
-import { getIncludedPath, resolvePath } from './defProvider.utils';
+import { getIncludedPath, resolveIncludedPath } from './defProvider.utils';
 
 suite(getIncludedPath.name, () => {
     const tests: [
@@ -21,6 +21,12 @@ suite(getIncludedPath.name, () => {
         ['preceding whitespace', ['   #include a.ahk'], 'a.ahk'],
         ['directory', ['#include a'], 'a'],
         ['non-whitespace preceding char', [';#include a'], undefined],
+        ['escaped `;` with whitespace', ['#include a `;b.ahk'], 'a `;b.ahk'],
+        ['escaped `;` without whitespace', ['#include a`;b.ahk'], 'a`;b.ahk'],
+        ['unescaped `;` without whitespace', ['#include a;b.ahk'], 'a;b.ahk'],
+        ['unescaped `;` with whitespace', ['#include a ;b.ahk'], 'a'],
+        ['unescaped valid `%`', ['#include %A_ScriptDir%'], '%A_ScriptDir%'],
+        ['unescaped `<` and `>`', ['#include <foo>'], '<foo>'],
     ];
     tests.forEach(([name, args, expected]) =>
         test(name, () =>
@@ -29,11 +35,11 @@ suite(getIncludedPath.name, () => {
     );
 });
 
-suite(resolvePath.name, () => {
+suite(resolveIncludedPath.name, () => {
     const tests: [
         name: string,
-        args: Parameters<typeof resolvePath>,
-        expected: ReturnType<typeof resolvePath>,
+        args: Parameters<typeof resolveIncludedPath>,
+        expected: ReturnType<typeof resolveIncludedPath>,
     ][] = [
         ['relative file', ['/c:/main.ahk', 'a.ahk'], 'c:\\a.ahk'],
         ['absolute file', ['/c:/users/main.ahk', 'd:/b.ahk'], 'd:\\b.ahk'],
@@ -41,6 +47,11 @@ suite(resolvePath.name, () => {
         ['with double dot', ['/c:/users/main.ahk', '../d.ahk'], 'c:\\d.ahk'],
     ];
     tests.forEach(([name, args, expected]) =>
-        test(name, () => assert.strictEqual(resolvePath(...args), expected)),
+        test(name, () =>
+            assert.strictEqual(
+                resolveIncludedPath(args[0], `#include ${args[1]}`),
+                expected,
+            ),
+        ),
     );
 });
diff --git a/src/providers/defProvider.utils.ts b/src/providers/defProvider.utils.ts
index 4bf7a183..f657caaa 100644
--- a/src/providers/defProvider.utils.ts
+++ b/src/providers/defProvider.utils.ts
@@ -1,22 +1,42 @@
 //* Utilities not requiring the vscode API
 
-import { join, normalize } from 'path';
+import { isAbsolute, join, normalize } from 'path';
 
 /**
- * Returns the string after the `#include`.
- * Only works for actual `#include` directives, not comments or strings containing `#include`
+ ** Returns the string representing the included path after the `#include`.
+ ** Only works for actual `#include` directives, not comments or strings containing `#include`.
+ ** Does not resolve or normalize the included path.
  * @example
  * getIncludedPath('#include , a b.ahk') === 'a b.ahk'
  * getIncludedPath('  #include path/to/file.ahk') === 'path/to/file.ahk'
  * getIncludedPath('include , a b.ahk') === undefined // no `#`
  * getIncludedPath('; #include , a b.ahk') === undefined
  * getIncludedPath('x := % "#include , a b.ahk"') === undefined
+ * getIncludedPath('#include a') === 'a'
+ * getIncludedPath('#include %A_ScriptDir%') === '%A_ScriptDir%'
+ * getIncludedPath('#include <myLib>') === '<myLib>'
+ * getIncludedPath('#include semi-colon ;and-more.ahk') === 'semi-colon'
+ * getIncludedPath('#include semi-colon`;and-more.ahk') === 'semi-colon`;and-more.ahk'
  */
 export const getIncludedPath = (ahkLine: string): string | undefined =>
-    ahkLine.match(/^\s*#include\s*,?\s*(.+)/i)?.[1];
+    ahkLine.match(/^\s*#include\s*,?\s*(.+?)( ;.*)?$/i)?.[1];
+
+const normalizeIncludedPath = (
+    includedPath: string,
+    basePath: string,
+    parentGoodPath: string,
+): string =>
+    normalize(
+        includedPath
+            .trim()
+            .replace(/`;/g, ';') // only semi-colons are escaped
+            .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
+            .replace(/(%A_LineFile%)/, basePath),
+    );
 
 /**
- * Resolves the path of a file included by a #include directive
+ * Returns the absolute, normalized path included by a #include directive.
+ * Does not check if that path is a to a folder, or if that path exists.
  *
  * @param basePath
  * The path to include from, usually the script's path.
@@ -24,27 +44,26 @@ export const getIncludedPath = (ahkLine: string): string | undefined =>
  * This may be a different path if the including script has a preceding `#include dir`
  *
  * @param includedPath The path that's included in the `#include` directive
- *
- * @returns The path of the file to include
  */
-export const resolvePath = (
+export const resolveIncludedPath = (
     /**
      * The path of the current script, namely `vscode.document.uri.path`:
      * @example '/c:/path/to/file.ahk'
      */
     basePath: string,
-    /** Extracted string from `getIncludedPath` */
-    includedPath: string,
+    /** Line of text from the including script. */
+    ahkLine: string,
 ): string | undefined => {
+    const includedPath = getIncludedPath(ahkLine);
     /** @example 'c:/path/to' */
     const parentGoodPath = basePath.substring(1, basePath.lastIndexOf('/'));
-    const expandedPath = includedPath
-        .trim()
-        .replace(/(%A_ScriptDir%|%A_WorkingDir%)/, parentGoodPath)
-        .replace(/(%A_LineFile%)/, basePath);
-
-    if (includedPath.includes(':')) return normalize(includedPath);
-    /** @example 'c:/path/to/included.ahk' */
-    const resolvedPath = join(parentGoodPath, expandedPath);
-    return resolvedPath;
+    const normalizedPath = normalizeIncludedPath(
+        includedPath,
+        basePath,
+        parentGoodPath,
+    );
+    const absolutePath = isAbsolute(includedPath)
+        ? normalize(includedPath)
+        : join(parentGoodPath, normalizedPath);
+    return absolutePath;
 };

From 64cd15cf9a5880681090c0998d10d8c546ec9eab Mon Sep 17 00:00:00 2001
From: Mark Wiemer <markwiemer@outlook.com>
Date: Sat, 2 Nov 2024 06:51:35 -0700
Subject: [PATCH 24/24] Use ahk2 main

---
 ahk2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ahk2 b/ahk2
index fe8d5c83..22d94d87 160000
--- a/ahk2
+++ b/ahk2
@@ -1 +1 @@
-Subproject commit fe8d5c8387fe5df2ee7067842f81f6638017bee9
+Subproject commit 22d94d87c46270b6729f18ef3350a7605c700842