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

Antonio Scandurra created 4 years ago

Change summary

crates/editor/src/editor.rs | 8 ++++++++
1 file changed, 8 insertions(+)

Detailed changes

crates/editor/src/editor.rs

@@ -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,