From e7540d2833cd436691aed7dad8c71090e02a3a7f Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@icloud.com>
Date: Wed, 10 Aug 2022 09:11:06 -0700
Subject: [PATCH] Changed CI and default.json to run clippy

---
 .github/workflows/ci.yml     |  6 +++++-
 assets/settings/default.json | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e596fad9bd1a051653fa5398bae2acc80b9441c5..e54324c8c989afe195b5f8423cde9d93fb196f22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
         run: |
           rustup set profile minimal
           rustup update stable
+          rustup component add clippy
           rustup target add wasm32-wasi
 
       - name: Install Node
@@ -39,7 +40,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           clean: false
-
+          
+      - name: Run clippy
+        run: cargo clippy --workspace -- -D warnings
+        
       - name: Run tests
         run: cargo test --workspace --no-fail-fast
     
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 33eb64e2019992ffca8cc94242ff12b5dcec19b6..9cf915d1a6f1c69a55b93686407f10e8319b9d08 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -145,5 +145,22 @@
             "tab_size": 2
         }
     },
-    "lsp": {}
+    //LSP Specific settings.
+    "lsp": {
+        //Specify the LSP name as a key here.
+        //As of 8/10/22, supported LSPs are:
+        //pyright
+        //gopls
+        //rust-analyzer
+        //typescript-language-server
+        //vscode-json-languageserver
+        "rust_analyzer": {
+            //These initialization options are merged into Zed's defaults
+            "initialization_options": {
+                "checkOnSave": {
+                    "command": "clippy"
+                }
+            }
+        }
+    }
 }