Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/lint-lua-ls/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
with:
nix_path: nixpkgs=channel:nixos-unstable
- uses: DeterminateSystems/magic-nix-cache-action@v2
- run: nix profile install --accept-flake-config .#lua-language-server
- run: nix profile add --accept-flake-config .#lua-language-server
shell: bash
- run: scripts/lint-lua-ls.sh
shell: bash
53 changes: 8 additions & 45 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,56 +1,19 @@
out
dist
testOut
node_modules
.vscode-test/
*.vsix
/package-lock.json
.vscode-test
packages/*/out
packages/*/dist
Comment thread
AndreasArvidsson marked this conversation as resolved.
packages/*/build
packages/*/.docusaurus

.DS_Store
meta.json
tsconfig.tsbuildinfo
*.vsix
.luacheckcache

# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
.pnp
.pnp.js

# testing
coverage

# next.js
.next/

# production
build

# misc
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts

# test subset config
packages/test-harness/testSubsetGrep.properties
packages/test-harness/failedTests.properties


# cursorless-neovim
cursorless.nvim/node/cursorless-neovim
cursorless.nvim/node/test-harness

# nix
.direnv/
2 changes: 1 addition & 1 deletion .luarc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"runtime.version": "Lua 5.1",
"diagnostics.ignoredFiles": "Disable",
"diagnostics.globals": ["vim", "talon", "it", "describe"],
"workspace.ignoreDir": ["data/playground/lua/", ".luarocks", ".lua"]
"workspace.ignoreDir": ["data/playground/lua/", ".luarocks", ".lua", "dist"]
}
13 changes: 10 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
**/vendor
**/generated
**/.docusaurus
.git
node_modules
.vscode-test
packages/*/out
packages/*/dist
packages/*/build
packages/*/.docusaurus
packages/cursorless-vscode/src/keyboard/grammar/generated
packages/cursorless-engine/src/customCommandGrammar/generated
packages/cursorless-engine/src/snippets/vendor

# We use our own format for our recorded yaml tests to keep them compact
/data/fixtures/recorded/**/*.yml
Expand Down
7 changes: 7 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.git
node_modules
.vscode-test
packages/*/out
packages/*/dist
packages/*/build
packages/*/.docusaurus
8 changes: 6 additions & 2 deletions cursorless-talon/src/spoken_forms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
from pathlib import Path
from typing import Callable, Concatenate, Sequence
from typing import Callable, Concatenate, ParamSpec, Sequence, TypeVar

from talon import app, cron, fs, registry

Expand All @@ -24,7 +24,11 @@
disposables: list[Callable] = []


def auto_construct_defaults[**P, R](
P = ParamSpec("P")
R = TypeVar("R")


def auto_construct_defaults(
spoken_forms: dict[str, ListToSpokenForms],
handle_new_values: Callable[[str, Sequence[SpokenFormEntry]], None],
f: Callable[
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
"fix:meta": "pnpm run meta-updater && pnpm -r exec prettier --write tsconfig.json package.json",
"fix:syncpack": "syncpack fix",
"fix:eslint": "pnpm lint:ts --fix",
"fix:style": "stylelint '**/*.{css,scss}' --fix",
"fix:prettier": "prettier --write --list-different .",
"lint:meta": "pnpm run meta-updater --test",
"lint:syncpack": "syncpack lint",
"lint:ts": "eslint packages",
"lint:prettier": "prettier --check .",
"lint": "pnpm run lint:meta && pnpm run lint:syncpack && pnpm run lint:ts",
"lint:style": "stylelint '**/*.{css,scss}'",
"lint": "pnpm run lint:meta && pnpm run lint:syncpack && pnpm run lint:ts && pnpm run lint:style",
"init-vscode-sandbox": "pnpm -F @cursorless/cursorless-vscode init-launch-sandbox",
"meta-updater": "env NODE_OPTIONS='--import=tsx --conditions=cursorless:bundler' meta-updater",
"preinstall": "npx only-allow pnpm",
Expand Down Expand Up @@ -51,6 +53,9 @@
"eslint-plugin-unicorn": "^63.0.0",
"eslint-plugin-unused-imports": "^4.4.1",
"prettier": "^3.8.1",
"stylelint": "^17.4.0",
"stylelint-config-standard": "^40.0.0",
"stylelint-config-standard-scss": "^17.0.0",
"syncpack": "^14.2.0",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/cheatsheet-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"typescript": "^5.9.3",
"vite": "^8.0.0",
"vite-plugin-purgecss": "^0.2.13",
"vite-plugin-singlefile": "^2.3.0"
"vite-plugin-singlefile": "^2.3.2"
}
}
10 changes: 8 additions & 2 deletions packages/cheatsheet/src/lib/cheatsheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
--table-th-bg: #c4b4ff;
--capture-bg: #cecbda;
}

