Skip to content

Commit

Permalink
chore: Formatting changes from pre-commit (#4413)
Browse files Browse the repository at this point in the history
  • Loading branch information
max-sixty authored Apr 23, 2024
1 parent da05c31 commit 87d9a46
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@

- The syntax highlighter package for Sublime Text is now
[published](https://packagecontrol.io/packages/PRQL) (@vanillajonathan).
- The [VSCode Great Icons](https://marketplace.visualstudio.com/items?itemName=emmanuelbeziat.vscode-great-icons)
- The
[VSCode Great Icons](https://marketplace.visualstudio.com/items?itemName=emmanuelbeziat.vscode-great-icons)
icon pack extension shows a database icon for `.prql` files. (@EmmanuelBeziat)

**Internal changes**:
Expand Down
4 changes: 1 addition & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion grammars/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ an index.
- The website (outside of the book & playground):
[`website/themes/prql-theme/static/plugins/highlight/prql.js`](https://github.com/PRQL/prql/blob/main/web/book/highlight-prql.js)

- Sublime Text — It's in the [`sublime-prql`](https://github.com/PRQL/sublime-prql/) repository.
- Sublime Text — It's in the
[`sublime-prql`](https://github.com/PRQL/sublime-prql/) repository.

- [TextMate](https://macromates.com/manual/en/language_grammars) — used by the
VS Code extension. It's in the `prql-vscode` repo in
Expand Down
3 changes: 1 addition & 2 deletions lutra/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ tasks:
nextest \
{{.packages}}
- cmd:
cargo clippy --all-targets {{.packages}} -- -D warnings
- cmd: cargo clippy --all-targets {{.packages}} -- -D warnings

pull-request:
desc: Most checks that run within GH actions for a pull request
Expand Down
4 changes: 2 additions & 2 deletions prqlc/prqlc-parser/src/lexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ pub enum TokenKind {
// Aesthetics only
Comment(String),
DocComment(String),
/// Vec contains comments between the newline and the line wrap
/// Vec containing comments between the newline and the line wrap
// Currently we include the comments with the LineWrap token. This isn't
// ideal, but I'm not sure of an easy way of having them be separate.
// - The line wrap span technically include the comments — on a newline,
// - The line wrap span technically includes the comments — on a newline,
// we need to look ahead to _after_ the comments to see if there's a
// line wrap, and exclude the newline if there is.
// - We can only pass one token back
Expand Down
3 changes: 2 additions & 1 deletion web/book/src/reference/stdlib/transforms/join.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ join side:{inner|left|right|full} rel (condition)
relations and then filter the result by the condition. It supports two
additional features:
- _Names [`this` & `that`](../../syntax/keywords.md#this--that)_: Along name
`this`, which refers to the first input relation, `condition` can use name `that`, which refers to the second input relation.
`this`, which refers to the first input relation, `condition` can use name
`that`, which refers to the second input relation.
- _Self equality operator_: If the condition is an equality comparison between
two columns with the same name (i.e. `(this.col == that.col)`), it can be
expressed with only `(==col)`.
Expand Down
4 changes: 2 additions & 2 deletions web/prql-codemirror-demo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
"noFallthroughCasesInSwitch": true,
},
"include": ["src"]
"include": ["src"],
}

0 comments on commit 87d9a46

Please sign in to comment.