Run additional checks from script/clippy if local (#29768)

Cole Miller created 7 months ago

Should cut down on the number of CI cycles if you're forgetful like I
am!

Release Notes:

- N/A

Change summary

crates/dap/src/adapters.rs                | 5 +----
crates/debugger_ui/src/session/running.rs | 2 +-
crates/outline_panel/src/outline_panel.rs | 4 ++--
crates/project/src/project_settings.rs    | 2 +-
extensions/EXTRACTION.md                  | 2 +-
script/clippy                             | 9 +++++++++
typos.toml                                | 6 +++++-
7 files changed, 20 insertions(+), 10 deletions(-)

Detailed changes

crates/dap/src/adapters.rs

@@ -444,10 +444,7 @@ pub trait DebugAdapter: 'static + Send + Sync {
         log::info!("Getting latest version of debug adapter {}", self.name());
         delegate.update_status(self.name(), DapStatus::CheckingForUpdate);
         if let Some(version) = self.fetch_latest_adapter_version(delegate).await.log_err() {
-            log::info!(
-                "Installiing latest version of debug adapter {}",
-                self.name()
-            );
+            log::info!("Installing latest version of debug adapter {}", self.name());
             delegate.update_status(self.name(), DapStatus::Downloading);
             match self.install_binary(version, delegate).await {
                 Ok(_) => {

crates/debugger_ui/src/session/running.rs

@@ -188,7 +188,7 @@ impl Render for SubView {
                 cx.notify();
             }))
             .size_full()
-            // Add border uncoditionally to prevent layout shifts on focus changes.
+            // Add border unconditionally to prevent layout shifts on focus changes.
             .border_1()
             .when(self.pane_focus_handle.contains_focused(window, cx), |el| {
                 el.border_color(cx.theme().colors().pane_focused_border)

crates/outline_panel/src/outline_panel.rs

@@ -646,7 +646,7 @@ struct ActiveItem {
     item_handle: Box<dyn WeakItemHandle>,
     active_editor: WeakEntity<Editor>,
     _buffer_search_subscription: Subscription,
-    _editor_subscrpiption: Subscription,
+    _editor_subscription: Subscription,
 }
 
 #[derive(Debug)]
@@ -2962,7 +2962,7 @@ impl OutlinePanel {
         );
         self.active_item = Some(ActiveItem {
             _buffer_search_subscription: buffer_search_subscription,
-            _editor_subscrpiption: subscribe_for_editor_events(&new_active_editor, window, cx),
+            _editor_subscription: subscribe_for_editor_events(&new_active_editor, window, cx),
             item_handle: new_active_item.downgrade_item(),
             active_editor: new_active_editor.downgrade(),
         });

crates/project/src/project_settings.rs

@@ -129,7 +129,7 @@ pub struct InlineDiagnosticsSettings {
     /// Default: false
     #[serde(default)]
     pub enabled: bool,
-    /// Whether to only show the inline diaganostics after a delay after the
+    /// Whether to only show the inline diagnostics after a delay after the
     /// last editor event.
     ///
     /// Default: 150

extensions/EXTRACTION.md

@@ -145,7 +145,7 @@ git push origin v${NEW_VERSION}
 rm -rf extensions/$LANGNAME
 sed -i '' "/extensions\/$LANGNAME/d" Cargo.toml
 cargo check
-git checkoout -b remove_$LANGNAME
+git checkout -b remove_$LANGNAME
 git add extensions/$LANGNAME
 git add Cargo.toml Cargo.lock extensions/$LANGNAME
 git commit -m "Migrate to $LANGNAME extension to zed-extensions/$LANGNAME"

script/clippy

@@ -8,3 +8,12 @@ fi
 
 set -x
 "${CARGO:-cargo}" clippy "$@" --release --all-targets --all-features -- --deny warnings
+
+# If local, run other checks if we have the tools installed.
+if [[ -z "${GITHUB_ACTIONS+x}" ]]; then
+    which cargo-machete >/dev/null 2>&1 || exit 0
+    cargo machete
+
+    which typos >/dev/null 2>&1 || exit 0
+    typos --config typos.toml
+fi

typos.toml

@@ -46,6 +46,8 @@ extend-exclude = [
     "script/danger/dangerfile.ts",
     # Eval examples for prompts and criteria
     "crates/eval/src/examples/",
+    # typos-cli doesn't understand our `vˇariable` markup
+    "crates/editor/src/hover_links.rs"
 ]
 
 [default]
@@ -63,6 +65,8 @@ extend-ignore-re = [
     # macOS version
     "Big Sur",
     # Not an actual typo but an intentionally invalid color, in `color_extractor`
-    "#fof"
+    "#fof",
+    # Stropped version of reserved keyword `type`
+    "typ"
 ]
 check-filename = true