Skip to content

Commit 967121d

Browse files
Merge branch 'main' into jsFacets
2 parents da12886 + c14234a commit 967121d

Some content is hidden

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

45 files changed

+450
-283
lines changed

.github/workflows/deploy.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
2020
with:
21+
# This is needed to get the number of commits in the current branch
2122
fetch-depth: 0
2223

23-
# FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
24-
- name: Upgrade Corepack
25-
run: npm install --global [email protected]
26-
27-
- name: Enable Corepack
28-
run: corepack enable
24+
- name: Install pnpm
25+
uses: pnpm/action-setup@v4
2926

3027
- name: Set up Node.js
3128
uses: actions/setup-node@v4
@@ -70,8 +67,8 @@ jobs:
7067
- name: Checkout repository
7168
uses: actions/checkout@v4
7269

73-
- name: Enable Corepack
74-
run: corepack enable
70+
- name: Install pnpm
71+
uses: pnpm/action-setup@v4
7572

7673
- name: Set up Node.js
7774
uses: actions/setup-node@v4

.github/workflows/pr-description.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
validate-pr-description:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Set up workspace
14-
uses: actions/checkout@v2
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
1515

1616
- name: Validate description
1717
run: |

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ jobs:
2727
with:
2828
python-version: 3.x
2929

30-
# FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
31-
- name: Upgrade Corepack
32-
run: npm install --global [email protected]
33-
34-
- name: Enable Corepack
35-
run: corepack enable
30+
- name: Install pnpm
31+
uses: pnpm/action-setup@v4
3632

3733
- name: Set up Node.js
3834
uses: actions/setup-node@v4

.github/workflows/test-docs.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ jobs:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
1818

19-
# FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
20-
- name: Upgrade Corepack
21-
run: npm install --global [email protected]
22-
23-
- name: Enable Corepack
24-
run: corepack enable
19+
- name: Install pnpm
20+
uses: pnpm/action-setup@v4
2521

2622
- name: Set up Node.js
2723
uses: actions/setup-node@v4

.github/workflows/test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ jobs:
3737
- name: Checkout repository
3838
uses: actions/checkout@v4
3939

40-
# FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
41-
- name: Upgrade Corepack
42-
run: npm install --global --force [email protected]
43-
44-
- name: Enable Corepack
45-
run: corepack enable
40+
- name: Install pnpm
41+
uses: pnpm/action-setup@v4
4642

4743
- name: Set up Node.js
4844
uses: actions/setup-node@v4

cursorless-talon/src/command.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ def make_serializable(value: Any) -> Any:
9999
**{
100100
k: v
101101
for k, v in vars(type(value)).items()
102-
if not k.startswith("_") and not isinstance(v, property)
102+
if not k.startswith("_")
103+
and not isinstance(v, property)
104+
and not isinstance(v, staticmethod)
103105
},
104106
**value.__dict__,
105107
}

cursorless-talon/src/cursorless.talon

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ tag: user.cursorless
2424
<user.cursorless_wrapper_paired_delimiter> {user.cursorless_wrap_action} <user.cursorless_target>:
2525
user.private_cursorless_wrap_with_paired_delimiter(cursorless_wrap_action, cursorless_target, cursorless_wrapper_paired_delimiter)
2626

27+
{user.cursorless_insert_snippet_action} {user.snippet} <user.cursorless_destination>:
28+
user.private_cursorless_insert_community_snippet(snippet, cursorless_destination)
29+
30+
{user.snippet_wrapper} {user.cursorless_wrap_action} <user.cursorless_target>:
31+
user.private_cursorless_wrap_with_community_snippet(snippet_wrapper, cursorless_target)
32+
2733
{user.cursorless_show_scope_visualizer} <user.cursorless_scope_type> [{user.cursorless_visualization_type}]:
2834
user.private_cursorless_show_scope_visualizer(cursorless_scope_type, cursorless_visualization_type or "content")
2935
{user.cursorless_hide_scope_visualizer}:

cursorless-talon/src/fallback.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"remove": actions.edit.delete,
2020
"editNewLineBefore": actions.edit.line_insert_up,
2121
"editNewLineAfter": actions.edit.line_insert_down,
22+
"insertCopyAfter": actions.edit.line_clone,
2223
}
2324

2425
modifier_callbacks = {

cursorless-talon/src/snippets.py

Lines changed: 0 additions & 172 deletions
This file was deleted.

cursorless-talon/src/snippets.talon

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)