Merge pull request #411 from REditorSupport/fix_string_detection

fix raw string detection

Author: randy3k

src/fsm.c

@@ -35,8 +35,6 @@ void fsm_feed(fsm_state* state, const char c) {
                 return;
             } else {
                 state->raw_parse_state = 0;
-                state->double_quoted = 0;
-                state->single_quoted = 0;
             }
         } else if (state->raw_parse_state == 2) {
             if (c == '(' || c == '[' || c == '{') {
@@ -104,9 +102,7 @@ void fsm_feed(fsm_state* state, const char c) {
         return;
     }
 
-    if (c == 'R' || c == 'r') {
-        state->raw_parse_state = 1;
-    } else if (c == '\\') {
+    if (c == '\\') {
         state->escaped = 1;
     } else if (state->single_quoted || state->double_quoted || state->backticked) {
         // inside string or backticks
@@ -116,5 +112,7 @@ void fsm_feed(fsm_state* state, const char c) {
         state->single_quoted = 1;
     } else if (c == '"') {
         state->double_quoted = 1;
+    } else if (c == 'R' || c == 'r') {
+        state->raw_parse_state = 1;
     }
 }

tests/testthat/test-search.R

@@ -17,6 +17,9 @@ test_that("enclosed_by_quotes works as expected", {
     expect_true(enclosed("R\"-(a)\"hello_world", 9))
     expect_true(enclosed("'\\'hello_world", 4))
     expect_false(enclosed("'a'hello_world", 4))
+    #410
+    expect_true(enclosed("fun('free', )", 8))
+    expect_false(enclosed("fun('free', )", 9))
 })