From 718c76e3de2da394d3a1ed726bab61f7abf1059e Mon Sep 17 00:00:00 2001
From: kyklish <kyklish@gmail.com>
Date: Tue, 14 May 2024 14:16:06 +0300
Subject: [PATCH] fix indent for single-line hotkey in fall-through scenario

---
 src/providers/format.test.ts                  |  1 +
 src/providers/formattingProvider.ts           | 35 +++++++++++++------
 .../samples/429-single-line-hotkey.in.ahk     | 16 +++++++++
 .../samples/429-single-line-hotkey.out.ahk    | 16 +++++++++
 4 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 src/providers/samples/429-single-line-hotkey.in.ahk
 create mode 100644 src/providers/samples/429-single-line-hotkey.out.ahk

diff --git a/src/providers/format.test.ts b/src/providers/format.test.ts
index 539f6bdb..e60f2716 100644
--- a/src/providers/format.test.ts
+++ b/src/providers/format.test.ts
@@ -69,6 +69,7 @@ const formatTests: FormatTest[] = [
     { filenameRoot: '290-ifmsgbox' },
     { filenameRoot: '291-single-line-comment' },
     { filenameRoot: '316-if-object-continuation-section' },
+    { filenameRoot: '429-single-line-hotkey' },
     { filenameRoot: 'ahk-explorer' },
     { filenameRoot: 'align-assignment' },
     { filenameRoot: 'demo' },
diff --git a/src/providers/formattingProvider.ts b/src/providers/formattingProvider.ts
index 31ca8927..2a03bbfa 100644
--- a/src/providers/formattingProvider.ts
+++ b/src/providers/formattingProvider.ts
@@ -38,8 +38,8 @@ export const internalFormat = (
     /** Level of indentation on previous line */
     let prevLineDepth = 0;
     /**
-     * It's marker for `Return`, `ExitApp`, `#Directive` commands, which
-     * allow/disallow for them to be un-indented.
+     * It's marker for `Return`, `ExitApp`, `#Directive` commands and `Labels`,
+     * which allow/disallow for them to be un-indented.
      *
      * -------------------------------------------------------------------------
      * `tagDepth === 0`:
@@ -59,15 +59,15 @@ export const internalFormat = (
      *    Current indentation level is in sync with `Label` indentation level
      *    (no additional indent added by block `{}`, `oneCommandCode`, etc...).
      *
-     *    `Return` or `ExitApp` commands allowed to be un-indented, so they will
-     *    be placed on same indentation level as `Label`.
+     *    `Return`, `ExitApp`, `Fall-Through Label` allowed to be un-indented,
+     *     so they will be placed on same indentation level as `Label`.
      *
      *    `Label` allowed to be un-indented for fall-through scenario.
      *
      * -------------------------------------------------------------------------
      * `tagDepth !== depth`:
      *
-     *    `Return` or `ExitApp` commands disallowed to be un-indented, so they
+     *    `Return`, `ExitApp`, `Label` disallowed to be un-indented, so they
      *    will obey indentation rules as code above them (`Return` inside
      *    function, block `{}`, `oneCommandCode`, etc... stay on same
      *    indentation level as code above them).
@@ -83,8 +83,8 @@ export const internalFormat = (
      *
      *    Only `Label` makes syncing `tagDepth` with `depth`.
      *
-     *    `Case:` and `Default:` must not make syncing to disallow `Return` and
-     *    `ExitApp` un-indent inside `Switch-Case` block.
+     *    `Case:` and `Default:` must not make syncing to disallow `Return`,
+     *    `ExitApp` and `Label` to un-indent inside `Switch-Case` block.
      */
     let tagDepth = 0;
 
@@ -293,11 +293,17 @@ export const internalFormat = (
      */
     const label = /^[^\s\t,`]+(?<!:):$/;
     /**
-     * Hotkey and hotstring without code after it.
+     * Hotkey or hotstring without code after it.
      *
      * Example: `F1 & F2 Up::` (hotkey), `::btw::` (hotstring)
      */
     const hotkey = /^.+::$/;
+    /**
+     * Hotkey or hotstring with code on same line.
+     *
+     * Example: `#n::Run Notepad` (hotkey), `::btw::by the way` (hotstring)
+     */
+    const hotkeySingleLine = /^.+::/;
     /**
      * `#Directive`, that will create context-sensitive hotkeys and hotstrings.
      * Example of `#Directives`:
@@ -716,7 +722,11 @@ export const internalFormat = (
         if (purifiedLine.match(switchCaseDefault)) {
             // Case: or Default:
             depth--;
-        } else if (purifiedLine.match(label) || purifiedLine.match(hotkey)) {
+        } else if (
+            purifiedLine.match(label) ||
+            purifiedLine.match(hotkey) ||
+            purifiedLine.match(hotkeySingleLine)
+        ) {
             if (indentCodeAfterLabel) {
                 // Label: or Hotkey::
                 // De-indent label or hotkey, if they not end with 'return'
@@ -727,8 +737,11 @@ export const internalFormat = (
                 // Label2: <-- de-indent
                 //     code
                 // return
-                // No need to make 'tagDepth' in sync with 'depth', 'Label'
-                // check for next line will do it.
+                // De-indent single-line hotkey, after label.
+                // This is fall-through scenario. Example:
+                // F1::
+                // F2:: <-- de-indent
+                // F3:: foo() <-- de-indent
                 if (tagDepth === depth) {
                     depth--;
                 }
diff --git a/src/providers/samples/429-single-line-hotkey.in.ahk b/src/providers/samples/429-single-line-hotkey.in.ahk
new file mode 100644
index 00000000..f808fc36
--- /dev/null
+++ b/src/providers/samples/429-single-line-hotkey.in.ahk
@@ -0,0 +1,16 @@
+; [Issue #429](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues/429)
+#IfWinActive, WinTitle
+F1::
+F2::
+code
+return
+
+F1::
+F2:: foo()
+F3:: bar()
+
+F1::
+code
+F2:: foo()
+F3:: bar()
+#If
diff --git a/src/providers/samples/429-single-line-hotkey.out.ahk b/src/providers/samples/429-single-line-hotkey.out.ahk
new file mode 100644
index 00000000..124f23bc
--- /dev/null
+++ b/src/providers/samples/429-single-line-hotkey.out.ahk
@@ -0,0 +1,16 @@
+; [Issue #429](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues/429)
+#IfWinActive, WinTitle
+    F1::
+    F2::
+        code
+    return
+
+    F1::
+    F2:: foo()
+    F3:: bar()
+
+    F1::
+        code
+    F2:: foo()
+    F3:: bar()
+#If