Skip to content

Commit 90aa35a

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 1091c71 + 49cc8cd commit 90aa35a

File tree

86 files changed

+1299
-1031
lines changed

Some content is hidden

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

86 files changed

+1299
-1031
lines changed

.github/actions/test-neovim-lua/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ description: "Set up Neovim Lua environment and run Busted tests"
33
runs:
44
using: "composite"
55
steps:
6-
- uses: leafo/gh-actions-lua@v10
6+
- uses: leafo/gh-actions-lua@v11
77
with:
88
luaVersion: "luajit-openresty"
9-
- uses: leafo/gh-actions-luarocks@v4
9+
- uses: leafo/gh-actions-luarocks@v5
1010
- shell: bash
1111
run: |
1212
luarocks install busted

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ jobs:
4040
run: pnpm --color install
4141

4242
- name: Install lua
43-
uses: leafo/gh-actions-lua@v9
43+
uses: leafo/gh-actions-lua@v11
4444

4545
- name: Install luarocks
46-
uses: leafo/gh-actions-luarocks@v4
46+
uses: leafo/gh-actions-luarocks@v5
4747

4848
- name: Run pre-commit hooks
4949
uses: pre-commit/action@v3.0.1

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Supported Versions
44

5-
Cursorless is still pre-1.0, and users are expected to use the latest version, so security vulnerabilities are only patched on the latest version. If you would like security patches on an older version, please [open a discussion](https://github.com/cursorless-dev/cursorless/discussions/new).
5+
Users are expected to use the latest version, so security vulnerabilities are only patched on the latest version. If you would like security patches on an older version, please [open a discussion](https://github.com/cursorless-dev/cursorless/discussions/new).
66

77
## Reporting a Vulnerability
88

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
tags: [documentation]
3+
pullRequest: 2859
4+
---
5+
6+
- Added languages sidebar to documents page. Here you can see the supported scope facets for each language.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
languageId: typescriptreact
2+
command:
3+
version: 7
4+
spokenForm: change pair
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: surroundingPair, delimiter: any}
12+
usePrePhraseSnapshot: false
13+
initialState:
14+
documentContents: |
15+
<div bbb={() => null}>hello &</div>
16+
selections:
17+
- anchor: {line: 0, character: 14}
18+
active: {line: 0, character: 14}
19+
marks: {}
20+
finalState:
21+
documentContents: |
22+
<div bbb=>hello &</div>
23+
selections:
24+
- anchor: {line: 0, character: 9}
25+
active: {line: 0, character: 9}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
for (int i = 0; i < size; ++i) { }
2+
---
3+
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:34
7+
>----------------------------------<
8+
0| for (int i = 0; i < size; ++i) { }
9+
10+
[Insertion delimiter] = "\n"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
for (final int v : values) { }
2+
---
3+
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:30
7+
>------------------------------<
8+
0| for (final int v : values) { }
9+
10+
[Insertion delimiter] = "\n"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
while(true) { }
2+
---
3+
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:15
7+
>---------------<
8+
0| while(true) { }
9+
10+
[Insertion delimiter] = "\n"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
do { } while(true);
2+
---
3+
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:19
7+
>-------------------<
8+
0| do { } while(true);
9+
10+
[Insertion delimiter] = "\n"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
public class MyClass { }
2+
---
3+
4+
[#1 Range] =
5+
[#1 Domain] = 0:0-0:24
6+
>------------------------<
7+
0| public class MyClass { }
8+
9+
10+
[#2 Range] =
11+
[#2 Domain] = 0:22-0:23
12+
>-<
13+
0| public class MyClass { }

0 commit comments

Comments
 (0)