Skip to content

Commit 3f6b627

Browse files
Merge branch 'main' into nix-flake
2 parents fc6ba7d + 2d07d11 commit 3f6b627

File tree

3,804 files changed

+23158
-13237
lines changed

Some content is hidden

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

3,804 files changed

+23158
-13237
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ insert_final_newline = false
2222
# with a line that has trailing white space. Many of our recorded
2323
# tests use strings with trailing white space to represent the final
2424
# document contents. For example
25-
# packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
25+
# data/fixtures/recorded/languages/ruby/changeCondition.yml
2626
trim_trailing_whitespace = false
2727

2828
[Makefile]

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
* @pokey @AndreasArvidsson
22

3-
*keyboard* @pokey @josharian
4-
*Keyboard* @pokey @josharian
3+
*keyboard* @pokey @AndreasArvidsson @josharian
4+
*Keyboard* @pokey @AndreasArvidsson @josharian
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
body:
2+
- type: markdown
3+
attributes:
4+
value: |
5+
You are submitting to our Architecture Decision Record.
6+
Learn more about ADRs at <https://adr.github.io>, and discussion #1211.
7+
8+
- type: textarea
9+
attributes:
10+
label: Context
11+
description: The issue motivating this decision, and any context that influences or constrains the decision.
12+
validations:
13+
required: true
14+
15+
- type: textarea
16+
attributes:
17+
label: Options considered
18+
19+
- type: textarea
20+
attributes:
21+
label: Decision
22+
description: "The change that we're proposing or have agreed to implement."
23+
24+
- type: textarea
25+
attributes:
26+
label: Consequences
27+
description: What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4949

5050
# Initializes the CodeQL tools for scanning.
5151
- name: Initialize CodeQL

.github/workflows/deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
env:
1515
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20-
- uses: pnpm/action-setup@v2
21-
- uses: actions/setup-node@v3
20+
- run: corepack enable
21+
- uses: actions/setup-node@v4
2222
with:
23-
node-version-file: package.json
23+
node-version-file: .nvmrc
2424
cache: pnpm
2525
- run: pnpm --color install
2626
- run: pnpm --color compile
@@ -46,7 +46,7 @@ jobs:
4646
needs: publish-extension
4747
environment: production
4848
steps:
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050
with:
5151
fetch-depth: 0
5252
token: ${{ secrets.CURSORLESS_BOT_TOKEN }}

.github/workflows/forbid-todo.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Forbid TODO
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
merge_group:
7+
branches: [main]
8+
9+
jobs:
10+
forbid-todo:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Forbid TODO
15+
run: ./scripts/forbid-todo.sh

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
name: Pre-commit
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: actions/setup-python@v4
1919
with:
2020
python-version: 3.x
21-
- uses: pnpm/action-setup@v2
22-
- uses: actions/setup-node@v3
21+
- run: corepack enable
22+
- uses: actions/setup-node@v4
2323
with:
24-
node-version-file: package.json
24+
node-version-file: .nvmrc
2525
cache: pnpm
2626
- run: pnpm --color install
2727
- uses: pre-commit/[email protected]

.github/workflows/test-docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
env:
1313
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: pnpm/action-setup@v2
17-
- uses: actions/setup-node@v3
15+
- uses: actions/checkout@v4
16+
- run: corepack enable
17+
- uses: actions/setup-node@v4
1818
with:
19-
node-version-file: package.json
19+
node-version-file: .nvmrc
2020
cache: pnpm
2121
- run: bash -x scripts/build-and-assemble-website.sh

.github/workflows/test.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
VSCODE_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
2828
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
2929
steps:
30-
- uses: actions/checkout@v3
31-
- uses: pnpm/action-setup@v2
32-
- uses: actions/setup-node@v3
30+
- uses: actions/checkout@v4
31+
- run: corepack enable
32+
- uses: actions/setup-node@v4
3333
with:
34-
node-version-file: package.json
34+
node-version-file: .nvmrc
3535
cache: pnpm
3636
- run: mkdir -p "${{ env.VSCODE_CRASH_DIR }}" "${{ env.VSCODE_LOGS_DIR }}"
3737
shell: bash
@@ -55,22 +55,20 @@ jobs:
5555
- run: mv ${{ steps.createVsix.outputs.vsixPath }} cursorless-development.vsix
5656
if: runner.os == 'Linux' && matrix.vscode_version == 'stable'
5757
- name: Upload vsix
58-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5959
if: runner.os == 'Linux' && matrix.vscode_version == 'stable'
6060
with:
6161
name: vsix
6262
path: cursorless-development.vsix
6363
- name: Archive logs
64-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: logs
6767
path: ${{ env.VSCODE_LOGS_DIR }}
6868
if: failure()
6969
- name: Archive dumps
70-
uses: actions/upload-artifact@v3
70+
uses: actions/upload-artifact@v4
7171
with:
7272
name: dumps
7373
path: ${{ env.VSCODE_CRASH_DIR }}
7474
if: failure()
75-
- name: Forbid TODOs
76-
run: ./scripts/forbid-todo.sh

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.12.1

0 commit comments

Comments
 (0)