Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master => main #262

Merged
merged 1 commit into from
Sep 6, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ permissions: read-all
on:
push:
branches:
- master
- main
pull_request:
branches: master
branches: main
types: [opened, synchronize, reopened]

jobs:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<h1 align="center">Welcome to Cursorless!</h1>
<p align="center">
<a href="https://github.com/pokey/cursorless-vscode/blob/master/CHANGELOG.md" target="_blank">
<a href="https://github.com/pokey/cursorless-vscode/blob/main/CHANGELOG.md" target="_blank">
<img alt="Version" src="https://img.shields.io/github/package-json/v/pokey/cursorless-vscode?color=blue" />
</a>
<a href="https://github.com/pokey/cursorless-vscode/actions/workflows/test.yml?query=branch%3Amaster" target="_blank">
<a href="https://github.com/pokey/cursorless-vscode/actions/workflows/test.yml?query=branch%3Amain" target="_blank">
<img alt="Tests" src="https://img.shields.io/github/workflow/status/pokey/cursorless-vscode/Run%20Tests?logo=github&label=tests" />
</a>
<a href="https://github.com/pokey/cursorless-talon/tree/master/docs" target="_blank">
<a href="https://github.com/pokey/cursorless-talon/tree/main/docs" target="_blank">
<img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
</a>
<a href="https://github.com/pokey/cursorless-vscode/graphs/commit-activity" target="_blank">
<img alt="Maintenance" src="https://img.shields.io/maintenance/yes/2021.svg" />
</a>
<a href="https://github.com/pokey/cursorless-vscode/blob/master/LICENSE" target="_blank">
<a href="https://github.com/pokey/cursorless-vscode/blob/main/LICENSE" target="_blank">
<img alt="License: MIT" src="https://img.shields.io/github/license/pokey/cursorless-vscode" />
</a>
</p>
Expand All @@ -26,7 +26,7 @@
![demo-2](images/demo-2.gif)
![demo-3](images/demo-3.gif)

Checkout the [docs](https://github.com/pokey/cursorless-talon/blob/master/docs), [tutorial video](https://www.youtube.com/watch?v=JxcNW0hnfTk) and [!!con talk](https://www.youtube.com/watch?v=Py9xjeIhxOg) to get started.
Checkout the [docs](https://github.com/pokey/cursorless-talon/blob/main/docs), [tutorial video](https://www.youtube.com/watch?v=JxcNW0hnfTk) and [!!con talk](https://www.youtube.com/watch?v=Py9xjeIhxOg) to get started.

## Installation

Expand All @@ -42,8 +42,8 @@ This extension contributes the following settings:
- `cursorless.showOnStart`: Whether decorations should appear on workspace start
- `cursorless.hatSizeAdjustment`: Percentage to increase or decrease hat size; positive increases size
- `cursorless.hatVerticalOffset`: How much to vertically shift the hats as a percentage of font size; positive is up
- `cursorless.hatEnablement.colors`: Whether to enable particular hat colors. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/master/docs/customization.md) the corresponding spoken form in Talon.
- `cursorless.hatEnablement.shapes`: Whether to enable particular hat shapes. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/master/docs/customization.md) the corresponding spoken form in Talon.
- `cursorless.hatEnablement.colors`: Whether to enable particular hat colors. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/main/docs/customization.md) the corresponding spoken form in Talon.
- `cursorless.hatEnablement.shapes`: Whether to enable particular hat shapes. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/main/docs/customization.md) the corresponding spoken form in Talon.
- `cursorless.hatPenalties.colors`: How much to penalize each hat color. You will probably want to set this one to the number of syllables in the given style. Cursorless will then sort every style combination by number of syllables to refer to it.
- `cursorless.hatPenalties.shapes`: How much to penalize each hat shape. You will probably want to set this one to the number of syllables in the given style. Cursorless will then sort every style combination by number of syllables to refer to it.

Expand Down
2 changes: 1 addition & 1 deletion src/languages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function getNodeMatcher(

if (matchers == null) {
throw Error(
`Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/master/docs/adding-a-new-language.md`
`Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/main/docs/adding-a-new-language.md`
);
}

Expand Down