v3.3.2 (#371)

* Update changelog for 3.3.2 * Revert "Update dev docs and VSCE (#366)" This reverts commit d8ac0ae. * Revert "Update project URL (#365)" This reverts commit e6e3f15. * Revert "v3.3.1 (#364)" This reverts commit 0f33807. * Revert "Update links and minor README (#363)" This reverts commit 834fae4. * Revert "Fix: colon comment highlight (#358)" This reverts commit 7e73d80. * Revert "Bump yaml from 2.1.1 to 2.2.2 (#356)" This reverts commit bd6379a. * Revert "Bump xml2js from 0.4.23 to 0.5.0 (#355)" This reverts commit 5493292. * Revert "Fix: keywords and direcives highlight (#354)" This reverts commit c0afb9b. * Revert "Update ahk.tmLanguage.yaml (#349)" This reverts commit 975b563. * Revert "Open tutorial help page when user selects "tutorial" text (#348)" This reverts commit 813407d. * Revert "Begin work for strict checks (#346)" This reverts commit f8ccc57. * bump to 3.3.2 * Link issue
mark-wiemer · Jun 21, 2023 · 9296010 · 9296010
1 parent e2e121b
commit 9296010
Show file tree

Hide file tree

Showing 37 changed files with 296 additions and 512 deletions.
diff --git a/.github/workflows/project-management.yml b/.github/workflows/project-management.yml
@@ -19,5 +19,5 @@ jobs:
         with:
           # https://github.com/settings/tokens
           # https://github.com/vscode-autohotkey/ahkpp/settings/secrets/actions
-          project-url: https://github.com/orgs/mark-wiemer-org/projects/1
+          project-url: https://github.com/orgs/vscode-autohotkey/projects/1
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
diff --git a/.vscode/dev.code-snippets b/.vscode/dev.code-snippets
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,4 +1,5 @@
-// https://code.visualstudio.com/docs/editor/tasks#vscode
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
 {
     "version": "2.0.0",
     "tasks": [

diff --git a/Changelog.md b/Changelog.md
@@ -3,10 +3,17 @@
 <!-- PRs -- Find: `#([0-9]+)`, Replace `[PR #$1](https://github.com/vscode-autohotkey/ahkpp/pull/$1)` -->
 <!-- Issues -- Find: `#([0-9]+)`, Replace `[#$1](https://github.com/vscode-autohotkey/ahkpp/issues/$1)` -->
 
-## 3.3.1 - 2023-06-20 🌞
+## 3.3.2 - 2023-06-21 🪲
+
+-   Revert changes in 3.3.1. This release is the same as 3.3.0. Ref [Issue #369](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues/369)
+
+## 3.3.1 (yanked) - 2023-06-20 🌞
+
+> This release has been yanked, meaning it's not supported. Use v3.3.2 instead.
 
 -   Various syntax highlighting improvements ([PR #354](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/pull/354), [PR #358](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/pull/358))
 -   Running `Open help` while `tutorial` text is selected now opens the Tutorial page ([PR #348](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/pull/348))
+-   Unexpected change: Break debugger.
 
 ## 3.3.0 - 2023-03-11 🪴
 
@@ -98,7 +105,7 @@ Fixes:
 
 -   Revert to v2.8.2 due to unexpected breaking change in v2.8.3
 
-## 2.8.3 (YANKED) - 2022-07-04 🦅
+## 2.8.3 (yanked) - 2022-07-04 🦅
 
 > This release has been yanked, meaning it's not supported. Use v2.8.2 instead.
 

diff --git a/README.md b/README.md
@@ -8,11 +8,11 @@ AutoHotkey Plus Plus (AHK++) provides AutoHotkey language support for VS Code. T
 -   code formatting
 -   ...and more!
 
-AHK++ is a fork of [AutoHotkey Plus by cweijan](https://marketplace.visualstudio.com/items?itemName=cweijan.vscode-autohotkey-plus) with the primary goal of fixing bugs and adding user-requested features.
+> Currently, AHK++ officially supports only AHK v1. AHK v2 will likely work, but please open issues and be patient if complex workflows are not supported. See [issue 146: Support AHK v2](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues/146)
 
-> View this README on [GitHub](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus#readme)
+AHK++ is a fork of [AutoHotkey Plus by cweijan](https://github.com/AutoHotkey-Plus/vscode-autohotkey), with the primary goal of fixing bugs and adding user-requested features.
 
-> Currently, AHK++ officially supports only AHK v1. AHK v2 will likely work, but please open issues and be patient if complex workflows are not supported. See [issue 146: Support AHK v2](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues/146)
+> View this README on the [project site](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus#readme)
 
 ## Contents
 
@@ -163,5 +163,5 @@ Formatter directives instruct the formatter to behave a certain way on sections
 
 Previous extensions:
 
--   [AutoHotkey Plus by cweijan](https://marketplace.visualstudio.com/items?itemName=cweijan.vscode-autohotkey-plus)
--   [AutoHotkey by stef-levesque](https://marketplace.visualstudio.com/items?itemName=slevesque.vscode-autohotkey)
+-   [AutoHotkey Plus by cweijan](https://github.com/cweijan/vscode-autohotkey)
+-   [AutoHotkey by stef-levesque](https://github.com/stef-levesque/vscode-autohotkey)
diff --git a/docs/Development.md b/docs/Development.md
@@ -44,8 +44,6 @@ Unless otherwise specified, commit messages don't matter.
         1. Attach binary
         1. Publish release
 
-When the tag is pushed, changes will automatically be published.
-
 ### Validating deployment
 
 1. [Deploy workflow](https://github.com/mark-wiemer/ahkpp/actions/workflows/deploy.yml)

diff --git a/language/ahk.tmLanguage.yaml b/language/ahk.tmLanguage.yaml
@@ -15,9 +15,9 @@ repository:
   comment:
     patterns:
       - captures:
-          '2':
+          '1':
             name: punctuation.definition.comment.ahk
-        match: (^\s*|\s+)(;).*
+        match: (?<=^|\s+)(;).*
         name: comment.line.semicolon.ahk
         example: ;comment
       - begin: ^\s*/\*
@@ -101,7 +101,7 @@ repository:
           '2':
             name: comment.line.semicolon.directive.ahk
         match: >-
-          #\b(?i:allowsamelinecomments|clipboardtimeout|commentflag|delimiter|derefchar|errorstdout|escapechar|hotkeyinterval|hotkeymodifiertimeout|hotstring|iftimeout|ifwinactive|ifwinexist|ifwinnotactive|ifwinnotexist|inputlevel|installkeybdhook|installmousehook|keyhistory|ltrim|maxhotkeysperinterval|maxmem|maxthreads|maxthreadsbuffer|maxthreadsperhotkey|menumaskkey|noenv|notrayicon|persistent|requires|singleinstance|usehook|warn|winactivateforce)\b(.*?)(\s+;.*)?$
+          #\b(?i:allowsamelinecomments|clipboardtimeout|commentflag|errorstdout|escapechar|hotkeyinterval|hotkeymodifiertimeout|hotstring|iftimeout|ifwinactive|ifwinexist|ifwinnotactive|ifwinnotexist|inputlevel|installkeybdhook|installmousehook|keyhistory|ltrim|maxhotkeysperinterval|maxmem|maxthreads|maxthreadsbuffer|maxthreadsperhotkey|menumaskkey|noenv|notrayicon|persistent|requires|singleinstance|usehook|warn|winactivateforce)\b(.*?)(\s+;.*)?$
         name: keyword.control.directives.ahk
         example: '#persistent'
       - match: >-
@@ -140,6 +140,7 @@ repository:
         # - match: (?i)\b(?<=\bGui\b\s*,?\s*((\w+|%\w+%):\s*)?)(1stPARAM)\b
         # GUI-like commands with multiply options in single parameter
         # - match: (?i)\b(?<=\bGui\b\s*,?\s*(((\w+|%\w+%):\s*)?SUB_COMMAND\s*,)?[^,]*)(MULTIPLE_OPTIONS_IN_SECOND_PARAM)\b
+        # TODO D:\SERGEY\Install\Others\Keyboard HotKey\AutoHotkey\Tools\CallTipsForAll\ has list of commands with parameters!!! look at them
       - match: (?i)\b(?<=::\s*)(AltTab|ShiftAltTab|AltTabMenu|AltTabAndMenu|AltTabMenuDismiss)\b
         name: keyword.other.ahk
         # ON/OFF Parameters
@@ -173,8 +174,6 @@ repository:
         name: keyword.other.ahk
       - match: (?i)\b(?<=\bFormatTime\b\s*,?[^,]+,[^,]*,\s*)(Time|ShortDate|LongDate|YearMonth|YDay|YDay0|WDay|YWeek)\b
         name: keyword.other.ahk
-      - match: (?i)\b(?<=\bGetKeyState\b\s*,?[^,]+,[^,]+,\s*)(P|T)\b
-        name: keyword.other.ahk
         # GUI Sub-Commands
       - match: (?i)\b(?<=\bGui\b\s*,?\s*((\w+|%\w+%):\s*)?)(New|Add|Show|Submit|Cancel|Hide|Destroy|Font|Color|Margin|Menu|Minimize|Maximize|Restore|Flash|Default|ListView)\b
         name: keyword.other.ahk
@@ -251,14 +250,8 @@ repository:
         name: keyword.other.ahk
       - match: (?i)\b(?<=\bIfMsgBox\s*,?\s*)(Yes|No|OK|Cancel|Abort|Ignore|Retry|Continue|TryAgain|Timeout)\b
         name: keyword.other.ahk
-      - match: (?i)\b(?<=\bInputBox\b\s*,?[^,]+,[^,]+,[^,]+,\s*)(HIDE)\b
-        name: keyword.other.ahk
       - match: (?i)\b(?<=\bLoop\b\s*,?\s*)(Files|Parse|Read|Reg)\b
         name: keyword.other.ahk
-      - match: (?i)\b(?<=\bLoop\b\s*,?\s*Files\s*,[^,]+,\s*)(DF?R?|DR?F?|FD?R?|FR?D?|RD?F?|RF?D?)\b
-        name: keyword.other.ahk
-      - match: (?i)\b(?<=\bLoop\b\s*,?\s*Parse\s*,[^,]+,\s*)(CSV)\b
-        name: keyword.other.ahk
       - match: (?i)\b(?<=\bLoop\b\s*,?\s*Reg\s*,\s*)(HKEY_LOCAL_MACHINE|HKEY_USERS|HKEY_CURRENT_USER|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKLM|HKU|HKCU|HKCR|HKCC)\b
         name: keyword.other.ahk
       - match: (?i)\b(?<=\bLoop\b\s*,?\s*Reg\s*,[^,]+,\s*)(KV?R?|KR?V?|VK?R?|VR?K?|RK?V?|RV?K?)\b
@@ -309,8 +302,6 @@ repository:
         name: keyword.other.ahk
       - match: (?i)\b(?<=\bSetTimer\b\s*,?[^,]*,\s*)(On|Off|Delete)\b
         name: keyword.other.ahk
-      - match: (?i)\b(?<=\bSetTitleMatchMode\b\s*,?\s*)(RegEx|Fast|Slow)\b
-        name: keyword.other.ahk
       - match: (?i)\b(?<=\bSoundSet\b\s*,?[^,]+,\s*)(MASTER|SPEAKERS|DIGITAL|LINE|MICROPHONE|SYNTH|CD|TELEPHONE|PCSPEAKER|WAVE|AUX|ANALOG|HEADPHONES|N/A)\b
         name: keyword.other.ahk
       - match: (?i)\b(?<=\bSoundSet\b\s*,?[^,]+,[^,]*,\s*)(VOLUME|VOL|ONOFF|MUTE|MONO|LOUDNESS|STEREOENH|BASSBOOST|PAN|QSOUNDPAN|BASS|TREBLE|EQUALIZER)\b

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vscode-autohotkey-plus-plus",
     "displayName": "AutoHotkey Plus Plus",
-    "version": "3.3.1",
+    "version": "3.3.2",
     "description": "AutoHotkey IntelliSense, debug, and language support for VS Code, forked from AutoHotkey Plus by cweijan",
     "categories": [
         "Programming Languages",
@@ -355,21 +355,21 @@
     },
     "dependencies": {
         "@vscode/debugadapter": "^1.57.0",
+        "date-format": "^4.0.14",
         "get-port": "^5.1.1",
         "portfinder": "^1.0.32",
-        "xml2js": "^0.5.0"
+        "xml2js": "^0.4.23"
     },
     "devDependencies": {
         "@types/fs-extra": "^9.0.7",
         "@types/glob": "^7.1.3",
         "@types/mocha": "^9.1.1",
         "@types/node": "^17.0.23",
         "@types/vscode": "^1.50.0",
-        "@types/xml2js": "^0.4.11",
         "@typescript-eslint/eslint-plugin": "^5.37.0",
         "@typescript-eslint/parser": "^5.37.0",
         "@vscode/test-electron": "^1.6.1",
-        "@vscode/vsce": "^2.19.0",
+        "@vscode/vsce": "^2.18.0",
         "esbuild": "^0.15.7",
         "esbuild-plugin-eslint": "^0.1.1",
         "eslint": "^8.23.1",