.cheatsheet #legend .table {
--bs-table-striped-bg: #ddd6ff;
--bs-table-bg: #ede9fe;
Expand All @@ -19,23 +20,28 @@
--bs-body-bg: #292524;
--bs-border-color: #79716b;
}

.cheatsheet {
--table-th-bg: #79716b;
--capture-bg: #696662;
}

.cheatsheet .table {
--bs-table-striped-bg: #57534d;
--bs-table-bg: #44403b;
}

.cheatsheet .card {
--bs-card-cap-bg: #44403b;
}

.cheatsheet #legend {
--bs-border-color: #4d179a;
--bs-card-cap-bg: #4d179a;
--table-th-bg: #8e51ff;
--capture-bg: #984efe;
}

.cheatsheet #legend .table {
--bs-table-striped-bg: #7f22fe;
--bs-table-bg: #5d0ec0;
Expand Down Expand Up @@ -136,15 +142,15 @@
}

@layer utilities {
@media (min-width: 48rem) {
@media (width >= 48rem) {
.cheatsheet-sections {
columns: 2 !important;
}
}
}

@layer utilities {
@media (min-width: 80rem) {
@media (width >= 80rem) {
.cheatsheet-sections {
columns: 3 !important;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
"fast-check": "^4.6.0",
"js-yaml": "^4.1.1",
"mocha": "^11.7.5",
"web-tree-sitter": "^0.26.6"
"web-tree-sitter": "^0.26.7"
}
}
2 changes: 1 addition & 1 deletion packages/cursorless-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"mocha": "^11.7.5",
"sinon": "^21.0.2",
"vscode-uri": "^3.1.0",
"web-tree-sitter": "^0.26.6"
"web-tree-sitter": "^0.26.7"
}
}
20 changes: 0 additions & 20 deletions packages/cursorless-org-docs/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion packages/cursorless-org-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@tsconfig/docusaurus": "^2.0.9",
"@types/mdast": "^4.0.4",
"@types/react": "^19.2.14",
"sass": "^1.93.2",
"sass": "^1.98.0",
"typescript": "^5.9.3",
"unified": "^11.0.5"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/cursorless-org-docs/src/docs/components/Code.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
padding-right: 0.5em;
text-align: right;
height: 135%;
color: rgba(115, 138, 148, 0.4);
border-right: 1px solid rgba(115, 138, 148, 0.4);
color: rgb(115 138 148 0.4);
border-right: 1px solid rgb(115 138 148 0.4);
}

.code-ws-symbol {
Expand All @@ -37,7 +37,7 @@
display: none;
position: absolute;
top: 0.5em;
background-color: rgb(216, 222, 233);
background-color: rgb(216 222 233);
border: none;
padding: 4px 8px;
border-radius: 4px;
Expand All @@ -59,7 +59,7 @@
right: 0.5em;
}

.code-container > .code-link:before {
.code-container > .code-link::before {
display: inline-block;
width: 1.25rem;
height: 0.75rem;
Expand Down
Loading
Loading