refactor: rename branches to branch_exit_points in highlight_related

Author: roife

crates/ide/src/highlight_related.rs

@@ -39,7 +39,7 @@ pub struct HighlightRelatedConfig {
     pub break_points: bool,
     pub closure_captures: bool,
     pub yield_points: bool,
-    pub branches: bool,
+    pub branch_exit_points: bool,
 }
 
 type HighlightMap = FxHashMap<EditionedFileId, FxHashSet<HighlightedRange>>;
@@ -85,8 +85,8 @@ pub(crate) fn highlight_related(
         T![fn] | T![return] | T![->] if config.exit_points => {
             highlight_exit_points(sema, token).remove(&file_id)
         }
-        T![match] | T![=>] | T![if] if config.branches => {
-            highlight_branches(sema, token).remove(&file_id)
+        T![match] | T![=>] | T![if] if config.branch_exit_points => {
+            highlight_branch_exit_points(sema, token).remove(&file_id)
         }
         T![await] | T![async] if config.yield_points => {
             highlight_yield_points(sema, token).remove(&file_id)
@@ -834,7 +834,7 @@ mod tests {
         references: true,
         closure_captures: true,
         yield_points: true,
-        branches: true,
+        branch_exit_points: true,
     };
 
     #[track_caller]

crates/rust-analyzer/src/config.rs

@@ -94,7 +94,7 @@ config_data! {
 
 
         /// Enables highlighting of related return values while the cursor is on any `match`, `if`, or match arm arrow (`=>`).
-        highlightRelated_branches_enable: bool = true,
+        highlightRelated_branchExitPoints_enable: bool = true,
         /// Enables highlighting of related references while the cursor is on `break`, `loop`, `while`, or `for` keywords.
         highlightRelated_breakPoints_enable: bool = true,
         /// Enables highlighting of all captures of a closure while the cursor is on the `|` or move keyword of a closure.
@@ -1596,7 +1596,7 @@ impl Config {
             exit_points: self.highlightRelated_exitPoints_enable().to_owned(),
             yield_points: self.highlightRelated_yieldPoints_enable().to_owned(),
             closure_captures: self.highlightRelated_closureCaptures_enable().to_owned(),
-            branches: self.highlightRelated_branches_enable().to_owned(),
+            branch_exit_points: self.highlightRelated_branchExitPoints_enable().to_owned(),
         }
     }
 

docs/book/src/configuration_generated.md

@@ -492,7 +492,7 @@ also need to add the folders to Code's `files.watcherExclude`.
  Controls file watching implementation.
 
 
-**rust-analyzer.highlightRelated.branches.enable** (default: true)
+**rust-analyzer.highlightRelated.branchExitPoints.enable** (default: true)
 
  Enables highlighting of related return values while the cursor is on any `match`, `if`, or match arm arrow (`=>`).
 

editors/code/package.json

@@ -1521,7 +1521,7 @@
             {
                 "title": "highlightRelated",
                 "properties": {
-                    "rust-analyzer.highlightRelated.branches.enable": {
+                    "rust-analyzer.highlightRelated.branchExitPoints.enable": {
                         "markdownDescription": "Enables highlighting of related return values while the cursor is on any `match`, `if`, or match arm arrow (`=>`).",
                         "default": true,
                         "type": "boolean"