Merge branch 'main' into gh-538/main/dsc_repo_schema_derive

Author: SteveL-MSFT

build.helpers.psm1

@@ -471,18 +471,29 @@ function Install-TreeSitter {
         [switch]$UseCFS
     )
 
+    begin {
+        $arguments = @(
+            'install',
+            'tree-sitter-cli',
+            '--version', '0.25.10'
+        )
+
+        if ($UseCFS) {
+            $arguments += '--config'
+            $arguments += '.cargo/config.toml'
+        }
+    }
+
     process {
         if (Test-CommandAvailable -Name 'tree-sitter') {
             Write-Verbose "tree-sitter already installed."
             return
         }
 
         Write-Verbose -Verbose "tree-sitter not found, installing..."
-        if ($UseCFS) {
-            cargo install tree-sitter-cli --config .cargo/config.toml
-        } else {
-            cargo install tree-sitter-cli
-        }
+
+        cargo @arguments
+
         if ($LASTEXITCODE -ne 0) {
             throw "Failed to install tree-sitter-cli"
         }
@@ -1289,7 +1300,7 @@ function Export-GrammarBinding {
             } finally {
                 Pop-Location
             }
-            
+
         }
     }
 
@@ -1358,9 +1369,13 @@ function Build-RustProject {
             cargo clean
         }
 
-        if ($Clippy) {
+        if ($Clippy -and !$Project.ClippyUnclean) {
             $clippyFlags = @()
-            cargo clippy @clippyFlags --% -- -Dwarnings --no-deps
+            if (!$Project.ClippyPedanticUnclean) {
+                cargo clippy @clippyFlags --% -- -Dclippy::pedantic --no-deps -Dwarnings
+            } else {
+                cargo clippy @clippyFlags --% -- -Dwarnings --no-deps
+            }
 
             if ($null -ne $LASTEXITCODE -and $LASTEXITCODE -ne 0) {
                 throw "Last exit code is $LASTEXITCODE, clippy failed for at least one project"

grammars/tree-sitter-dscexpression/.project.data.json

@@ -3,6 +3,7 @@
     "Kind": "Grammar",
     "IsRust": true,
     "ClippyUnclean": true,
+    "ClippyPedanticUnclean": true,
     "SkipTest": {
         "Windows": true
     }

grammars/tree-sitter-dscexpression/grammar.js

@@ -6,7 +6,7 @@ const PREC = {
   STRINGLITERAL: -11,
 }
 
-module.exports = grammar({
+export default grammar({
   name: 'dscexpression',
 
   extras: $ => ['\n', ' '],

grammars/tree-sitter-dscexpression/package.json

@@ -2,6 +2,7 @@
   "name": "tree-sitter-dscexpression",
   "version": "1.0.0",
   "description": "Dscexpression grammar for tree-sitter",
+  "type": "module",
   "repository": "github:tree-sitter/tree-sitter-dscexpression",
   "license": "MIT",
   "main": "bindings/node",

grammars/tree-sitter-ssh-server-config/.project.data.json

@@ -2,5 +2,6 @@
     "Name": "tree-sitter-ssh-server-config",
     "Kind": "Grammar",
     "IsRust": true,
-    "ClippyUnclean": true
+    "ClippyUnclean": true,
+    "ClippyPedanticUnclean": true
 }

grammars/tree-sitter-ssh-server-config/grammar.js

@@ -8,7 +8,7 @@ const PREC = {
   OPERATOR: 1
 }
 
-module.exports = grammar({
+export default grammar({
   name: 'ssh_server_config',
 
   extras: $ => [' ', '\t', '\r'],

grammars/tree-sitter-ssh-server-config/package.json

@@ -6,7 +6,6 @@ use std::str::Utf8Error;
 
 use indicatif::style::TemplateError;
 use thiserror::Error;
-use tracing::error;
 use tree_sitter::LanguageError;
 
 #[derive(Error, Debug)]