Skip to content

Commit b072615

Browse files
authored
Merge branch 'main' into generate-examples
2 parents c0e9532 + f041217 commit b072615

File tree

2,790 files changed

+28226
-14007
lines changed

Some content is hidden

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

2,790 files changed

+28226
-14007
lines changed

.eslintrc.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
"ecmaVersion": 6,
1111
"sourceType": "module"
1212
},
13-
"plugins": ["@typescript-eslint"],
13+
"plugins": ["@typescript-eslint", "unused-imports"],
1414
"rules": {
15+
// Note: you must disable the base rule as it can report incorrect errors
16+
"no-restricted-imports": "off",
17+
"@typescript-eslint/no-restricted-imports": "error",
1518
"@typescript-eslint/consistent-type-assertions": [
1619
"error",
1720
{
@@ -22,6 +25,7 @@
2225
"@typescript-eslint/no-explicit-any": "off",
2326
"@typescript-eslint/no-inferrable-types": "off",
2427
"@typescript-eslint/no-non-null-assertion": "off",
28+
"unused-imports/no-unused-imports": "error",
2529
"@typescript-eslint/no-unused-vars": [
2630
"warn",
2731
{
@@ -38,7 +42,12 @@
3842
"null": "never"
3943
}
4044
],
41-
"no-constant-condition": ["error", { "checkLoops": false }],
45+
"no-constant-condition": [
46+
"error",
47+
{
48+
"checkLoops": false
49+
}
50+
],
4251
"no-throw-literal": "warn",
4352
"semi": "off"
4453
},

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
4c0676728c0ccfdcc4b6593a4a13ac49fc20a82a
2+
619d7f7271506c7fd5913cca68574f722ab392d8

.github/FUNDING.yml

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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
## Checklist
22

33
- [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
4+
- [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
5+
- [ ] I have not broken the cheatsheet

.github/workflows/deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1313
environment: production
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
with:
1717
fetch-depth: 0
18-
- uses: actions/setup-node@v2
18+
- uses: actions/setup-node@v3
1919
with:
2020
node-version: 16
2121
cache: yarn
@@ -46,7 +46,7 @@ jobs:
4646
needs: publish-extension
4747
environment: production
4848
steps:
49-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
5050
with:
5151
fetch-depth: 0
5252
token: ${{ secrets.CURSORLESS_BOT_TOKEN }}

.github/workflows/test-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
test-docs-build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/setup-node@v2
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-node@v3
1414
with:
1515
node-version: 16
1616
cache: yarn

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
env:
2424
VSCODE_VERSION: ${{ matrix.vscode_version }}
2525
steps:
26-
- uses: actions/checkout@v2
27-
- uses: actions/setup-node@v2
26+
- uses: actions/checkout@v3
27+
- uses: actions/setup-node@v3
2828
with:
2929
node-version: 16
3030
cache: yarn

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,5 @@ node_modules
99
# TypeDoc output
1010
docs/contributing/api/
1111

12-
# Generated docs hub
13-
website-root/docs/
14-
1512
# Local extension / data sandbox for debug launch task
1613
/.vscode-sandbox

.pre-commit-config.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ repos:
3232
hooks:
3333
- id: flynt
3434
- repo: https://github.com/Zac-HD/shed
35-
rev: 0.10.1
35+
rev: 0.10.7
3636
hooks:
3737
- id: shed
3838
# TODO: bump to --py310-plus when Talon moves to Python 3.10.
3939
args: [--refactor, --py39-plus]
4040
types_or: [python, markdown, rst]
41+
- repo: https://github.com/wenkokke/talonfmt
42+
rev: 1.8.1
43+
hooks:
44+
- id: talonfmt
45+
args: ["--in-place", "--max-line-width=88"]

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22

33
# We use our own format for our recorded yaml tests to keep them compact
44
/src/test/suite/fixtures/recorded/**/*.yml
5+
6+
7+
# This was swizzled from a Docusaurus core class
8+
docs-site/src/theme/SearchBar/index.js

0 commit comments

Comments
 (0)