clippy

fmt

Author: asukaminato0721

pyrefly/lib/state/lsp/quick_fixes/inline_method.rs

@@ -80,7 +80,7 @@ pub(crate) fn inline_method_code_actions(
         &function_def,
         &call,
         receiver_name.as_str(),
-        receiver_text.as_deref(),
+        receiver_text,
         module_info.contents(),
     )?;
     let return_expr = match function_def.body.as_slice() {
@@ -203,7 +203,7 @@ fn build_param_map(
         let arg_value = call
             .arguments
             .find_argument_value(param_name, positional_index)
-            .or_else(|| param.default.as_deref());
+            .or(param.default.as_deref());
         let arg_expr = arg_value?;
         let start = arg_expr.range().start().to_usize();
         let end = arg_expr.range().end().to_usize().min(source.len());
@@ -267,10 +267,10 @@ fn collect_param_replacements(
                     *invalid = true;
                     return;
                 }
-                if matches!(name.ctx, ExprContext::Load) {
-                    if let Some(replacement) = param_map.get(name.id.as_str()) {
-                        replacements.push((name.range(), replacement.clone()));
-                    }
+                if matches!(name.ctx, ExprContext::Load)
+                    && let Some(replacement) = param_map.get(name.id.as_str())
+                {
+                    replacements.push((name.range(), replacement.clone()));
                 }
             }
             _ => {}

pyrefly/lib/state/lsp/quick_fixes/inline_parameter.rs

@@ -131,21 +131,17 @@ fn collect_calls_to_definition(
     let mut calls = Vec::new();
     let mut name_calls = Vec::new();
     ast.visit(&mut |expr| {
-        if let Expr::Call(call) = expr {
-            if let Expr::Name(name) = call.func.as_ref() {
-                let defs = transaction.find_definition(
-                    handle,
-                    name.range.start(),
-                    FindPreference::default(),
-                );
-                if defs.iter().any(|def| {
-                    def.module.path() == module_info.path()
-                        && def.definition_range == definition_range
-                }) {
-                    calls.push(call.clone());
-                } else if name.id.as_str() == function_name {
-                    name_calls.push(call.clone());
-                }
+        if let Expr::Call(call) = expr
+            && let Expr::Name(name) = call.func.as_ref()
+        {
+            let defs =
+                transaction.find_definition(handle, name.range.start(), FindPreference::default());
+            if defs.iter().any(|def| {
+                def.module.path() == module_info.path() && def.definition_range == definition_range
+            }) {
+                calls.push(call.clone());
+            } else if name.id.as_str() == function_name {
+                name_calls.push(call.clone());
             }
         }
     });

pyrefly/lib/state/lsp/quick_fixes/inline_variable.rs

@@ -180,15 +180,15 @@ fn enclosing_scope_range(
 ) -> Option<TextRange> {
     let covering_nodes = Ast::locate_node(ast, definition_range.start());
     for node in covering_nodes {
-        if let Some(function_def) = node.as_stmt_function_def() {
-            if function_def.range().contains_range(definition_range) {
-                return Some(function_def.range());
-            }
+        if let Some(function_def) = node.as_stmt_function_def()
+            && function_def.range().contains_range(definition_range)
+        {
+            return Some(function_def.range());
         }
-        if let Some(class_def) = node.as_stmt_class_def() {
-            if class_def.range().contains_range(definition_range) {
-                return Some(class_def.range());
-            }
+        if let Some(class_def) = node.as_stmt_class_def()
+            && class_def.range().contains_range(definition_range)
+        {
+            return Some(class_def.range());
         }
     }
     let module_len = TextSize::try_from(module_len).ok()?;

pyrefly/lib/state/lsp/quick_fixes/mod.rs

@@ -9,8 +9,8 @@ pub(crate) mod extract_field;
 pub(crate) mod extract_function;
 mod extract_shared;
 pub(crate) mod extract_variable;
-pub(crate) mod move_members;
-pub(crate) mod move_module;
 pub(crate) mod inline_method;
 pub(crate) mod inline_parameter;
 pub(crate) mod inline_variable;
+pub(crate) mod move_members;
+pub(crate) mod move_module;

pyrefly/lib/test/lsp/lsp_interaction/basic.rs

@@ -36,9 +36,7 @@ fn test_initialize_basic() {
             "definitionProvider": true,
             "typeDefinitionProvider": true,
             "codeActionProvider": {
-                "codeActionKinds": ["quickfix", "refactor.extract", "refactor.move"]
-                "codeActionKinds": ["quickfix", "refactor.extract"]
-                "codeActionKinds": ["quickfix", "refactor.extract", "refactor.inline"]
+                "codeActionKinds": ["quickfix", "refactor.extract", "refactor.move", "refactor.inline"]
             },
             "completionProvider": {
                 "triggerCharacters": [".", "'", "\""]