Merge pull request #49 from rust-lang/code-commands

Code commands

Author: technetos

src/commands.rs

@@ -43,9 +43,17 @@ impl Commands {
             .filter(|segment| segment.len() > 0)
             .enumerate()
             .for_each(|(i, segment)| {
-                if segment.starts_with("[") && segment.ends_with("]") {
+                if segment.starts_with("```\n") && segment.ends_with("```") {
                     state = add_space(&mut self.state_machine, state, i);
-                    state = add_quoted_dynamic_segment(&mut self.state_machine, state);
+                    state = add_code_segment_multi_line(&mut self.state_machine, state);
+                    param_names.push(&segment[4..segment.len() - 3]);
+                } else if segment.starts_with("```") && segment.ends_with("```") {
+                    state = add_space(&mut self.state_machine, state, i);
+                    state = add_code_segment_single_line_long(&mut self.state_machine, state);
+                    param_names.push(&segment[3..segment.len() - 3]);
+                } else if segment.starts_with("`") && segment.ends_with("`") {
+                    state = add_space(&mut self.state_machine, state, i);
+                    state = add_code_segment_single_line_short(&mut self.state_machine, state);
                     param_names.push(&segment[1..segment.len() - 1]);
                 } else if segment.starts_with("{") && segment.ends_with("}") {
                     state = add_space(&mut self.state_machine, state, i);
@@ -99,7 +107,10 @@ impl Commands {
 #[inline]
 fn add_space(state_machine: &mut StateMachine, mut state: usize, i: usize) -> usize {
     if i > 0 {
-        state = state_machine.add(state, CharacterSet::from_char(' '));
+        let mut char_set = CharacterSet::from_char(' ');
+        char_set.insert('\n');
+
+        state = state_machine.add(state, char_set);
         state_machine.add_next_state(state, state);
     }
     state
@@ -129,13 +140,60 @@ fn add_remaining_segment(state_machine: &mut StateMachine, mut state: usize) ->
 }
 
 #[inline]
-fn add_quoted_dynamic_segment(state_machine: &mut StateMachine, mut state: usize) -> usize {
-    state = state_machine.add(state, CharacterSet::from_char('"'));
+fn add_code_segment_multi_line(state_machine: &mut StateMachine, mut state: usize) -> usize {
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+
+    let lambda = state;
+
+    let mut char_set = CharacterSet::any();
+    char_set.remove('`');
+    char_set.remove(' ');
+    char_set.remove('\n');
+    state = state_machine.add(state, char_set);
+    state_machine.add_next_state(state, state);
+
+    state = state_machine.add(state, CharacterSet::from_char('\n'));
+
+    state_machine.add_next_state(lambda, state);
+
+    state = state_machine.add(state, CharacterSet::any());
+    state_machine.add_next_state(state, state);
+    state_machine.start_parse(state);
+    state_machine.end_parse(state);
+
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+
+    state
+}
+
+#[inline]
+fn add_code_segment_single_line_long(state_machine: &mut StateMachine, mut state: usize) -> usize {
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::any());
+    state_machine.add_next_state(state, state);
+    state_machine.start_parse(state);
+    state_machine.end_parse(state);
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
+
+    state
+}
+
+#[inline]
+fn add_code_segment_single_line_short(state_machine: &mut StateMachine, mut state: usize) -> usize {
+    state = state_machine.add(state, CharacterSet::from_char('`'));
     state = state_machine.add(state, CharacterSet::any());
     state_machine.add_next_state(state, state);
     state_machine.start_parse(state);
     state_machine.end_parse(state);
-    state = state_machine.add(state, CharacterSet::from_char('"'));
+    state = state_machine.add(state, CharacterSet::from_char('`'));
 
     state
 }