-
-
Notifications
You must be signed in to change notification settings - Fork 2
feat: Enable spellchecking via crate-ci/typos #649
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
Open
Maleware
wants to merge
12
commits into
main
Choose a base branch
from
feat/enable-crate-typos-on-ci
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
104372a
enable typos in operator-templating and downstream
Maleware 8fc2472
Adding typos.toml
Maleware 3bf7c8a
Merge branch 'main' into feat/enable-crate-typos-on-ci
Maleware 4d9b209
Polishing files
Maleware 87a6da7
Merge branch 'feat/enable-crate-typos-on-ci' of https://github.com/st…
Maleware 2d7322d
Updating rev
Maleware 383e20a
making prek happy
Maleware eee19fc
again ci happy dance
Maleware bd1979c
updating typo ref for template too
Maleware 3579f4f
more condensed typos.toml and README.md entries
Maleware 8dc6063
whitespace check
Maleware 9ae086c
Applying review, change regex, more condensed README
Maleware File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,6 +65,70 @@ These are the only variables currently being used on the playbooks, but can be e | |
|
|
||
| Additional settings can be found in `playbook/group_vars/all`, but these are not intended to be freely changed and should be treated with care. | ||
|
|
||
| ## Spell checking | ||
|
|
||
| Every managed repository runs [typos](https://github.com/crate-ci/typos) as a prek hook. | ||
| The hook is templated in `template/.pre-commit-config.yaml.j2`. | ||
| The word lists are **not** templated: each repository has its own `typos.toml`, because typos has no layered configuration yet ([crate-ci/typos#193](https://github.com/crate-ci/typos/issues/193)). | ||
| Keeping the word lists local also means adding a word is a PR per repository instead of a templating run. | ||
| Files rendered from `template/` are checked in this repository once. | ||
|
|
||
| ### The core config | ||
|
|
||
| As a convention, new repositories should start from this block and add only what they actually need. | ||
|
|
||
| ```toml | ||
| # Configuration for typos (https://github.com/crate-ci/typos), run via the prek | ||
| # hook in .pre-commit-config.yaml. | ||
| # | ||
| # Before adding an entry here, consider an in-place marker instead. Use one when | ||
| # the word is correct at this one site and would still be a typo elsewhere: | ||
| # | ||
| # # typos:ignore-line at the end of the line it applies to | ||
| # # typos:ignore-next-line on its own line, above the offending line | ||
| # # typos:off / typos:on around a block | ||
| # | ||
| # Every entry below gets a one-line comment saying what the word is. | ||
|
|
||
| [files] | ||
| # Bare `typos` skips hidden dirs by default, but prek passes explicit paths and | ||
| # so does check them. Turn it off so both agree. | ||
| ignore-hidden = false | ||
|
|
||
| extend-exclude = [ | ||
| # `.git` itself, which ignore-hidden = false would otherwise pull in. | ||
| ".git/", | ||
| # Generated by `make regenerate-nix` (crate2nix). Contains vendored crate | ||
| # metadata and hashes. | ||
| "Cargo.nix", | ||
| # Generated by `make crds`. Most of the content is Kubernetes' own schema | ||
| # documentation, which is not ours to correct, and the doc comments we do | ||
| # own are already checked at their source in rust/operator-binary/src/crd/. | ||
| "extra/crds.yaml", | ||
| ] | ||
|
|
||
| [default] | ||
| # typos has no native suppression directive | ||
| # (https://github.com/crate-ci/typos/issues/316), so these regexes provide one. | ||
| # A marker must sit in a comment: after `#`, `//` or `;` (free text may follow), | ||
| # or inside a closed `<!-- -->`, `/* */` or `{# #}` (free text may precede the | ||
| # closer). An unterminated `typos:off` suppresses nothing. | ||
| extend-ignore-re = [ | ||
| '(?Rm)^.*?(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:ignore-line\b.*|(?:<!--[ \t]*typos:ignore-line\b.*?-->|/\*[ \t]*typos:ignore-line\b.*?\*/|\{#[ \t]*typos:ignore-line\b.*?#\})[ \t]*)$', | ||
| '(?Rm)^[ \t]*(?:(?:#|//|;)[ \t]*typos:ignore-next-line\b.*|(?:<!--[ \t]*typos:ignore-next-line\b.*?-->|/\*[ \t]*typos:ignore-next-line\b.*?\*/|\{#[ \t]*typos:ignore-next-line\b.*?#\})[ \t]*)\r?\n.*$', | ||
| '(?ms)(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:off\b|<!--[ \t]*typos:off\b[^\n]*?-->|/\*[ \t]*typos:off\b[^\n]*?\*/|\{#[ \t]*typos:off\b[^\n]*?#\}).*?(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:on\b|<!--[ \t]*typos:on\b[^\n]*?-->|/\*[ \t]*typos:on\b[^\n]*?\*/|\{#[ \t]*typos:on\b[^\n]*?#\})', | ||
| ] | ||
|
|
||
| [default.extend-words] | ||
| # Azure Kubernetes Service | ||
| aks = "aks" | ||
| ``` | ||
|
|
||
| ### Conventions | ||
|
|
||
| - Every entry in a `typos.toml` gets a one-line comment saying what the word is. | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Already mentioned above, but fine to mention it again outside of the config file. |
||
| - Prefer an in-place marker over a config entry when the word is correct at one site and would still be a typo elsewhere | ||
|
|
||
| ## Making changes to the template | ||
|
|
||
| If you want to make a change that should be rolled out to all operators, make the change in the `template` directory. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Configuration for typos (https://github.com/crate-ci/typos), run via the prek | ||
| # hook in .pre-commit-config.yaml. | ||
| # | ||
| # Before adding an entry here, consider an in-place marker instead. Use one when | ||
| # the word is correct at this one site and would still be a typo elsewhere: | ||
| # | ||
| # # typos:ignore-line at the end of the line it applies to | ||
| # # typos:ignore-next-line on its own line, above the offending line | ||
| # # typos:off / typos:on around a block | ||
| # | ||
| # Every entry below gets a one-line comment saying what the word is. | ||
|
|
||
| [files] | ||
| # Bare `typos` skips hidden dirs by default, but prek passes explicit paths and | ||
| # so does check them. Turn it off so both agree. | ||
| ignore-hidden = false | ||
|
|
||
| extend-exclude = [ | ||
| # `.git` itself, which ignore-hidden = false would otherwise pull in. | ||
| ".git/", | ||
| ] | ||
|
|
||
| [default] | ||
| # typos has no native suppression directive | ||
| # (https://github.com/crate-ci/typos/issues/316), so these regexes provide one. | ||
| # A marker must sit in a comment: after `#`, `//` or `;` (free text may follow), | ||
| # or inside a closed `<!-- -->`, `/* */` or `{# #}` (free text may precede the | ||
| # closer). An unterminated `typos:off` suppresses nothing. | ||
| extend-ignore-re = [ | ||
| '(?Rm)^.*?(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:ignore-line\b.*|(?:<!--[ \t]*typos:ignore-line\b.*?-->|/\*[ \t]*typos:ignore-line\b.*?\*/|\{#[ \t]*typos:ignore-line\b.*?#\})[ \t]*)$', | ||
| '(?Rm)^[ \t]*(?:(?:#|//|;)[ \t]*typos:ignore-next-line\b.*|(?:<!--[ \t]*typos:ignore-next-line\b.*?-->|/\*[ \t]*typos:ignore-next-line\b.*?\*/|\{#[ \t]*typos:ignore-next-line\b.*?#\})[ \t]*)\r?\n.*$', | ||
| '(?ms)(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:off\b|<!--[ \t]*typos:off\b[^\n]*?-->|/\*[ \t]*typos:off\b[^\n]*?\*/|\{#[ \t]*typos:off\b[^\n]*?#\}).*?(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:on\b|<!--[ \t]*typos:on\b[^\n]*?-->|/\*[ \t]*typos:on\b[^\n]*?\*/|\{#[ \t]*typos:on\b[^\n]*?#\})', | ||
| ] | ||
|
|
||
| [default.extend-words] | ||
| # Azure Kubernetes Service | ||
| aks = "aks" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same comments from above apply here as well.