fix(patterns): suppress R-VER46-01/02 for ShellVersion-guarded else branches

add_actor() and remove_actor() inside `else {}` branches of
`if (ShellVersion >= 46) { new_api() } else { old_api() }` guards
are correctly version-fenced and should not be flagged.

The previous guard-pattern only detected feature-check guards
(`if (obj.remove_actor)`), missing the common ShellVersion pattern
used by caffeine and hara-hachi-bu.

Extend guard-pattern for both rules with `|\\bShellVersion\\b` and
set guard-window: 5 so the backward scan covers typical 3-4 line
if/else blocks. Add fixture and assertions verifying both rules
are suppressed on guarded code and still fire on unguarded code.

Fixes: caffeine extension.js:721,829 false positives
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Solomon

rules/patterns.yaml

@@ -856,7 +856,8 @@
   category: version-compat
   fix: "Replace .add_actor(child) with .add_child(child)"
   min-version: 46
-  guard-pattern: "\\bif\\s*\\(.*\\.add_actor\\b"
+  guard-pattern: "\\bif\\s*\\(.*\\.add_actor\\b|\\bShellVersion\\b"
+  guard-window: 5
   compat-downgrade: true
 
 - id: R-VER46-02
@@ -867,7 +868,8 @@
   category: version-compat
   fix: "Replace .remove_actor(child) with .remove_child(child)"
   min-version: 46
-  guard-pattern: "\\bif\\s*\\(.*\\.remove_actor\\b"
+  guard-pattern: "\\bif\\s*\\(.*\\.remove_actor\\b|\\bShellVersion\\b"
+  guard-window: 5
   compat-downgrade: true
 
 - id: R-VER46-03

tests/fixtures/version-guard-remove-actor@test/extension.js

@@ -0,0 +1,34 @@
+import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
+
+const ShellVersion = parseFloat(Config.PACKAGE_VERSION);
+
+export default class VersionGuardExtension extends Extension {
+    enable() {
+        this._addActor();
+    }
+
+    _addActor() {
+        // Version-guarded compat code: add_actor() only runs on GNOME < 46
+        if (ShellVersion >= 46) {
+            this._box.add_child(this._actor);
+        } else {
+            this._box.add_actor(this._actor);
+        }
+    }
+
+    _removeActor() {
+        // Version-guarded compat code: remove_actor() only runs on GNOME < 46
+        if (ShellVersion >= 46) {
+            this._box.remove_child(this._actor);
+        } else {
+            this._box.remove_actor(this._actor);
+        }
+    }
+
+    disable() {
+        this._removeActor();
+        this._box = null;
+        this._actor = null;
+    }
+}

tests/fixtures/version-guard-remove-actor@test/metadata.json

@@ -0,0 +1,7 @@
+{
+    "uuid": "version-guard-remove-actor@test",
+    "name": "Version Guard Remove Actor Test",
+    "description": "Tests that add_actor/remove_actor inside ShellVersion else-branches are not flagged",
+    "shell-version": ["45", "46"],
+    "url": "https://github.com/test/version-guard-remove-actor"
+}

tests/run-tests.sh

@@ -473,6 +473,15 @@ assert_output_contains "fails on add_actor" "\[FAIL\].*R-VER46-01"
 assert_output_contains "fails on remove_actor" "\[FAIL\].*R-VER46-02"
 echo ""
 
+# --- version-guard-remove-actor ---
+echo "=== version-guard-remove-actor ==="
+run_lint "version-guard-remove-actor@test"
+assert_output_not_contains "no R-VER46-01 on ShellVersion-guarded add_actor" "\[FAIL\].*R-VER46-01"
+assert_output_not_contains "no R-VER46-01 warn on ShellVersion-guarded add_actor" "\[WARN\].*R-VER46-01"
+assert_output_not_contains "no R-VER46-02 on ShellVersion-guarded remove_actor" "\[FAIL\].*R-VER46-02"
+assert_output_not_contains "no R-VER46-02 warn on ShellVersion-guarded remove_actor" "\[WARN\].*R-VER46-02"
+echo ""
+
 # --- gnome47-compat ---
 echo "=== gnome47-compat ==="
 run_lint "gnome47-compat@test"