Issue #92: small readability improvements

Author: tozpeak

lib/analysis_options.yaml

@@ -45,6 +45,7 @@ custom_lint:
 
     - avoid_non_null_assertion
     - avoid_returning_widgets
+    - avoid_unnecessary_return_variable
     - avoid_unnecessary_setstate
     - avoid_unnecessary_type_assertions
     - avoid_unnecessary_type_casts
@@ -56,7 +57,6 @@ custom_lint:
     - cyclomatic_complexity:
       max_complexity: 10
 
-    - avoid_unnecessary_return_variable
     - double_literal_format
 
     - function_lines_of_code:

lib/src/lints/avoid_unnecessary_return_variable/avoid_unnecessary_return_variable_rule.dart

@@ -137,9 +137,8 @@ Rewrite the variable evaluation into return statement instead.""",
 
   bool _isSimpleIdentifierImmutable(SimpleIdentifier identifier) {
     switch (identifier.element) {
-      case final VariableElement2 variable
-          when variable.isFinal || variable.isConst:
-        return true;
+      case final VariableElement2 variable:
+        return variable.isFinal || variable.isConst;
 
       case ClassElement2 _:
         return true;