Don't crash on unlinked includes, fixes #37

trishume · Mar 18, 2017 · 8ea3944 · 8ea3944
1 parent 7d4eb1b
commit 8ea3944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/parsing/syntax_definition.rs b/src/parsing/syntax_definition.rs
@@ -134,7 +134,7 @@ impl Iterator for MatchIter {
                             ContextReference::Direct(ref ctx_ptr) => {
                                 ctx_ptr.link.upgrade().unwrap()
                             }
-                            _ => panic!("Can only iterate patterns after linking: {:?}", ctx_ref),
+                            _ => return self.next(), // skip this and move onto the next one
                         };
                         self.ctx_stack.push(ctx_ptr);
                         self.index_stack.push(0);

diff --git a/testdata/parser_tests.sublime-syntax b/testdata/parser_tests.sublime-syntax
@@ -4,6 +4,7 @@ name: Used by tests in src/parsing/parser.rs
 scope: source.test
 contexts:
   main:
+    - include: test_does_not_crash_on_unlinkable_context
     - match: '#infinite_seeming_loop_test'
       scope: keyword.test
       push: infinite_seeming_loop_c