improve imvalid_comparisons

BrettMayson · Oct 19, 2024 · 42bc74d · 42bc74d
1 parent 34ec40c
commit 42bc74d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/hls/package-lock.json b/hls/package-lock.json
diff --git a/hls/package.json b/hls/package.json
@@ -154,6 +154,7 @@
     "vscode-uri": "^3.0.8"
   },
   "dependencies": {
+    "hemtt": "file:",
     "portfinder": "^1.0.32",
     "vscode-languageclient": "^9.0.1"
   }

diff --git a/libs/sqf/src/analyze/lints/s21_invalid_comparisons.rs b/libs/sqf/src/analyze/lints/s21_invalid_comparisons.rs
@@ -345,27 +345,18 @@ fn check_issue(a: &Comparison, b: &Comparison) -> Option<ComparisonIssue> {
                     span_b: b_span,
                 })
             } else {
-                Some(ComparisonIssue {
-                    issue: ComparisonIssueType::Impossible,
-                    span_a: a_span,
-                    span_b: b_span,
-                })
+                None
             }
         }
-        (Comparison::NotEqual(_, num_a, _), Comparison::Equal(_, num_b, _))
-        | (Comparison::Equal(_, num_a, _), Comparison::NotEqual(_, num_b, _)) => {
+        (Comparison::NotEqual(_, num_a, _), Comparison::Equal(_, num_b, _)) => {
             if num_a == num_b {
                 Some(ComparisonIssue {
                     issue: ComparisonIssueType::Impossible,
                     span_a: a_span,
                     span_b: b_span,
                 })
             } else {
-                Some(ComparisonIssue {
-                    issue: ComparisonIssueType::Overlapping,
-                    span_a: a_span,
-                    span_b: b_span,
-                })
+                None
             }
         }
         _ => None,

diff --git a/libs/sqf/tests/lints/s21_invalid_comparisons/source.sqf b/libs/sqf/tests/lints/s21_invalid_comparisons/source.sqf
@@ -16,3 +16,4 @@ if (_x < 20 && _x < 10) then {
     systemChat "This is wasteful";
 };
 
+if (_key != 1 && _key != 2 && _key != 3) exitWith {false};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ if (_x < 20 && _x < 10) then {
		systemChat "This is wasteful";
		};

		if (_key != 1 && _key != 2 && _key != 3) exitWith {false};