Skip to content

Commit da54448

Browse files
committed
Merge branch 'main' into pokey/cursorless-enablement-group-page
2 parents 9ffc544 + 054b193 commit da54448

File tree

220 files changed

+5030
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+5030
-966
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @pokey
1+
* @pokey @AndreasArvidsson

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ jobs:
9696
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
9797

9898
steps:
99-
- name: Checkout repository
100-
uses: actions/checkout@v3
99+
- name: Do nothing
100+
run: "true"

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ jobs:
7272
name: dumps
7373
path: ${{ env.VSCODE_CRASH_DIR }}
7474
if: failure()
75+
- name: Forbid TODOs
76+
run: ./scripts/forbid-todo.sh

.pre-commit-config.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ repos:
3232
exclude_types: [svg]
3333
exclude: patches/.*\.patch
3434
- id: fix-byte-order-marker
35+
- id: forbid-submodules
3536
- id: mixed-line-ending
3637
- id: trailing-whitespace
3738
# Trailing whitespace breaks yaml files if you use a multiline string
@@ -83,8 +84,3 @@ repos:
8384
rev: 23.3.0
8485
hooks:
8586
- id: black
86-
- repo: https://github.com/wenkokke/talonfmt
87-
rev: 1.9.5
88-
hooks:
89-
- id: talonfmt
90-
args: ["--in-place"]

.vscode/extensions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// for the documentation about the extensions.json format
44
"recommendations": [
55
"AndreasArvidsson.andreas-talon",
6+
"charliermarsh.ruff",
67
"dbaeumer.vscode-eslint",
78
"esbenp.prettier-vscode",
89
"jrieken.vscode-tree-sitter-query",

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ There's too much new stuff in this release to fit in a highlights reel, so we'll
139139
- Improve and unify selection updating behaviour to handle overlapping ranges [\#138](https://github.com/cursorless-dev/cursorless/issues/138)
140140
- Duplicate symbols after VS Code update [\#111](https://github.com/cursorless-dev/cursorless/issues/111)
141141
- Fold action not working properly with multiple list elements [\#39](https://github.com/cursorless-dev/cursorless/issues/39)
142-
- The `clear` command clashes with Knausj commands [\#68](https://github.com/pokey/cursorless-talon/issues/68)
142+
- The `clear` command clashes with community commands [\#68](https://github.com/pokey/cursorless-talon/issues/68)
143143

144144
**Closed issues:**
145145

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
tags: [enhancement, talon]
3+
pullRequest: 1900
4+
---
5+
6+
- Added optional second target to action `call` to specify argument. eg: `"call air on bat"`.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
tags: [enhancement, talon]
3+
pullRequest: 1875
4+
mergeDate: 2023-09-10
5+
---
6+
7+
- Added `cursorless_insert` action to the public Talon api. This api enables you to define custom grammars for Cursorless text insertion. See the [talon-side api docs](https://www.cursorless.org/docs/user/customization/#public-talon-actions) for more

cursorless-talon-dev/src/cursorless_dev.talon

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
mode: command
2+
mode: user.cursorless_spoken_form_test
13
tag: user.cursorless
24
-
35

@@ -28,3 +30,6 @@ tag: user.cursorless
2830

2931
test snippet make <user.cursorless_target>:
3032
user.private_cursorless_make_snippet_test(cursorless_target)
33+
34+
parse tree <user.cursorless_target>:
35+
user.cursorless_command("private.showParseTree", cursorless_target)

cursorless-talon-dev/src/cursorless_test.talon

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ test api command <user.cursorless_target>:
77
user.cursorless_command("setSelection", cursorless_target)
88
test api command bring <user.cursorless_target>:
99
user.cursorless_command("replaceWithTarget", cursorless_target)
10+
test api insert <user.word> <user.cursorless_destination>:
11+
user.cursorless_insert(cursorless_destination, word)
12+
test api insert <user.word> and <user.word> <user.cursorless_destination>:
13+
user.cursorless_insert(cursorless_destination, word_list)
1014
test api insert snippet:
1115
user.cursorless_insert_snippet("Hello, $foo! My name is $bar!")
1216
test api insert snippet by name:

0 commit comments

Comments
 (0)