chore(lint): correct some spans (#10610)

* chore(lint): correct some spans

* update

Author: DaniPopes

crates/forge/tests/cli/lint.rs

@@ -70,10 +70,10 @@ forgetest!(can_use_config_ignore, |prj, cmd| {
     });
     cmd.arg("lint").assert_success().stderr_eq(str![[r#"
 note[mixed-case-variable]: mutable variables should use mixedCase
- [FILE]:6:9
+ [FILE]:6:17
   |
 6 |         uint256 VARIABLE_MIXED_CASE_INFO;
-  |         ---------------------------------
+  |                 ------------------------
   |
 
 
@@ -104,10 +104,10 @@ forgetest!(can_override_config_severity, |prj, cmd| {
     });
     cmd.arg("lint").args(["--severity", "info"]).assert_success().stderr_eq(str![[r#"
 note[mixed-case-variable]: mutable variables should use mixedCase
- [FILE]:6:9
+ [FILE]:6:17
   |
 6 |         uint256 VARIABLE_MIXED_CASE_INFO;
-  |         ---------------------------------
+  |                 ------------------------
   |
 
 

crates/lint/src/sol/gas/keccak.rs

@@ -1,12 +1,11 @@
-use solar_ast::{Expr, ExprKind};
-use solar_interface::kw;
-
 use super::AsmKeccak256;
 use crate::{
     declare_forge_lint,
     linter::EarlyLintPass,
     sol::{Severity, SolLint},
 };
+use solar_ast::{Expr, ExprKind};
+use solar_interface::kw;
 
 declare_forge_lint!(
     ASM_KECCAK256,

crates/lint/src/sol/gas/mod.rs

@@ -1,9 +1,9 @@
-mod keccak;
-use keccak::ASM_KECCAK256;
-
 use crate::{
     register_lints,
     sol::{EarlyLintPass, SolLint},
 };
 
+mod keccak;
+use keccak::ASM_KECCAK256;
+
 register_lints!((AsmKeccak256, (ASM_KECCAK256)));

crates/lint/src/sol/high/incorrect_shift.rs

@@ -1,11 +1,10 @@
-use solar_ast::{BinOp, BinOpKind, Expr, ExprKind};
-
 use super::IncorrectShift;
 use crate::{
     declare_forge_lint,
     linter::{EarlyLintPass, LintContext},
     sol::{Severity, SolLint},
 };
+use solar_ast::{BinOp, BinOpKind, Expr, ExprKind};
 
 declare_forge_lint!(
     INCORRECT_SHIFT,

crates/lint/src/sol/high/mod.rs

@@ -1,9 +1,9 @@
-mod incorrect_shift;
-use incorrect_shift::INCORRECT_SHIFT;
-
 use crate::{
     register_lints,
     sol::{EarlyLintPass, SolLint},
 };
 
+mod incorrect_shift;
+use incorrect_shift::INCORRECT_SHIFT;
+
 register_lints!((IncorrectShift, (INCORRECT_SHIFT)));

crates/lint/src/sol/info/mixed_case.rs

@@ -1,11 +1,10 @@
-use solar_ast::{ItemFunction, VariableDefinition};
-
 use super::{MixedCaseFunction, MixedCaseVariable};
 use crate::{
     declare_forge_lint,
     linter::{EarlyLintPass, LintContext},
     sol::{Severity, SolLint},
 };
+use solar_ast::{ItemFunction, VariableDefinition};
 
 declare_forge_lint!(
     MIXED_CASE_FUNCTION,
@@ -18,9 +17,8 @@ declare_forge_lint!(
 impl<'ast> EarlyLintPass<'ast> for MixedCaseFunction {
     fn check_item_function(&mut self, ctx: &LintContext<'_>, func: &'ast ItemFunction<'ast>) {
         if let Some(name) = func.header.name {
-            let name = name.as_str();
-            if !is_mixed_case(name, true) {
-                ctx.emit(&MIXED_CASE_FUNCTION, func.body_span);
+            if !is_mixed_case(name.as_str(), true) {
+                ctx.emit(&MIXED_CASE_FUNCTION, name.span);
             }
         }
     }
@@ -41,9 +39,8 @@ impl<'ast> EarlyLintPass<'ast> for MixedCaseVariable {
     ) {
         if var.mutability.is_none() {
             if let Some(name) = var.name {
-                let name = name.as_str();
-                if !is_mixed_case(name, false) {
-                    ctx.emit(&MIXED_CASE_VARIABLE, var.span);
+                if !is_mixed_case(name.as_str(), false) {
+                    ctx.emit(&MIXED_CASE_VARIABLE, name.span);
                 }
             }
         }

crates/lint/src/sol/info/mod.rs

@@ -1,3 +1,8 @@
+use crate::{
+    register_lints,
+    sol::{EarlyLintPass, SolLint},
+};
+
 mod mixed_case;
 use mixed_case::{MIXED_CASE_FUNCTION, MIXED_CASE_VARIABLE};
 
@@ -7,11 +12,6 @@ use pascal_case::PASCAL_CASE_STRUCT;
 mod screaming_snake_case;
 use screaming_snake_case::{SCREAMING_SNAKE_CASE_CONSTANT, SCREAMING_SNAKE_CASE_IMMUTABLE};
 
-use crate::{
-    register_lints,
-    sol::{EarlyLintPass, SolLint},
-};
-
 register_lints!(
     (PascalCaseStruct, (PASCAL_CASE_STRUCT)),
     (MixedCaseVariable, (MIXED_CASE_VARIABLE)),

crates/lint/src/sol/info/pascal_case.rs

@@ -1,11 +1,10 @@
-use solar_ast::ItemStruct;
-
 use super::PascalCaseStruct;
 use crate::{
     declare_forge_lint,
     linter::{EarlyLintPass, LintContext},
     sol::{Severity, SolLint},
 };
+use solar_ast::ItemStruct;
 
 declare_forge_lint!(
     PASCAL_CASE_STRUCT,
@@ -18,7 +17,7 @@ declare_forge_lint!(
 impl<'ast> EarlyLintPass<'ast> for PascalCaseStruct {
     fn check_item_struct(&mut self, ctx: &LintContext<'_>, strukt: &'ast ItemStruct<'ast>) {
         let name = strukt.name.as_str();
-        if !is_pascal_case(name) && name.len() > 1 {
+        if name.len() > 1 && !is_pascal_case(name) {
             ctx.emit(&PASCAL_CASE_STRUCT, strukt.name.span);
         }
     }

crates/lint/src/sol/info/screaming_snake_case.rs

@@ -1,11 +1,10 @@
-use solar_ast::{VarMut, VariableDefinition};
-
 use super::ScreamingSnakeCase;
 use crate::{
     declare_forge_lint,
     linter::{EarlyLintPass, LintContext},
     sol::{Severity, SolLint},
 };
+use solar_ast::{VarMut, VariableDefinition};
 
 declare_forge_lint!(
     SCREAMING_SNAKE_CASE_CONSTANT,

crates/lint/src/sol/med/div_mul.rs

@@ -1,11 +1,10 @@
-use solar_ast::{BinOp, BinOpKind, Expr, ExprKind};
-
 use super::DivideBeforeMultiply;
 use crate::{
     declare_forge_lint,
     linter::{EarlyLintPass, LintContext},
     sol::{Severity, SolLint},
 };
+use solar_ast::{BinOp, BinOpKind, Expr, ExprKind};
 
 declare_forge_lint!(
     DIVIDE_BEFORE_MULTIPLY,