Navigate tabstops on tab even if the top of stack is a BracketPairState

2022-02-02 09:04:57 +01:00
parent 6ff45f2ade
commit 79408464ea
1 changed files with 8 additions and 0 deletions
@@ -1810,6 +1810,14 @@ impl Editor {
    pub fn move_to_snippet_tabstop(&mut self, bias: Bias, cx: &mut ViewContext<Self>) -> bool {
        let buffer = self.buffer.read(cx).snapshot(cx);
        let old_selections = self.local_selections::<usize>(cx);
+
+        for (ix, region_state) in self.action_region_stack.iter().enumerate().rev() {
+            if let ActionRegionState::Snippet { .. } = region_state {
+                self.action_region_stack.truncate(ix + 1);
+                break;
+            }
+        }
+
        if let Some(region_state) = self.action_region_stack.last_mut() {
            if let ActionRegionState::Snippet {
                ranges,