diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..ca9f4212 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: mark-wiemer + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..00570341 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: mark-wiemer + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md new file mode 100644 index 00000000..118cf3b1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/other-issue.md @@ -0,0 +1,10 @@ +--- +name: Other issue +about: Not sure if it's a bug or a feature? Open a blank issue +title: '' +labels: '' +assignees: mark-wiemer + +--- + + diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 00000000..dd87ca45 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -0,0 +1,12 @@ +Fixes #ISSUE. + +Changes proposed in this pull request: +- CHANGE + +--- + +Replace "ISSUE" and "CHANGE" above with your values. + +Do not edit below: + +Notifying @mark-wiemer diff --git a/LICENSE b/LICENSE index 53d8954c..46ccf4f8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ -Copyright 2020 weijan (https://github.com/cweijan), Mark Wiemer (https://github.com/mark-wiemer) +Copyright (c) 2020 [weijan](https://github.com/cweijan), [Mark Wiemer](https://github.com/mark-wiemer) 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 shall be included in all copies or substantial portions of the Software. +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. \ No newline at end of file diff --git a/README.md b/README.md index 28e82f29..05f20696 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,13 @@ AutoHotkey Plus Plus (AHK++) provides actively maintained, comprehensive AutoHot AutoHotkey Plus Plus is one of many extensions that offer VS Code language support. So why should you use this one? - **IntelliSense**: Smart code completion, syntax highlighting, code navigation, and more. - **Actively Maintained**: Any issues encountered while using this extension can be reported and fixed. With other extensions, anything that's broken will stay broken forever. You can report any issues (and view all issues) at [the issue tracker](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues) +- **Actively Maintained**: Any issues encountered while using this extension can be reported and fixed. With other extensions, anything that's broken will stay broken forever. You can report any issues with AHK++ (and view all issues) through the [issue tracker](https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues) - **Debug Support**: Run and debug AHK scripts from VS Code. - **New Features**: Another benefit to active maintenance is that AHK++ can add new features as users request them. ## Coffee -If you like this extension, consider [buying the orignal author a coffee](https://www.buymeacoffee.com/cweijan). Thank you! +If you like this extension, consider [buying cweijan a coffee](https://www.buymeacoffee.com/cweijan). Thank you! ## Install diff --git a/demos/demo_for_ahk_v1.ahk b/demos/demo_for_ahk_v1.ahk index f786de4b..6cd9dfaa 100644 --- a/demos/demo_for_ahk_v1.ahk +++ b/demos/demo_for_ahk_v1.ahk @@ -55,3 +55,17 @@ class Cls method() { } } + +; Does a thing +LAlt() { + ; do a thing +} + +<#Tab:: AltTab +<#c:: CenterActiveWindow() +$LAlt:: LAlt() +$*Pause:: Pause() +$AppsKey:: AppsKey() +$CapsLock:: CapsLock() + +Pause \ No newline at end of file diff --git a/docs/Development.md b/docs/Development.md index 4b74191c..5d6cf9a3 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -7,6 +7,7 @@ This document covers the development process, from writing code to publishing a 1. Push the changes, open a PR, review the changes, and merge to `master`. 1. Confirm the package version has been updated 1. Confirm the changelog has been updated + 1. Confirm Markdown files appear as intended 1. Pull the new master branch 1. Package the new release using `vsce package`. 1. Publish the release through [Visual Studio Marketplace](https://marketplace.visualstudio.com/manage/publishers/mark-wiemer) diff --git a/package.json b/package.json index 6f18efda..cdf63206 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "Programming Languages", "Snippets" ], - "license": "See LICENSE file", + "license": "MIT", "icon": "icon.png", "bugs": { "url": "https://github.com/mark-wiemer/vscode-autohotkey-plus-plus/issues" @@ -148,12 +148,12 @@ }, { "command": "run.ahk", - "title": "Run AHK Script", + "title": "Run Script", "category": "AHK" }, { "command": "debug.ahk", - "title": "Debug AHK Script", + "title": "Debug Script", "category": "AHK", "icon": { "light": "./image/run.png", @@ -185,17 +185,17 @@ "keybindings": [ { "command": "debug.ahk", - "key": "f9", + "key": "F9", "when": "editorLangId == ahk" }, { "command": "run.ahk", - "key": "ctrl+f9", + "key": "Ctrl+F9", "when": "editorLangId == ahk" }, { "command": "compile.ahk", - "key": "ctrl+shift+f9", + "key": "Ctrl+Shift+F9", "when": "editorLangId == ahk" } ], @@ -212,12 +212,12 @@ "ahk++.executePath": { "type": "string", "default": "C:/Program Files/AutoHotkey/AutoHotkeyU64.exe", - "description": "The execute path of AHK." + "description": "Absolute path to an AutoHotkey.exe file." }, "ahk++.compilePath": { "type": "string", "default": "C:/Program Files/AutoHotkey/Compiler/Ahk2Exe.exe", - "description": "The compiler path of AHK." + "description": "Absolute path to an Ahk2Exe.exe file." }, "ahk++.intellisense": { "type": "boolean", diff --git a/syntaxes/ahk.tmLanguage.json b/syntaxes/ahk.tmLanguage.json index 16d58390..be279a59 100644 --- a/syntaxes/ahk.tmLanguage.json +++ b/syntaxes/ahk.tmLanguage.json @@ -184,7 +184,7 @@ "example": "this" }, { - "match": "\\b(?!MsgBox)(?i:new|__New|__Delete|shift|lshift|rshift|alt|lalt|ralt|control|lcontrol|rcontrol|ctrl|lctrl|rctrl|lwin|rwin|appskey|altdown|altup|shiftdown|shiftup|ctrldown|ctrlup|lwindown|lwinup|rwindown|rwinup|lbutton|rbutton|mbutton|wheelup|wheelleft|wheelright|wheeldown|xbutton1|xbutton2|joy1|joy2|joy3|joy4|joy5|joy6|joy7|joy8|joy9|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy30|joy31|joy32|joyx|joyy|joyz|joyr|joyu|joyv|joypov|joyname|joybuttons|joyaxes|joyinfo|space|tab|enter|escape|esc|backspace|bs|delete|del|insert|ins|pgup|pgdn|home|end|up|down|left|right|printscreen|ctrlbreak|pause|scrolllock|capslock|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadmult|numpadadd|numpadsub|numpaddiv|numpaddot|numpaddel|numpadins|numpadclear|numpadup|numpaddown|numpadleft|numpadright|numpadhome|numpadend|numpadpgup|numpadpgdn|numpadenter|f1|f2|f3|f4|f5|f6|f7|f8|f9|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f20|f21|f22|f23|f24|browser_back|browser_forward|browser_refresh|browser_stop|browser_search|browser_favorites|browser_home|volume_mute|volume_down|volume_up|media_next|media_prev|media_stop|media_play_pause|launch_mail|launch_media|launch_app1|launch_app2|vk\\d+|sc\\d+)\\b", + "match": "\\b(?!MsgBox)(?i:new|__New|__Delete|shift|lshift|rshift|alt|lalt|ralt|control|lcontrol|rcontrol|ctrl|lctrl|rctrl|lwin|rwin|appskey|altdown|altup|shiftdown|shiftup|ctrldown|ctrlup|lwindown|lwinup|rwindown|rwinup|lbutton|rbutton|mbutton|wheelup|wheelleft|wheelright|wheeldown|xbutton1|xbutton2|joy1|joy2|joy3|joy4|joy5|joy6|joy7|joy8|joy9|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy30|joy31|joy32|joyx|joyy|joyz|joyr|joyu|joyv|joypov|joyname|joybuttons|joyaxes|joyinfo|space|tab|enter|escape|esc|backspace|bs|delete|del|insert|ins|pgup|pgdn|home|end|up|down|left|right|printscreen|ctrlbreak|pause|scrolllock|capslock|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadmult|numpadadd|numpadsub|numpaddiv|numpaddot|numpaddel|numpadins|numpadclear|numpadup|numpaddown|numpadleft|numpadright|numpadhome|numpadend|numpadpgup|numpadpgdn|numpadenter|f1|f2|f3|f4|f5|f6|f7|f8|f9|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f20|f21|f22|f23|f24|browser_back|browser_forward|browser_refresh|browser_stop|browser_search|browser_favorites|browser_home|volume_mute|volume_down|volume_up|media_next|media_prev|media_stop|media_play_pause|launch_mail|launch_media|launch_app1|launch_app2|vk\\d+|sc\\d+)\\b(?!\\s*\\()\\b", "name": "keyword.keys.ahk", "example": "LButton" },