Merge branch '#275&#288' into develop

.huskyrc.js

@@ -1,5 +1,5 @@
 module.exports = {
   'hooks': {
-    'pre-commit': 'npm run lint',
+    'pre-commit': 'npm run lint && npm run test',
   },
 };

CHANGELOG.md

@@ -36,6 +36,8 @@ Also want to check the development status, check the [commit history](https://gi
 * [#261](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/261) Support the expression in watch expression
 * [#269](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/269) Support the expression evaluate in debug console
 * [#270](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/270) Support expression in log point
+* [#275](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/275) Change the syntax of debug directive
+* [#288](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/288) Change the labelling process when outputting objects to the log
 
 ### Fixed
 * [#207](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/207) Attach fails if file path contains multibyte strings

README.md

@@ -28,6 +28,9 @@ This extension is a debugger adapter for [VSCode](https://code.visualstudio.com/
     * Changed: [#261](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/261) Support the expression in watch expression
     * Changed: [#269](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/269) Support the expression evaluate in debug console
     * Changed: [#270](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/270) Support expression in log point
+    * Changed: [#275](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/275) Change the syntax of debug directive
+    * Changed: [#288](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/288) Change the labelling process when outputting objects to the log
+
     * Fixed: [#207](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/207) Attach fails if file path contains multibyte strings
     * Fixed: [#212](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/212) Some errors were not detected and raw error messages were output. This caused `useAutoJumpToError` to not work in some cases
     * Fixed: [#215](https://github.com/zero-plusplus/vscode-autohotkey-debug/issues/215) The list of running AutoHotkey processes displayed before attaching does not display correctly when it contains multibyte strings

demo/demo-debugdirective.ahk

@@ -0,0 +1,21 @@
+str := "abc"
+
+label := "obj"
+obj := { key: "value" }
+arr := [ 1, str, obj ]
+
+; @Debug-Output => {str}
+; @Debug-Output => {label}{obj}{arr}{:break:}
+a := ""
+
+; @Debug-Output => {:clear:}{:start:}A
+; @Debug-Output => {:startCollapsed:}B
+; @Debug-Output => C-1
+; @Debug-Output => C-2
+; @Debug-Output => {:end:}{:end:}
+; @Debug-Output => {:break:}
+b := ""
+
+; @Debug-ClearConsole
+; @Debug-Breakpoint => cleard console!
+return

demo/demo-debugdirective.ahk2

@@ -0,0 +1,22 @@
+str := "abc"
+
+label := "obj"
+obj := { key: "value" }
+arr := [ 1, str, obj ]
+
+; @Debug-Output => {str}
+; @Debug-Output => {label}{obj}{arr}{:break:}
+a := ""
+
+; @Debug-Output => {:clear:}{:start:}A
+; @Debug-Output => {:startCollapsed:}B
+; @Debug-Output => {:error:}C-1
+; @Debug-Output => {:info:}C-2
+; @Debug-Output => {:nortice:}C-3
+; @Debug-Output => {:end:}{:end:}
+; @Debug-Output => {:break:}
+b := ""
+
+; @Debug-ClearConsole
+; @Debug-Breakpoint => cleard console!
+return

demo/demo.ahk

@@ -5,7 +5,7 @@ globalVar := "Global"
 global SuperGlobalVar := "SuperGlobal"
 
 demo()
- demo() {
+demo() {
   static staticVar := "Static"
 
   ; Overwrite global var
@@ -74,7 +74,7 @@ demo()
 }
 class Clazz extends ClazzBase {
   ; static
-  static staticField := "static fie ld"
+  static staticField := "staticfield"
 
   ; property
   _property_baking := "baking"