Merge branch 'main' into pre-commit-ci-update-config

PRQL · Apr 23, 2024 · 3542b76 · 3542b76
2 parents b59ac2e + 1e9cb73
commit 3542b76
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/lint-megalinter.yaml b/.github/workflows/lint-megalinter.yaml
@@ -29,7 +29,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v7.10.0
+        uses: oxsecurity/megalinter@v7.11.0
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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**:

diff --git a/flake.lock b/flake.lock
diff --git a/grammars/README.md b/grammars/README.md
@@ -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

diff --git a/lutra/Taskfile.yml b/lutra/Taskfile.yml
@@ -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

diff --git a/prqlc/prqlc-parser/src/lexer.rs b/prqlc/prqlc-parser/src/lexer.rs
@@ -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

diff --git a/web/book/src/project/contributing/README.md b/web/book/src/project/contributing/README.md
@@ -98,4 +98,4 @@ general channels such as GitHub or Discord, feel free to reach out to:
 
 Thank you to those who have previously served on the core team:
 
-- [**@charlie-sanders**](https://github.com/charlie-sanders) — Charlie Sanders
+- **@charlie-sanders** — Charlie Sanders
diff --git a/web/book/src/reference/stdlib/transforms/join.md b/web/book/src/reference/stdlib/transforms/join.md
@@ -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)`.

diff --git a/web/playground/package-lock.json b/web/playground/package-lock.json
diff --git a/web/playground/package.json b/web/playground/package.json
@@ -17,7 +17,7 @@
     "@testing-library/jest-dom": "^6.4.0",
     "@testing-library/react": "^15.0.0",
     "@testing-library/user-event": "^14.5.0",
-    "monaco-editor": "^0.47.0",
+    "monaco-editor": "^0.48.0",
     "prql-js": "file:../../prqlc/bindings/js",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/web/prql-codemirror-demo/package-lock.json b/web/prql-codemirror-demo/package-lock.json
diff --git a/web/prql-codemirror-demo/package.json b/web/prql-codemirror-demo/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "typescript": "^5.3.2",
-    "vite": "^5.0.5"
+    "vite": "^5.0.13"
   },
   "dependencies": {
     "@codemirror/autocomplete": "^6.11.0",

diff --git a/web/prql-codemirror-demo/tsconfig.json b/web/prql-codemirror-demo/tsconfig.json
@@ -17,7 +17,7 @@
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
   },
-  "include": ["src"]
+  "include": ["src"],
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,4 +98,4 @@ general channels such as GitHub or Discord, feel free to reach out to:

		Thank you to those who have previously served on the core team:

		- [@charlie-sanders](https://github.com/charlie-sanders) — Charlie Sanders
		- @charlie-sanders — Charlie Sanders