From de8fb7054ad3acca49710bee993485b4a4cb91eb Mon Sep 17 00:00:00 2001 From: Mark Wiemer <7833360+mark-wiemer@users.noreply.github.com> Date: Thu, 23 May 2024 22:45:35 -0700 Subject: [PATCH] =?UTF-8?q?5.0.4=20-=202024-05-23=20=F0=9F=98=8E=20(#436)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update changelog and dev snippets * Fixup readme name * like really fix it * fixup file names * Update license and security * Bump to 5.0.4 * Cleanup development.md * Fixup `readme` references --- .vscode/dev.code-snippets | 8 ++++++++ Changelog.md | 10 ++++++++-- docs/Development.md | 2 +- LICENSE => license.txt | 38 ++++++++------------------------------ package-lock.json | 6 +++--- package.json | 6 +++--- README.md => readme.md | 0 SECURITY.md => security.md | 0 8 files changed, 31 insertions(+), 39 deletions(-) rename LICENSE => license.txt (95%) rename README.md => readme.md (100%) rename SECURITY.md => security.md (100%) diff --git a/.vscode/dev.code-snippets b/.vscode/dev.code-snippets index 595f5113..c54e6741 100644 --- a/.vscode/dev.code-snippets +++ b/.vscode/dev.code-snippets @@ -34,5 +34,13 @@ "});" ], "description": "Generate tests for Mocha." + }, + "Issue link (ahkpp)": { + "scope": "markdown", + "prefix": "[#", + "body": [ + "[#$1](https://github.com/mark-wiemer-org/ahkpp/issues/$1)" + ], + "description": "Link an ahkpp issue" } } diff --git a/Changelog.md b/Changelog.md index 891e8404..c5f86ae4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,11 @@ # Changelog +## 5.0.4 - 2024-05-23 😎 + +- Add "PixelSearch" to V1 snippets ([PR #427](https://github.com/mark-wiemer-org/ahkpp/pull/427)) +- Fix two minor formatting issues ([Issue #432](https://github.com/mark-wiemer-org/ahkpp/issues/432), [#429](https://github.com/mark-wiemer-org/ahkpp/issues/429)) +- Update internal dependencies for security ([PR #435](https://github.com/mark-wiemer-org/ahkpp/pull/435)) + ## 5.0.3 - 2023-08-21 🏄 - Fix extension crash when switching to a nullish editor ([Issue #398](https://github.com/mark-wiemer-org/ahkpp/issues/398)) @@ -170,7 +176,7 @@ Breaking changes: Features: -- Add [formatter directive](./README.md#formatter-directives) for "Format Block Comment" ([PR #164](https://github.com/vscode-autohotkey/ahkpp/pull/164)) +- Add [formatter directive](./readme.md#formatter-directives) for "Format Block Comment" ([PR #164](https://github.com/vscode-autohotkey/ahkpp/pull/164)) - Add "allowed number of empty lines" setting to preserve any number of lines. Defaults to `1`, `-1` means "preserve all empty lines" ([PR #194](https://github.com/vscode-autohotkey/ahkpp/pull/194)) - Add "preserve indent" setting to preserve spaces before a comment. Defaults to `false`. ([PR #192](https://github.com/vscode-autohotkey/ahkpp/pull/192)) - Add "trim extra spaces" to trim spaces between words. Defaults to `true`. ([PR #191](https://github.com/vscode-autohotkey/ahkpp/pull/191)) @@ -271,7 +277,7 @@ Fixes: - Change ownership (from `cweijan` to `mark-wiemer`) - Change configuration title to 'AutoHotkey Plus Plus' -- Update README +- Update readme - Increase icon resolution ## 2.5.6 - 2020-10-06 diff --git a/docs/Development.md b/docs/Development.md index ff1c325c..bc17633b 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -12,7 +12,7 @@ This document covers the development process, from writing code to publishing a ## Testing - Test all added commands -- If the README was modified, confirm README appears as intended +- If the readme was modified, confirm it appears as intended ## Starting a release diff --git a/LICENSE b/license.txt similarity index 95% rename from LICENSE rename to license.txt index a0454bd0..ee85f3b1 100644 --- a/LICENSE +++ b/license.txt @@ -1,33 +1,11 @@ -Copyright 2020-2023 [Mark Wiemer](https://github.com/mark-wiemer). Portions copyright 2019-2022 [Weijan Chen](https://github.com/cweijan), 2020-2023 [thqby](https://github.com/thqby) 2022-2023 [Lexikos](https://github.com/Lexikos). - -Unless otherwise indicated, all code is licensed under MIT. Portions licensed under GNU GPLv3 - ---- - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- - -Files are licensed under MIT License by default. Files licensed under GNU GPLv3 are marked as such at the top of the file. +Copyright 2020-2024 [Mark Wiemer](https://github.com/mark-wiemer). +Portions copyright 2019-2022 [Weijan Chen](https://github.com/cweijan), +2020-2023 [thqby](https://github.com/thqby), +2022-2023 [Lexikos](https://github.com/Lexikos). + +Unless otherwise indicated, all content is licensed under MIT. +Portions licensed under GNU GPLv3. +Files licensed under GNU GPLv3 are marked as such at the top of the file. MIT License diff --git a/package-lock.json b/package-lock.json index 806c50fc..66069563 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "vscode-autohotkey-plus-plus", - "version": "5.0.3", + "version": "5.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-autohotkey-plus-plus", - "version": "5.0.3", - "license": "MIT", + "version": "5.0.4", + "license": "See license.txt", "dependencies": { "@vscode/debugadapter": "^1.57.0", "get-port": "^5.1.1", diff --git a/package.json b/package.json index 246c3244..12e30495 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vscode-autohotkey-plus-plus", "displayName": "AutoHotkey Plus Plus", - "version": "5.0.3", + "version": "5.0.4", "description": "AutoHotkey v1 and v2 language support for Visual Studio Code: IntelliSense, debugging, formatting, and more", "categories": [ "Debuggers", @@ -17,7 +17,7 @@ "ahk v2", "ahk v1" ], - "homepage": "https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/blob/main/README.md", + "homepage": "https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/blob/main/readme.md", "bugs": { "url": "https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues" }, @@ -25,7 +25,7 @@ "type": "git", "url": "https://github.com/mark-wiemer/vscode-autohotkey-plus-plus.git" }, - "license": "MIT", + "license": "See license.txt", "publisher": "mark-wiemer", "main": "./out/extension", "scripts": { diff --git a/README.md b/readme.md similarity index 100% rename from README.md rename to readme.md diff --git a/SECURITY.md b/security.md similarity index 100% rename from SECURITY.md rename to security.md