From 993fe569a9f60a53e78c0130582398dc7e1a172c Mon Sep 17 00:00:00 2001 From: Mark Wiemer Date: Thu, 17 Oct 2024 07:18:03 -0700 Subject: [PATCH 1/3] Use GroggyOtter syntaxes --- ahk2 | 2 +- changelog.md | 1 + license.md | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ahk2 b/ahk2 index 297742ef..234ebd1c 160000 --- a/ahk2 +++ b/ahk2 @@ -1 +1 @@ -Subproject commit 297742ef9d2db65985007b19603c2a0d28b3c173 +Subproject commit 234ebd1c804cd83de7462a7b6fe46015ffcb984c diff --git a/changelog.md b/changelog.md index 8cec2c5f..2e4b564c 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ - Rename extension to `AHK++ (AutoHotkey Plus Plus)` to provide a clear short name while retaining previous brand - In 6.2.0, only the settings were renamed. This release renames the extension display name on registries as well. +- Rewrite AHK v2 hover tips using [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite)'s syntaxes ([#521](https://github.com/mark-wiemer-org/ahkpp/issues/521)) - Add exclude setting ([#488](https://github.com/mark-wiemer-org/ahkpp/issues/488)) - Excluded files are not included in IntelliSense completion suggestions, even when they're added via `#include` - Changed `v2.exclude` setting to `exclude` diff --git a/license.md b/license.md index e3d322d5..a23f7957 100644 --- a/license.md +++ b/license.md @@ -4,11 +4,13 @@ Portions copyright: - 2019-2022 [Weijan Chen](https://github.com/cweijan/autohotkey-plus), - 2020-2024 [thqby](https://github.com/thqby/vscode-autohotkey2-lsp), - 2022-2023 [Lexikos](https://github.com/Lexikos/vscode-auto-select). +- 2023-2024 [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) --- - Unless otherwise indicated, all content is licensed under [MIT](https://opensource.org/license/MIT). - AutoHotkey H icon licensed under [GNU General Public License version 3](https://opensource.org/license/gpl-3-0). - Files in the ahk2 submodule are licensed under [GNU Lesser General Public License version 3](https://opensource.org/license/lgpl-3-0). +- AutoHotkey v2 completion suggestions provided by [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) and [used with permission](https://github.com/GroggyOtter/ahkv2_definition_rewrite/issues/8) - Other files licensed outside of MIT are marked as such at the top of the file. - Please [open a discussion](https://github.com/mark-wiemer-org/ahkpp/discussions/new?category=q-a) if you have any questions :) From c64882e878e2712a8b59c39142fad2ac768ec3c6 Mon Sep 17 00:00:00 2001 From: Mark Wiemer Date: Thu, 17 Oct 2024 07:20:43 -0700 Subject: [PATCH 2/3] Consistently name them as "definition files" --- changelog.md | 2 +- license.md | 2 +- readme.md | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 2e4b564c..ae535c76 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,7 @@ - Rename extension to `AHK++ (AutoHotkey Plus Plus)` to provide a clear short name while retaining previous brand - In 6.2.0, only the settings were renamed. This release renames the extension display name on registries as well. -- Rewrite AHK v2 hover tips using [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite)'s syntaxes ([#521](https://github.com/mark-wiemer-org/ahkpp/issues/521)) +- Rewrite AutoHotkey v2 definition files using [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite)'s syntaxes ([#521](https://github.com/mark-wiemer-org/ahkpp/issues/521)) - Add exclude setting ([#488](https://github.com/mark-wiemer-org/ahkpp/issues/488)) - Excluded files are not included in IntelliSense completion suggestions, even when they're added via `#include` - Changed `v2.exclude` setting to `exclude` diff --git a/license.md b/license.md index a23f7957..56d8e766 100644 --- a/license.md +++ b/license.md @@ -11,6 +11,6 @@ Portions copyright: - Unless otherwise indicated, all content is licensed under [MIT](https://opensource.org/license/MIT). - AutoHotkey H icon licensed under [GNU General Public License version 3](https://opensource.org/license/gpl-3-0). - Files in the ahk2 submodule are licensed under [GNU Lesser General Public License version 3](https://opensource.org/license/lgpl-3-0). -- AutoHotkey v2 completion suggestions provided by [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) and [used with permission](https://github.com/GroggyOtter/ahkv2_definition_rewrite/issues/8) +- AutoHotkey v2 definition files provided by [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) and [used with permission](https://github.com/GroggyOtter/ahkv2_definition_rewrite/issues/8) - Other files licensed outside of MIT are marked as such at the top of the file. - Please [open a discussion](https://github.com/mark-wiemer-org/ahkpp/discussions/new?category=q-a) if you have any questions :) diff --git a/readme.md b/readme.md index 06f0c0b4..9843a1c4 100644 --- a/readme.md +++ b/readme.md @@ -159,8 +159,9 @@ This extension relies heavily on open-source code. A huge thank you to all these - [AutoHotkey Plus by cweijan](https://marketplace.visualstudio.com/items?itemName=cweijan.vscode-autohotkey-plus): AHK++ is a fork of AutoHotkey Plus by cweijan (Weijan Chen) - [Contributions to AHK++ by kyklish](https://github.com/mark-wiemer-org/ahkpp/commits/main?author=kyklish): Greatly improved formatting and snippets by both fixing bugs and adding features -- [AutoHotkey v2 Language Support by thqby](https://marketplace.visualstudio.com/items?itemName=thqby.vscode-autohotkey2-lsp): The source of the v2 grammar and other great contributions -- [Lexikos/vscode-auto-select](https://github.com/Lexikos/vscode-auto-select): The core code for automatically switching AHK versions +- [AutoHotkey v2 Language Support extension by thqby](https://marketplace.visualstudio.com/items?itemName=thqby.vscode-autohotkey2-lsp): The source of the v2 grammar and other great contributions +- [AutoHotkey v2 definition files by GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) +- [AHK version selection by Lexikos](https://github.com/Lexikos/vscode-auto-select): The core code for automatically switching AHK versions - [AutoHotkey by stef-levesque](https://marketplace.visualstudio.com/items?itemName=slevesque.vscode-autohotkey): AutoHotkey Plus is a fork of stef-levesque's original AutoHotkey extension, which provided the original grammar and snippets for AHK ## Links From 573c1947c6db97536dc73ee2bfafb5e5afbeb556 Mon Sep 17 00:00:00 2001 From: Mark Wiemer Date: Thu, 17 Oct 2024 07:22:36 -0700 Subject: [PATCH 3/3] Yes I'm sappy --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 9843a1c4..229fa86b 100644 --- a/readme.md +++ b/readme.md @@ -163,6 +163,7 @@ This extension relies heavily on open-source code. A huge thank you to all these - [AutoHotkey v2 definition files by GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) - [AHK version selection by Lexikos](https://github.com/Lexikos/vscode-auto-select): The core code for automatically switching AHK versions - [AutoHotkey by stef-levesque](https://marketplace.visualstudio.com/items?itemName=slevesque.vscode-autohotkey): AutoHotkey Plus is a fork of stef-levesque's original AutoHotkey extension, which provided the original grammar and snippets for AHK +- People like you: Thank you for opening issues, offering suggestions, and providing information to the AHK community :) ## Links