Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add formatting test #388

Merged
merged 6 commits into from
Aug 9, 2023
Merged

Add formatting test #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fe6473
Add formatting test
mark-wiemer Aug 9, 2023
07c6142
Fix #387
mark-wiemer Aug 9, 2023
b6adf58
Remove unused launch configs
mark-wiemer Aug 9, 2023
00aeeb9
Update vscode/vsce to 2.20.1
mark-wiemer Aug 9, 2023
e94d55e
Fix #384
mark-wiemer Aug 9, 2023
581514e
Add AHK v2 debug config (Fix #385)
mark-wiemer Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,6 @@
],
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
"preLaunchTask": "npm: compile"
},
// TODO untested
{
"type": "ahk",
"request": "launch",
"name": "Autohotkey v1 Debugger",
"program": "${workspaceFolder}/demos/v1Demo.ahk",
"runtime": "C:\\Program Files\\Autohotkey\\AutoHotkeyU64.exe",
"stopOnEntry": false,
"dbgpSettings": {
"max_children": 149
}
},
// TODO untested
{
"type": "ahk2",
"request": "launch",
"name": "Autohotkey v2 Debugger",
"program": "${workspaceFolder}/demos/v2Demo.ahk",
"runtime": "C:\\Program Files\\AutoHotkey\\v2-alpha\\x64\\AutoHotkey.exe", // Default value of Scite for ahk v2
"stopOnEntry": false,
"dbgpSettings": {
"max_children": 149
}
}
]
}
6 changes: 6 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
<!-- 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)` -->

## 5.0.1 - 2023-08-08 😶‍🌫️

- `ahk++.file.interpreterPathV2` now defaults to `C:/Program Files/AutoHotkey/v2/AutoHotkey64.exe` ([Issue #387](https://github.com/mark-wiemer-org/ahkpp/issues/387))
- Add breakpoint support for AHK v2 files ([Issue #384](https://github.com/mark-wiemer-org/ahkpp/issues/384))
- Add AHK v2 debug config template ([#385](https://github.com/mark-wiemer-org/ahkpp/issues/385))

## 5.0.0 - 2023-08-07 ✌️

AutoHotkey v2 support now in preview! Please test it out and [report any issues](https://github.com/mark-wiemer-org/ahkpp/issues/new?assignees=mark-wiemer&labels=AHK+v2&projects=&template=v2.md&title=%5Bv2%5D+), you'll help the community of 120,000+ users of this extension!
Expand Down
2 changes: 2 additions & 0 deletions demos/manualTests/formatting.ahk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
; Shift+Alt+F to format
ExitApp
45 changes: 15 additions & 30 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 93 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
"breakpoints": [
{
"language": "ahk"
},
{
"language": "ahk2"
}
],
"commands": [
Expand Down Expand Up @@ -132,7 +135,7 @@
},
"ahk++.file.interpreterPathV2": {
"type": "string",
"default": "C:/Program Files/AutoHotkey/AutoHotkeyU64.exe",
"default": "C:/Program Files/AutoHotkey/v2/AutoHotkey64.exe",
"description": "Path to the AHK v2 interpreter."
},
"ahk++.file.helpPathV1": {
Expand Down Expand Up @@ -201,7 +204,10 @@
"debuggers": [
{
"type": "ahk",
"label": "AutoHotkey",
"label": "AutoHotkey v1",
"languages": [
"ahk"
],
"program": "./out/debugger/DebugAdapter.js",
"runtime": "\"C:\\Program Files\\AutoHotkey\\AutoHotkeyU64.exe\"",
"configurationAttributes": {
Expand All @@ -212,12 +218,12 @@
"properties": {
"program": {
"type": "string",
"description": "Absolute path to a text file.",
"description": "Absolute path to the AHK v1 script to debug.",
"default": "${file}"
},
"runtime": {
"type": "string",
"description": "Absolute path to a AutoHotkey.exe file.",
"description": "Absolute path to an AutoHotkey v1 interpreter.",
"default": "C:\\Program Files\\AutoHotkey\\AutoHotkeyU64.exe"
},
"stopOnEntry": {
Expand All @@ -235,16 +241,16 @@
"properties": {
"max_children": {
"type": "integer",
"description": "max number of array or object children to initially retrieve",
"description": "Max number of array or object children to initially retrieve.",
"default": 300
},
"max_data": {
"type": "integer",
"description": "max amount of variable data to initially retrieve.",
"description": "Max amount of variable data to initially retrieve.",
"default": 131072
}
},
"description": "Dbgp settings. See https://xdebug.org/docs-dbgp.php#feature-names",
"description": "DBGP settings. See https://xdebug.org/docs-dbgp.php#feature-names",
"default": {}
}
}
Expand All @@ -254,18 +260,94 @@
{
"type": "ahk",
"request": "launch",
"name": "AutoHotkey Debugger",
"name": "AutoHotkey v1 Debugger",
"program": "${file}",
"stopOnEntry": true
}
],
"configurationSnippets": [
{
"label": "AutoHotkey Debug: Launch",
"label": "AutoHotkey v1 Debug: Launch",
"body": {
"type": "ahk",
"request": "launch",
"name": "AutoHotkey Debugger",
"name": "AutoHotkey v1 Debugger",
"program": "${file}",
"stopOnEntry": true
}
}
]
},
{
"type": "ahk2",
"label": "AutoHotkey v2",
"languages": [
"ahk2"
],
"program": "./out/debugger/DebugAdapter.js",
"runtime": "\"C:\\Program Files\\AutoHotkey\\v2\\AutoHotkey64.exe\"",
"configurationAttributes": {
"launch": {
"required": [
"program"
],
"properties": {
"program": {
"type": "string",
"description": "Absolute path to the AHK v2 script to debug.",
"default": "${file}"
},
"runtime": {
"type": "string",
"description": "Absolute path to an AutoHotkey v2 interpreter.",
"default": "C:\\Program Files\\AutoHotkey\\v2\\AutoHotkey64.exe"
},
"stopOnEntry": {
"type": "boolean",
"description": "Automatically stop after launch.",
"default": true
},
"trace": {
"type": "boolean",
"description": "Enable logging of the Debug Adapter Protocol.",
"default": true
},
"dbgpSettings": {
"type": "object",
"properties": {
"max_children": {
"type": "integer",
"description": "Max number of array or object children to initially retrieve.",
"default": 300
},
"max_data": {
"type": "integer",
"description": "Max amount of variable data to initially retrieve.",
"default": 131072
}
},
"description": "DBGP settings. See https://xdebug.org/docs-dbgp.php#feature-names",
"default": {}
}
}
}
},
"initialConfigurations": [
{
"type": "ahk2",
"request": "launch",
"name": "AutoHotkey v2 Debugger",
"program": "${file}",
"stopOnEntry": true
}
],
"configurationSnippets": [
{
"label": "AutoHotkey v2 Debug: Launch",
"body": {
"type": "ahk2",
"request": "launch",
"name": "AutoHotkey v2 Debugger",
"program": "${file}",
"stopOnEntry": true
}
Expand Down Expand Up @@ -424,7 +506,7 @@
"@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.20.1",
"chai": "^4.3.7",
"esbuild": "^0.15.7",
"esbuild-plugin-eslint": "^0.1.1",
Expand Down