Skip to content

Commit

Permalink
Add exclude for v1 and v2 (#543)
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-wiemer authored Oct 13, 2024
1 parent af912df commit bca5ff7
Show file tree
Hide file tree
Showing 28 changed files with 776 additions and 556 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: npm ci
- run: npm run package
- run: npm run package:ci
- name: Publish to Open VSX Registry
uses: HaaLeo/publish-vscode-extension@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .vscode-test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { defineConfig } from '@vscode/test-cli';
export default defineConfig({
files: ['out/src/**/*.e2e.js'],
workspaceFolder: 'e2e',
// https://mochajs.org/#command-line-usage
// https://github.com/mochajs/mocha/tree/main/example/config
mocha: {
Expand Down
19 changes: 13 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,19 @@
"name": "Launch Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
"preLaunchTask": "npm: build:dev", // :dev for sourcemaps
"env": {
"VSCODE_AHK_SERVER_PATH": "", // default path works for debug as well
"SYNTAXES_PATH": "" // default path works for debug as well
}
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"preLaunchTask": "npm: build:dev" // :dev for sourcemaps
},
{
"name": "Launch Tests",
"type": "extensionHost",
"request": "launch",
"preLaunchTask": "npm: pretest:e2e",
"args": [
"--disable-extensions",
"--extensionDevelopmentPath=${workspaceFolder}"
],
"testConfiguration": "${workspaceFolder}/.vscode-test.mjs"
}
]
}
2 changes: 1 addition & 1 deletion ahk2
Submodule ahk2 updated from d7dfd3 to f75b53
10 changes: 10 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## 6.3.0 - unreleased 🕳️

- Add exclude setting ([#488](https://github.com/mark-wiemer-org/ahkpp/issues/488))
- Changed `v2.exclude` setting to `exclude`
- One setting works for both v1 and v2
- v2 will exclude excluded files from suggestions even if they're opened in the IDE (different than thqby's extension)
- v1 no longer automatically ignores files with `out`, `target`, and `node_modules` in their name
- Fixup output channel names: "AHK++ (v1)" and "AHK++ (v2)" instead of "AHK" and "AHK++" respectively
- Fix duplicate output channels

## 6.2.3 - 2024-10-08 📖

- Restore readme to marketplaces once again ([#537](https://github.com/mark-wiemer-org/ahkpp/issues/537))
Expand Down
2 changes: 2 additions & 0 deletions e2e/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.vscode
!out
5 changes: 5 additions & 0 deletions e2e/excluded.ahk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Requires AutoHotkey v2.0

MyExcludedFunc() {
MsgBox("This function is excluded in IDE settings")
}
5 changes: 5 additions & 0 deletions e2e/main.ahk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Requires AutoHotkey v2.0

; Exclude pattern: excluded.ahk
;* Should not suggest "my excluded func" in completion
MyExclu
Empty file added e2e/out.ahk1
Empty file.
2 changes: 2 additions & 0 deletions e2e/out/test.ahk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Requires AutoHotkey v2.0

5 changes: 5 additions & 0 deletions e2e/test.ah1
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#NoEnv
#SingleInstance, Force
SendMode, Input
SetBatchLines, -1
SetWorkingDir, %A_ScriptDir%
2 changes: 2 additions & 0 deletions e2e/test.ah2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Requires AutoHotkey v2.0

5 changes: 5 additions & 0 deletions e2e/test.ahk1
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#NoEnv
#SingleInstance, Force
SendMode, Input
SetBatchLines, -1
SetWorkingDir, %A_ScriptDir%
2 changes: 2 additions & 0 deletions e2e/test.ahk2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Requires AutoHotkey v2.0

Loading

0 comments on commit bca5ff7

Please sign in to comment.