[flake8-simplify] Detect unnecessary None default for additional key expression types (SIM910)

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py

@@ -55,8 +55,3 @@ def foo(some_other):
 def foo():
     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
     age = dict.get("Cat", None)
-
-# https://github.com/astral-sh/ruff/issues/20341
-ages = {"Tom": 23, "Maria": 23, "Dog": 11}
-key_source = {"Thomas": "Tom"}
-age = ages.get(key_source.get("Thomas", "Tom"), None)

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910_preview.py

@@ -0,0 +1,32 @@
+# Method call as key
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+key_source = {"Thomas": "Tom"}
+age = ages.get(key_source.get("Thomas", "Tom"), None)
+
+# Property access as key
+class Data:
+    def __init__(self):
+        self.name = "Tom"
+
+data = Data()
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get(data.name, None)
+
+# Complex expression as key
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+key = "Tom" if True else "Maria"
+age = ages.get(key, None)
+
+# Function call as key
+def get_key():
+    return "Tom"
+
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get(get_key(), None)
+
+# OK - these should not trigger even in preview mode
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get("Tom")  # No default value
+
+ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+age = ages.get("Tom", "Unknown")  # Non-None default

crates/ruff_linter/src/preview.rs

@@ -218,3 +218,8 @@ pub(crate) const fn is_unnecessary_default_type_args_stubs_enabled(
 ) -> bool {
     settings.preview.is_enabled()
 }
+
+// https://github.com/astral-sh/ruff/pull/20343
+pub(crate) const fn is_sim910_expanded_key_support_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}

crates/ruff_linter/src/rules/flake8_simplify/mod.rs

@@ -60,6 +60,7 @@ mod tests {
     }
 
     #[test_case(Rule::SplitStaticString, Path::new("SIM905.py"))]
+    #[test_case(Rule::DictGetWithNoneDefault, Path::new("SIM910_preview.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "preview__{}_{}",

crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs

@@ -264,6 +264,11 @@ pub(crate) fn dict_get_with_none_default(checker: &Checker, expr: &Expr) {
     let Some(key) = args.first() else {
         return;
     };
+    if !crate::preview::is_sim910_expanded_key_support_enabled(checker.settings()) {
+        if !(key.is_literal_expr() || key.is_name_expr()) {
+            return;
+        }
+    }
     let Some(default) = args.get(1) else {
         return;
     };

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap

@@ -160,30 +160,10 @@ SIM910 [*] Use `dict.get("Cat")` instead of `dict.get("Cat", None)`
 56 |     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
 57 |     age = dict.get("Cat", None)
    |           ^^^^^^^^^^^^^^^^^^^^^
-58 |
-59 | # https://github.com/astral-sh/ruff/issues/20341
    |
 help: Replace `dict.get("Cat", None)` with `dict.get("Cat")`
 54 | # https://github.com/astral-sh/ruff/issues/18777
 55 | def foo():
 56 |     dict = {"Tom": 23, "Maria": 23, "Dog": 11}
    -     age = dict.get("Cat", None)
 57 +     age = dict.get("Cat")
-58 | 
-59 | # https://github.com/astral-sh/ruff/issues/20341
-60 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
-
-SIM910 [*] Use `ages.get(key_source.get("Thomas", "Tom"))` instead of `ages.get(key_source.get("Thomas", "Tom"), None)`
-  --> SIM910.py:62:7
-   |
-60 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
-61 | key_source = {"Thomas": "Tom"}
-62 | age = ages.get(key_source.get("Thomas", "Tom"), None)
-   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Replace `ages.get(key_source.get("Thomas", "Tom"), None)` with `ages.get(key_source.get("Thomas", "Tom"))`
-59 | # https://github.com/astral-sh/ruff/issues/20341
-60 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
-61 | key_source = {"Thomas": "Tom"}
-   - age = ages.get(key_source.get("Thomas", "Tom"), None)
-62 + age = ages.get(key_source.get("Thomas", "Tom"))

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM910_SIM910_preview.py.snap

@@ -0,0 +1,81 @@
+---
+source: crates/ruff_linter/src/rules/flake8_simplify/mod.rs
+---
+SIM910 [*] Use `ages.get(key_source.get("Thomas", "Tom"))` instead of `ages.get(key_source.get("Thomas", "Tom"), None)`
+ --> SIM910_preview.py:4:7
+  |
+2 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+3 | key_source = {"Thomas": "Tom"}
+4 | age = ages.get(key_source.get("Thomas", "Tom"), None)
+  |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 |
+6 | # Property access as key
+  |
+help: Replace `ages.get(key_source.get("Thomas", "Tom"), None)` with `ages.get(key_source.get("Thomas", "Tom"))`
+1 | # Method call as key
+2 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+3 | key_source = {"Thomas": "Tom"}
+  - age = ages.get(key_source.get("Thomas", "Tom"), None)
+4 + age = ages.get(key_source.get("Thomas", "Tom"))
+5 | 
+6 | # Property access as key
+7 | class Data:
+
+SIM910 [*] Use `ages.get(data.name)` instead of `ages.get(data.name, None)`
+  --> SIM910_preview.py:13:7
+   |
+11 | data = Data()
+12 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+13 | age = ages.get(data.name, None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^
+14 |
+15 | # Complex expression as key
+   |
+help: Replace `ages.get(data.name, None)` with `ages.get(data.name)`
+10 | 
+11 | data = Data()
+12 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get(data.name, None)
+13 + age = ages.get(data.name)
+14 | 
+15 | # Complex expression as key
+16 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+
+SIM910 [*] Use `ages.get(key)` instead of `ages.get(key, None)`
+  --> SIM910_preview.py:18:7
+   |
+16 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+17 | key = "Tom" if True else "Maria"
+18 | age = ages.get(key, None)
+   |       ^^^^^^^^^^^^^^^^^^^
+19 |
+20 | # Function call as key
+   |
+help: Replace `ages.get(key, None)` with `ages.get(key)`
+15 | # Complex expression as key
+16 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+17 | key = "Tom" if True else "Maria"
+   - age = ages.get(key, None)
+18 + age = ages.get(key)
+19 | 
+20 | # Function call as key
+21 | def get_key():
+
+SIM910 [*] Use `ages.get(get_key())` instead of `ages.get(get_key(), None)`
+  --> SIM910_preview.py:25:7
+   |
+24 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+25 | age = ages.get(get_key(), None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^
+26 |
+27 | # OK - these should not trigger even in preview mode
+   |
+help: Replace `ages.get(get_key(), None)` with `ages.get(get_key())`
+22 |     return "Tom"
+23 | 
+24 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get(get_key(), None)
+25 + age = ages.get(get_key())
+26 | 
+27 | # OK - these should not trigger even in preview mode
+28 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}