diff --git a/DESCRIPTION b/DESCRIPTION index b9c69e888..b3b82d4f7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -48,6 +48,7 @@ Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate", "pkgapi::api_roclet")) RoxygenNote: 7.2.1 Config/testthat/edition: 3 +Config/testthat/parallel: true Collate: 'addins.R' 'communicate.R' diff --git a/inst/WORDLIST b/inst/WORDLIST index 0fb9d4363..a35747ab0 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -30,6 +30,7 @@ coventions covr cran cre +cynkra datastructures dec deps @@ -95,6 +96,7 @@ ixmypi ized Jupyterlab Kirill +kirill knitr krlmlr labelled @@ -128,6 +130,7 @@ nph NUM oldrel oneliner +ORCID os ourself packagemanager @@ -149,8 +152,8 @@ prettycode PRs purrr qmd -questionr Qmd +questionr rcmdcheck RcppExports rds diff --git a/tests/testthat/alignment/fun-decs-in_tree b/tests/testthat/alignment/fun-decs-in_tree new file mode 100644 index 000000000..4ff6219f9 --- /dev/null +++ b/tests/testthat/alignment/fun-decs-in_tree @@ -0,0 +1,224 @@ +ROOT (token: short_text [lag_newlines/spaces] {pos_id}) + ¦--COMMENT: # ali [0/0] {1} + ¦--expr: funct [1/0] {2} + ¦ ¦--FUNCTION: funct [0/0] {3} + ¦ ¦--'(': ( [0/0] {4} + ¦ ¦--SYMBOL_FORMALS: x [0/3] {5} + ¦ ¦--EQ_FORMALS: = [0/1] {6} + ¦ ¦--expr: NULL [0/0] {8} + ¦ ¦ °--NULL_CONST: NULL [0/0] {7} + ¦ ¦--',': , [0/9] {9} + ¦ ¦--SYMBOL_FORMALS: tt [1/2] {10} + ¦ ¦--EQ_FORMALS: = [0/1] {11} + ¦ ¦--expr: NULL [0/0] {13} + ¦ ¦ °--NULL_CONST: NULL [0/0] {12} + ¦ ¦--',': , [0/9] {14} + ¦ ¦--SYMBOL_FORMALS: ayz [1/1] {15} + ¦ ¦--EQ_FORMALS: = [0/1] {16} + ¦ ¦--expr: NULL [0/0] {18} + ¦ ¦ °--NULL_CONST: NULL [0/0] {17} + ¦ ¦--')': ) [0/1] {19} + ¦ °--expr: {} [0/0] {20} + ¦ ¦--'{': { [0/0] {21} + ¦ °--'}': } [0/0] {22} + ¦--COMMENT: # ali [3/0] {23} + ¦--expr: k <- [1/0] {24} + ¦ ¦--expr: k [0/1] {26} + ¦ ¦ °--SYMBOL: k [0/0] {25} + ¦ ¦--LEFT_ASSIGN: <- [0/1] {27} + ¦ °--expr: funct [0/0] {28} + ¦ ¦--FUNCTION: funct [0/0] {29} + ¦ ¦--'(': ( [0/0] {30} + ¦ ¦--SYMBOL_FORMALS: x [0/3] {31} + ¦ ¦--EQ_FORMALS: = [0/1] {32} + ¦ ¦--expr: NULL [0/0] {34} + ¦ ¦ °--NULL_CONST: NULL [0/0] {33} + ¦ ¦--',': , [0/14] {35} + ¦ ¦--SYMBOL_FORMALS: aq [1/2] {36} + ¦ ¦--EQ_FORMALS: = [0/1] {37} + ¦ ¦--expr: NULL [0/0] {39} + ¦ ¦ °--NULL_CONST: NULL [0/0] {38} + ¦ ¦--',': , [0/14] {40} + ¦ ¦--SYMBOL_FORMALS: ayz [1/1] {41} + ¦ ¦--EQ_FORMALS: = [0/1] {42} + ¦ ¦--expr: NULL [0/0] {44} + ¦ ¦ °--NULL_CONST: NULL [0/0] {43} + ¦ ¦--')': ) [0/1] {45} + ¦ °--expr: {} [0/0] {46} + ¦ ¦--'{': { [0/0] {47} + ¦ °--'}': } [0/0] {48} + ¦--COMMENT: # ali [3/0] {49} + ¦--expr: funct [1/0] {50} + ¦ ¦--FUNCTION: funct [0/0] {51} + ¦ ¦--'(': ( [0/0] {52} + ¦ ¦--SYMBOL_FORMALS: x [0/3] {53} + ¦ ¦--EQ_FORMALS: = [0/2] {54} + ¦ ¦--expr: 2 [0/0] {56} + ¦ ¦ °--NUM_CONST: 2 [0/0] {55} + ¦ ¦--',': , [0/9] {57} + ¦ ¦--SYMBOL_FORMALS: tt [1/2] {58} + ¦ ¦--EQ_FORMALS: = [0/2] {59} + ¦ ¦--expr: 1 [0/0] {61} + ¦ ¦ °--NUM_CONST: 1 [0/0] {60} + ¦ ¦--',': , [0/9] {62} + ¦ ¦--SYMBOL_FORMALS: ayz [1/1] {63} + ¦ ¦--EQ_FORMALS: = [0/1] {64} + ¦ ¦--expr: 99 [0/0] {66} + ¦ ¦ °--NUM_CONST: 99 [0/0] {65} + ¦ ¦--')': ) [0/1] {67} + ¦ °--expr: {} [0/0] {68} + ¦ ¦--'{': { [0/0] {69} + ¦ °--'}': } [0/0] {70} + ¦--COMMENT: # ali [2/0] {71} + ¦--expr: funct [1/0] {72} + ¦ ¦--FUNCTION: funct [0/0] {73} + ¦ ¦--'(': ( [0/0] {74} + ¦ ¦--SYMBOL_FORMALS: x [0/1] {75} + ¦ ¦--EQ_FORMALS: = [0/4] {76} + ¦ ¦--expr: 2 [0/0] {78} + ¦ ¦ °--NUM_CONST: 2 [0/0] {77} + ¦ ¦--',': , [0/9] {79} + ¦ ¦--SYMBOL_FORMALS: tt [1/1] {80} + ¦ ¦--EQ_FORMALS: = [0/3] {81} + ¦ ¦--expr: 1 [0/0] {83} + ¦ ¦ °--NUM_CONST: 1 [0/0] {82} + ¦ ¦--',': , [0/9] {84} + ¦ ¦--SYMBOL_FORMALS: ayz [1/1] {85} + ¦ ¦--EQ_FORMALS: = [0/1] {86} + ¦ ¦--expr: 99 [0/0] {88} + ¦ ¦ °--NUM_CONST: 99 [0/0] {87} + ¦ ¦--')': ) [0/1] {89} + ¦ °--expr: {} [0/0] {90} + ¦ ¦--'{': { [0/0] {91} + ¦ °--'}': } [0/0] {92} + ¦--COMMENT: # not [3/0] {93} + ¦--expr: k <- [1/0] {94} + ¦ ¦--expr: k [0/1] {96} + ¦ ¦ °--SYMBOL: k [0/0] {95} + ¦ ¦--LEFT_ASSIGN: <- [0/1] {97} + ¦ °--expr: funct [0/0] {98} + ¦ ¦--FUNCTION: funct [0/0] {99} + ¦ ¦--'(': ( [0/0] {100} + ¦ ¦--SYMBOL_FORMALS: x [0/1] {101} + ¦ ¦--EQ_FORMALS: = [0/3] {102} + ¦ ¦--expr: fish [0/0] {104} + ¦ ¦ °--SYMBOL: fish [0/0] {103} + ¦ ¦--',': , [0/14] {105} + ¦ ¦--SYMBOL_FORMALS: aq [1/1] {106} + ¦ ¦--EQ_FORMALS: = [0/5] {107} + ¦ ¦--expr: 21 [0/0] {109} + ¦ ¦ °--NUM_CONST: 21 [0/0] {108} + ¦ ¦--',': , [0/14] {110} + ¦ ¦--SYMBOL_FORMALS: ayz [1/1] {111} + ¦ ¦--EQ_FORMALS: = [0/1] {112} + ¦ ¦--expr: t(322 [0/0] {113} + ¦ ¦ ¦--expr: t [0/0] {115} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: t [0/0] {114} + ¦ ¦ ¦--'(': ( [0/0] {116} + ¦ ¦ ¦--expr: 322 [0/0] {118} + ¦ ¦ ¦ °--NUM_CONST: 322 [0/0] {117} + ¦ ¦ °--')': ) [0/0] {119} + ¦ ¦--')': ) [0/1] {120} + ¦ °--expr: {} [0/0] {121} + ¦ ¦--'{': { [0/0] {122} + ¦ °--'}': } [0/0] {123} + ¦--COMMENT: # ali [2/0] {124} + ¦--expr: k <- [1/0] {125} + ¦ ¦--expr: k [0/1] {127} + ¦ ¦ °--SYMBOL: k [0/0] {126} + ¦ ¦--LEFT_ASSIGN: <- [0/1] {128} + ¦ °--expr: funct [0/0] {129} + ¦ ¦--FUNCTION: funct [0/0] {130} + ¦ ¦--'(': ( [0/0] {131} + ¦ ¦--SYMBOL_FORMALS: x [0/1] {132} + ¦ ¦--EQ_FORMALS: = [0/1] {133} + ¦ ¦--expr: flus( [0/0] {134} + ¦ ¦ ¦--expr: flus [0/0] {136} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: flus [0/0] {135} + ¦ ¦ ¦--'(': ( [0/0] {137} + ¦ ¦ ¦--expr: we [0/0] {139} + ¦ ¦ ¦ °--SYMBOL: we [0/0] {138} + ¦ ¦ °--')': ) [0/0] {140} + ¦ ¦--',': , [0/14] {141} + ¦ ¦--SYMBOL_FORMALS: aq [1/1] {142} + ¦ ¦--EQ_FORMALS: = [0/2] {143} + ¦ ¦--expr: x - 2 [0/0] {144} + ¦ ¦ ¦--expr: x [0/1] {146} + ¦ ¦ ¦ °--SYMBOL: x [0/0] {145} + ¦ ¦ ¦--'-': - [0/1] {147} + ¦ ¦ °--expr: 22 [0/0] {149} + ¦ ¦ °--NUM_CONST: 22 [0/0] {148} + ¦ ¦--',': , [0/1] {150} + ¦ ¦--SYMBOL_FORMALS: k [0/1] {151} + ¦ ¦--EQ_FORMALS: = [0/1] {152} + ¦ ¦--expr: 22 [0/0] {154} + ¦ ¦ °--NUM_CONST: 22 [0/0] {153} + ¦ ¦--',': , [0/14] {155} + ¦ ¦--SYMBOL_FORMALS: ayz [1/1] {156} + ¦ ¦--EQ_FORMALS: = [0/1] {157} + ¦ ¦--expr: m(jk5 [0/0] {158} + ¦ ¦ ¦--expr: m [0/0] {160} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: m [0/0] {159} + ¦ ¦ ¦--'(': ( [0/0] {161} + ¦ ¦ ¦--expr: jk5 [0/0] {163} + ¦ ¦ ¦ °--SYMBOL: jk5 [0/0] {162} + ¦ ¦ °--')': ) [0/0] {164} + ¦ ¦--',': , [0/1] {165} + ¦ ¦--SYMBOL_FORMALS: xfea [0/1] {166} + ¦ ¦--EQ_FORMALS: = [0/2] {167} + ¦ ¦--expr: 3 [0/0] {169} + ¦ ¦ °--NUM_CONST: 3 [0/0] {168} + ¦ ¦--')': ) [0/1] {170} + ¦ °--expr: {} [0/0] {171} + ¦ ¦--'{': { [0/0] {172} + ¦ °--'}': } [0/0] {173} + ¦--COMMENT: # ali [3/0] {174} + °--expr: k <- [1/0] {175} + ¦--expr: k [0/1] {177} + ¦ °--SYMBOL: k [0/0] {176} + ¦--LEFT_ASSIGN: <- [0/1] {178} + °--expr: funct [0/0] {179} + ¦--FUNCTION: funct [0/0] {180} + ¦--'(': ( [0/0] {181} + ¦--SYMBOL_FORMALS: x [0/1] {182} + ¦--EQ_FORMALS: = [0/1] {183} + ¦--expr: flus( [0/0] {184} + ¦ ¦--expr: flus [0/0] {186} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: flus [0/0] {185} + ¦ ¦--'(': ( [0/0] {187} + ¦ ¦--expr: we [0/0] {189} + ¦ ¦ °--SYMBOL: we [0/0] {188} + ¦ °--')': ) [0/0] {190} + ¦--',': , [0/14] {191} + ¦--SYMBOL_FORMALS: aq [1/1] {192} + ¦--EQ_FORMALS: = [0/2] {193} + ¦--expr: x - 2 [0/0] {194} + ¦ ¦--expr: x [0/1] {196} + ¦ ¦ °--SYMBOL: x [0/0] {195} + ¦ ¦--'-': - [0/1] {197} + ¦ °--expr: 22 [0/0] {199} + ¦ °--NUM_CONST: 22 [0/0] {198} + ¦--',': , [0/4] {200} + ¦--SYMBOL_FORMALS: k [0/1] {201} + ¦--EQ_FORMALS: = [0/1] {202} + ¦--expr: 22 [0/0] {204} + ¦ °--NUM_CONST: 22 [0/0] {203} + ¦--',': , [0/14] {205} + ¦--SYMBOL_FORMALS: ayz [1/1] {206} + ¦--EQ_FORMALS: = [0/1] {207} + ¦--expr: m(jk5 [0/0] {208} + ¦ ¦--expr: m [0/0] {210} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: m [0/0] {209} + ¦ ¦--'(': ( [0/0] {211} + ¦ ¦--expr: jk5 [0/0] {213} + ¦ ¦ °--SYMBOL: jk5 [0/0] {212} + ¦ °--')': ) [0/0] {214} + ¦--',': , [0/1] {215} + ¦--SYMBOL_FORMALS: xfea [0/1] {216} + ¦--EQ_FORMALS: = [0/2] {217} + ¦--expr: 3 [0/0] {219} + ¦ °--NUM_CONST: 3 [0/0] {218} + ¦--')': ) [0/1] {220} + °--expr: {} [0/0] {221} + ¦--'{': { [0/0] {222} + °--'}': } [0/0] {223} diff --git a/tests/testthat/alignment/tribble-three-cols-in_tree b/tests/testthat/alignment/tribble-three-cols-in_tree new file mode 100644 index 000000000..b36127931 --- /dev/null +++ b/tests/testthat/alignment/tribble-three-cols-in_tree @@ -0,0 +1,40 @@ +ROOT (token: short_text [lag_newlines/spaces] {pos_id}) + °--expr: tibbl [0/0] {1} + ¦--expr: tibbl [0/0] {2} + ¦ ¦--SYMBOL_PACKAGE: tibbl [0/0] {3} + ¦ ¦--NS_GET: :: [0/0] {4} + ¦ °--SYMBOL_FUNCTION_CALL: tribb [0/0] {5} + ¦--'(': ( [0/2] {6} + ¦--expr: ~x [1/0] {7} + ¦ ¦--'~': ~ [0/0] {8} + ¦ °--expr: x [0/0] {10} + ¦ °--SYMBOL: x [0/0] {9} + ¦--',': , [0/4] {11} + ¦--expr: ~y [0/0] {12} + ¦ ¦--'~': ~ [0/0] {13} + ¦ °--expr: y [0/0] {15} + ¦ °--SYMBOL: y [0/0] {14} + ¦--',': , [0/4] {16} + ¦--expr: ~z [0/0] {17} + ¦ ¦--'~': ~ [0/0] {18} + ¦ °--expr: z [0/0] {20} + ¦ °--SYMBOL: z [0/0] {19} + ¦--',': , [0/2] {21} + ¦--expr: "one" [1/0] {23} + ¦ °--STR_CONST: "one" [0/0] {22} + ¦--',': , [0/1] {24} + ¦--expr: TRUE [0/0] {26} + ¦ °--NUM_CONST: TRUE [0/0] {25} + ¦--',': , [0/2] {27} + ¦--expr: 1L [0/0] {29} + ¦ °--NUM_CONST: 1L [0/0] {28} + ¦--',': , [0/2] {30} + ¦--expr: "two" [1/0] {32} + ¦ °--STR_CONST: "two" [0/0] {31} + ¦--',': , [0/1] {33} + ¦--expr: FALSE [0/0] {35} + ¦ °--NUM_CONST: FALSE [0/0] {34} + ¦--',': , [0/1] {36} + ¦--expr: 2L [0/0] {38} + ¦ °--NUM_CONST: 2L [0/0] {37} + °--')': ) [1/0] {39} diff --git a/tests/testthat/indention_multiple/if_else_curly-in_tree b/tests/testthat/indention_multiple/if_else_curly-in_tree index e22822fd6..36f58267d 100644 --- a/tests/testthat/indention_multiple/if_else_curly-in_tree +++ b/tests/testthat/indention_multiple/if_else_curly-in_tree @@ -77,35 +77,86 @@ if [2/0] {49} ¦ ¦ °--'}': } [1/0] {67} ¦ °--'}': } [1/0] {68} ¦--COMMENT: # rat [2/0] {69} - °--expr: foo < [1/0] {70} - ¦--expr: foo [0/1] {72} - ¦ °--SYMBOL: foo [0/0] {71} - ¦--LEFT_ASSIGN: <- [0/1] {73} - °--expr: funct [0/0] {74} - ¦--FUNCTION: funct [0/0] {75} - ¦--'(': ( [0/0] {76} - ¦--SYMBOL_FORMALS: x [0/0] {77} - ¦--')': ) [0/1] {78} - °--expr: { + ¦--expr: foo < [1/0] {70} + ¦ ¦--expr: foo [0/1] {72} + ¦ ¦ °--SYMBOL: foo [0/0] {71} + ¦ ¦--LEFT_ASSIGN: <- [0/1] {73} + ¦ °--expr: funct [0/0] {74} + ¦ ¦--FUNCTION: funct [0/0] {75} + ¦ ¦--'(': ( [0/0] {76} + ¦ ¦--SYMBOL_FORMALS: x [0/0] {77} + ¦ ¦--')': ) [0/1] {78} + ¦ °--expr: { i [0/0] {79} - ¦--'{': { [0/2] {80} - ¦--expr: if (T [1/0] {81} - ¦ ¦--IF: if [0/1] {82} - ¦ ¦--'(': ( [0/0] {83} - ¦ ¦--expr: TRUE [0/0] {85} - ¦ ¦ °--NUM_CONST: TRUE [0/0] {84} - ¦ ¦--')': ) [0/1] {86} - ¦ ¦--expr: { + ¦ ¦--'{': { [0/2] {80} + ¦ ¦--expr: if (T [1/0] {81} + ¦ ¦ ¦--IF: if [0/1] {82} + ¦ ¦ ¦--'(': ( [0/0] {83} + ¦ ¦ ¦--expr: TRUE [0/0] {85} + ¦ ¦ ¦ °--NUM_CONST: TRUE [0/0] {84} + ¦ ¦ ¦--')': ) [0/1] {86} + ¦ ¦ ¦--expr: { [0/2] {87} - ¦ ¦ ¦--'{': { [0/4] {88} - ¦ ¦ ¦--expr: 1 [1/2] {90} - ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {89} - ¦ ¦ °--'}': } [1/0] {91} - ¦ ¦--ELSE: else [1/1] {92} - ¦ °--expr: { + ¦ ¦ ¦ ¦--'{': { [0/4] {88} + ¦ ¦ ¦ ¦--expr: 1 [1/2] {90} + ¦ ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {89} + ¦ ¦ ¦ °--'}': } [1/0] {91} + ¦ ¦ ¦--ELSE: else [1/1] {92} + ¦ ¦ °--expr: { [0/0] {93} - ¦ ¦--'{': { [0/4] {94} - ¦ ¦--expr: 2 [1/2] {96} - ¦ ¦ °--NUM_CONST: 2 [0/0] {95} - ¦ °--'}': } [1/0] {97} - °--'}': } [1/0] {98} + ¦ ¦ ¦--'{': { [0/4] {94} + ¦ ¦ ¦--expr: 2 [1/2] {96} + ¦ ¦ ¦ °--NUM_CONST: 2 [0/0] {95} + ¦ ¦ °--'}': } [1/0] {97} + ¦ °--'}': } [1/0] {98} + ¦--expr: if (T [3/0] {99} + ¦ ¦--IF: if [0/1] {100} + ¦ ¦--'(': ( [0/0] {101} + ¦ ¦--expr: TRUE [0/0] {103} + ¦ ¦ °--NUM_CONST: TRUE [0/0] {102} + ¦ ¦--')': ) [0/1] {104} + ¦ ¦--expr: { + 3 [0/1] {105} + ¦ ¦ ¦--'{': { [0/2] {106} + ¦ ¦ ¦--expr: 3 [1/0] {108} + ¦ ¦ ¦ °--NUM_CONST: 3 [0/0] {107} + ¦ ¦ °--'}': } [1/0] {109} + ¦ ¦--ELSE: else [0/2] {110} + ¦ °--expr: if (F [1/0] {111} + ¦ ¦--IF: if [0/1] {112} + ¦ ¦--'(': ( [0/0] {113} + ¦ ¦--expr: FALSE [0/0] {115} + ¦ ¦ °--NUM_CONST: FALSE [0/0] {114} + ¦ ¦--')': ) [0/1] {116} + ¦ °--expr: { + 4 [0/0] {117} + ¦ ¦--'{': { [0/2] {118} + ¦ ¦--expr: 4 [1/0] {120} + ¦ ¦ °--NUM_CONST: 4 [0/0] {119} + ¦ °--'}': } [1/0] {121} + °--expr: if (T [2/0] {122} + ¦--IF: if [0/1] {123} + ¦--'(': ( [0/0] {124} + ¦--expr: TRUE [0/0] {126} + ¦ °--NUM_CONST: TRUE [0/0] {125} + ¦--')': ) [0/1] {127} + ¦--expr: { + 3 [0/1] {128} + ¦ ¦--'{': { [0/2] {129} + ¦ ¦--expr: 3 [1/0] {131} + ¦ ¦ °--NUM_CONST: 3 [0/0] {130} + ¦ °--'}': } [1/0] {132} + ¦--ELSE: else [0/1] {133} + ¦--COMMENT: # com [0/2] {134} + °--expr: if (F [1/0] {135} + ¦--IF: if [0/1] {136} + ¦--'(': ( [0/0] {137} + ¦--expr: FALSE [0/0] {139} + ¦ °--NUM_CONST: FALSE [0/0] {138} + ¦--')': ) [0/1] {140} + °--expr: { + [0/0] {141} + ¦--'{': { [0/4] {142} + ¦--expr: 4 [1/2] {144} + ¦ °--NUM_CONST: 4 [0/0] {143} + °--'}': } [1/0] {145} diff --git a/tests/testthat/line_breaks_and_other/around-eq-sub-in_tree b/tests/testthat/line_breaks_and_other/around-eq-sub-in_tree new file mode 100644 index 000000000..095d86fc9 --- /dev/null +++ b/tests/testthat/line_breaks_and_other/around-eq-sub-in_tree @@ -0,0 +1,96 @@ +ROOT (token: short_text [lag_newlines/spaces] {pos_id}) + ¦--expr: c(x = [0/0] {1} + ¦ ¦--expr: c [0/0] {3} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {2} + ¦ ¦--'(': ( [0/0] {4} + ¦ ¦--SYMBOL_SUB: x [0/1] {5} + ¦ ¦--EQ_SUB: = [0/1] {6} + ¦ ¦--expr: 2 [0/0] {8} + ¦ ¦ °--NUM_CONST: 2 [0/0] {7} + ¦ °--')': ) [0/0] {9} + ¦--expr: c(x = [2/0] {10} + ¦ ¦--expr: c [0/0] {12} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {11} + ¦ ¦--'(': ( [0/0] {13} + ¦ ¦--SYMBOL_SUB: x [0/1] {14} + ¦ ¦--EQ_SUB: = [0/4] {15} + ¦ ¦--expr: 2 [1/0] {17} + ¦ ¦ °--NUM_CONST: 2 [0/0] {16} + ¦ °--')': ) [0/0] {18} + ¦--expr: c( + [2/0] {19} + ¦ ¦--expr: c [0/0] {21} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {20} + ¦ ¦--'(': ( [0/2] {22} + ¦ ¦--SYMBOL_SUB: x [1/1] {23} + ¦ ¦--EQ_SUB: = [0/1] {24} + ¦ ¦--expr: 2 [0/0] {26} + ¦ ¦ °--NUM_CONST: 2 [0/0] {25} + ¦ °--')': ) [0/0] {27} + ¦--expr: c(x + [2/0] {28} + ¦ ¦--expr: c [0/0] {30} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {29} + ¦ ¦--'(': ( [0/0] {31} + ¦ ¦--SYMBOL_SUB: x [0/2] {32} + ¦ ¦--EQ_SUB: = [1/1] {33} + ¦ ¦--expr: 2 [0/0] {35} + ¦ ¦ °--NUM_CONST: 2 [0/0] {34} + ¦ °--')': ) [0/0] {36} + ¦--expr: c(x = [2/0] {37} + ¦ ¦--expr: c [0/0] {39} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {38} + ¦ ¦--'(': ( [0/0] {40} + ¦ ¦--SYMBOL_SUB: x [0/1] {41} + ¦ ¦--EQ_SUB: = [0/1] {42} + ¦ ¦--expr: 2 [0/0] {44} + ¦ ¦ °--NUM_CONST: 2 [0/0] {43} + ¦ ¦--',': , [0/1] {45} + ¦ ¦--SYMBOL_SUB: a [0/2] {46} + ¦ ¦--EQ_SUB: = [1/4] {47} + ¦ ¦--expr: 1 [1/0] {49} + ¦ ¦ °--NUM_CONST: 1 [0/0] {48} + ¦ °--')': ) [0/0] {50} + ¦--expr: c(x = [3/0] {51} + ¦ ¦--expr: c [0/0] {53} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {52} + ¦ ¦--'(': ( [0/0] {54} + ¦ ¦--SYMBOL_SUB: x [0/1] {55} + ¦ ¦--EQ_SUB: = [0/1] {56} + ¦ ¦--expr: 2 [0/0] {58} + ¦ ¦ °--NUM_CONST: 2 [0/0] {57} + ¦ ¦--',': , [0/1] {59} + ¦ ¦--SYMBOL_SUB: a [0/2] {60} + ¦ ¦--EQ_SUB: = [1/1] {61} + ¦ ¦--COMMENT: # stu [0/4] {62} + ¦ ¦--expr: 1 [1/0] {64} + ¦ ¦ °--NUM_CONST: 1 [0/0] {63} + ¦ °--')': ) [0/0] {65} + ¦--expr: c(b=4 [3/0] {66} + ¦ ¦--expr: c [0/0] {68} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {67} + ¦ ¦--'(': ( [0/0] {69} + ¦ ¦--SYMBOL_SUB: b [0/0] {70} + ¦ ¦--EQ_SUB: = [0/0] {71} + ¦ ¦--expr: 4 [0/0] {73} + ¦ ¦ °--NUM_CONST: 4 [0/0] {72} + ¦ ¦--',': , [0/1] {74} + ¦ ¦--SYMBOL_SUB: x [0/1] {75} + ¦ ¦--COMMENT: # com [0/2] {76} + ¦ ¦--EQ_SUB: = [1/1] {77} + ¦ ¦--expr: 2 [0/0] {79} + ¦ ¦ °--NUM_CONST: 2 [0/0] {78} + ¦ °--')': ) [0/0] {80} + °--expr: c(x = [3/0] {81} + ¦--expr: c [0/0] {83} + ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {82} + ¦--'(': ( [0/0] {84} + ¦--SYMBOL_SUB: x [0/1] {85} + ¦--EQ_SUB: = [0/0] {86} + ¦--COMMENT: # com [0/2] {87} + ¦--expr: 2 [1/0] {89} + ¦ °--NUM_CONST: 2 [0/0] {88} + ¦--',': , [0/1] {90} + ¦--SYMBOL_SUB: c [0/0] {91} + ¦--EQ_SUB: = [0/0] {92} + °--')': ) [0/0] {93} diff --git a/tests/testthat/line_breaks_and_other/braces-fun-calls2-in_tree b/tests/testthat/line_breaks_and_other/braces-fun-calls2-in_tree index 45d0ddb38..2a73d4886 100644 --- a/tests/testthat/line_breaks_and_other/braces-fun-calls2-in_tree +++ b/tests/testthat/line_breaks_and_other/braces-fun-calls2-in_tree @@ -241,26 +241,102 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦ ¦ ¦ °--')': ) [0/0] {219} ¦ ¦ °--'}': } [1/0] {220} ¦ °--')': ) [1/0] {221} - °--expr: tetst [2/0] {222} - ¦--expr: tetst [0/0] {224} - ¦ °--SYMBOL_FUNCTION_CALL: tetst [0/0] {223} - ¦--'(': ( [0/2] {225} - ¦--expr: "x" [1/0] {227} - ¦ °--STR_CONST: "x" [0/0] {226} - ¦--',': , [0/2] {228} - ¦--expr: { + ¦--expr: tetst [2/0] {222} + ¦ ¦--expr: tetst [0/0] {224} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: tetst [0/0] {223} + ¦ ¦--'(': ( [0/2] {225} + ¦ ¦--expr: "x" [1/0] {227} + ¦ ¦ °--STR_CONST: "x" [0/0] {226} + ¦ ¦--',': , [0/2] {228} + ¦ ¦--expr: { [1/0] {229} - ¦ ¦--'{': { [0/4] {230} - ¦ ¦--expr: x [1/2] {232} - ¦ ¦ °--SYMBOL: x [0/0] {231} - ¦ °--'}': } [1/0] {233} - ¦--',': , [0/1] {234} - ¦--expr: 1 + + [0/0] {235} - ¦ ¦--expr: 1 [0/1] {237} - ¦ ¦ °--NUM_CONST: 1 [0/0] {236} - ¦ ¦--'+': + [0/1] {238} - ¦ °--expr: +1 [0/0] {239} - ¦ ¦--'+': + [0/0] {240} - ¦ °--expr: 1 [0/0] {242} - ¦ °--NUM_CONST: 1 [0/0] {241} - °--')': ) [1/0] {243} + ¦ ¦ ¦--'{': { [0/4] {230} + ¦ ¦ ¦--expr: x [1/2] {232} + ¦ ¦ ¦ °--SYMBOL: x [0/0] {231} + ¦ ¦ °--'}': } [1/0] {233} + ¦ ¦--',': , [0/1] {234} + ¦ ¦--expr: 1 + + [0/0] {235} + ¦ ¦ ¦--expr: 1 [0/1] {237} + ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {236} + ¦ ¦ ¦--'+': + [0/1] {238} + ¦ ¦ °--expr: +1 [0/0] {239} + ¦ ¦ ¦--'+': + [0/0] {240} + ¦ ¦ °--expr: 1 [0/0] {242} + ¦ ¦ °--NUM_CONST: 1 [0/0] {241} + ¦ °--')': ) [1/0] {243} + ¦--expr: while [2/0] {244} + ¦ ¦--WHILE: while [0/1] {245} + ¦ ¦--'(': ( [0/0] {246} + ¦ ¦--expr: { + x [0/0] {247} + ¦ ¦ ¦--'{': { [0/2] {248} + ¦ ¦ ¦--expr: x [1/0] {250} + ¦ ¦ ¦ °--SYMBOL: x [0/0] {249} + ¦ ¦ °--'}': } [1/0] {251} + ¦ ¦--')': ) [0/1] {252} + ¦ °--expr: { + f [0/0] {253} + ¦ ¦--'{': { [0/2] {254} + ¦ ¦--expr: f() [1/0] {255} + ¦ ¦ ¦--expr: f [0/0] {257} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: f [0/0] {256} + ¦ ¦ ¦--'(': ( [0/0] {258} + ¦ ¦ °--')': ) [0/0] {259} + ¦ °--'}': } [1/0] {260} + ¦--expr: while [2/0] {261} + ¦ ¦--WHILE: while [0/1] {262} + ¦ ¦--'(': ( [0/0] {263} + ¦ ¦--expr: { + x [0/0] {264} + ¦ ¦ ¦--'{': { [0/2] {265} + ¦ ¦ ¦--expr: x [1/0] {267} + ¦ ¦ ¦ °--SYMBOL: x [0/0] {266} + ¦ ¦ °--'}': } [1/0] {268} + ¦ ¦--')': ) [1/1] {269} + ¦ °--expr: { + f [0/0] {270} + ¦ ¦--'{': { [0/2] {271} + ¦ ¦--expr: f() [1/0] {272} + ¦ ¦ ¦--expr: f [0/0] {274} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: f [0/0] {273} + ¦ ¦ ¦--'(': ( [0/0] {275} + ¦ ¦ °--')': ) [0/0] {276} + ¦ °--'}': } [1/0] {277} + ¦--expr: while [2/0] {278} + ¦ ¦--WHILE: while [0/1] {279} + ¦ ¦--'(': ( [0/2] {280} + ¦ ¦--expr: { + x [1/0] {281} + ¦ ¦ ¦--'{': { [0/2] {282} + ¦ ¦ ¦--expr: x [1/0] {284} + ¦ ¦ ¦ °--SYMBOL: x [0/0] {283} + ¦ ¦ °--'}': } [1/0] {285} + ¦ ¦--')': ) [0/1] {286} + ¦ °--expr: { + f [0/0] {287} + ¦ ¦--'{': { [0/2] {288} + ¦ ¦--expr: f() [1/0] {289} + ¦ ¦ ¦--expr: f [0/0] {291} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: f [0/0] {290} + ¦ ¦ ¦--'(': ( [0/0] {292} + ¦ ¦ °--')': ) [0/0] {293} + ¦ °--'}': } [1/0] {294} + °--expr: while [2/0] {295} + ¦--WHILE: while [0/1] {296} + ¦--'(': ( [0/2] {297} + ¦--expr: {x +} [1/0] {298} + ¦ ¦--'{': { [0/0] {299} + ¦ ¦--expr: x [0/0] {301} + ¦ ¦ °--SYMBOL: x [0/0] {300} + ¦ °--'}': } [1/0] {302} + ¦--')': ) [0/1] {303} + °--expr: { + f [0/0] {304} + ¦--'{': { [0/2] {305} + ¦--expr: f() [1/0] {306} + ¦ ¦--expr: f [0/0] {308} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: f [0/0] {307} + ¦ ¦--'(': ( [0/0] {309} + ¦ °--')': ) [0/0] {310} + °--'}': } [1/0] {311} diff --git a/tests/testthat/line_breaks_and_other/curly-brace-edge-in_tree b/tests/testthat/line_breaks_and_other/curly-brace-edge-in_tree new file mode 100644 index 000000000..a8086c1ab --- /dev/null +++ b/tests/testthat/line_breaks_and_other/curly-brace-edge-in_tree @@ -0,0 +1,92 @@ +ROOT (token: short_text [lag_newlines/spaces] {pos_id}) + ¦--expr: funct [0/0] {1} + ¦ ¦--FUNCTION: funct [0/0] {2} + ¦ ¦--'(': ( [0/0] {3} + ¦ ¦--SYMBOL_FORMALS: y [0/1] {4} + ¦ ¦--EQ_FORMALS: = [0/1] {5} + ¦ ¦--expr: {} [0/0] {6} + ¦ ¦ ¦--'{': { [0/0] {7} + ¦ ¦ °--'}': } [0/0] {8} + ¦ ¦--')': ) [0/1] {9} + ¦ °--expr: NULL [0/0] {11} + ¦ °--NULL_CONST: NULL [0/0] {10} + ¦--expr: funct [2/0] {12} + ¦ ¦--FUNCTION: funct [0/0] {13} + ¦ ¦--'(': ( [0/0] {14} + ¦ ¦--SYMBOL_FORMALS: y [0/1] {15} + ¦ ¦--EQ_FORMALS: = [0/11] {16} + ¦ ¦--expr: {} [1/0] {17} + ¦ ¦ ¦--'{': { [0/0] {18} + ¦ ¦ °--'}': } [0/0] {19} + ¦ ¦--')': ) [0/1] {20} + ¦ °--expr: NULL [0/0] {22} + ¦ °--NULL_CONST: NULL [0/0] {21} + ¦--expr: funct [2/0] {23} + ¦ ¦--FUNCTION: funct [0/0] {24} + ¦ ¦--'(': ( [0/0] {25} + ¦ ¦--SYMBOL_FORMALS: yyy [0/0] {26} + ¦ ¦--EQ_FORMALS: = [0/1] {27} + ¦ ¦--expr: {1} [0/0] {28} + ¦ ¦ ¦--'{': { [0/0] {29} + ¦ ¦ ¦--expr: 1 [0/0] {31} + ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {30} + ¦ ¦ °--'}': } [0/0] {32} + ¦ ¦--')': ) [0/1] {33} + ¦ °--expr: { + 1 [0/0] {34} + ¦ ¦--'{': { [0/2] {35} + ¦ ¦--expr: 1 [1/0] {37} + ¦ ¦ °--NUM_CONST: 1 [0/0] {36} + ¦ °--'}': } [1/0] {38} + ¦--expr: funct [2/0] {39} + ¦ ¦--FUNCTION: funct [0/0] {40} + ¦ ¦--'(': ( [0/0] {41} + ¦ ¦--SYMBOL_FORMALS: yyy [0/0] {42} + ¦ ¦--EQ_FORMALS: = [0/1] {43} + ¦ ¦--expr: {1 + [0/0] {44} + ¦ ¦ ¦--'{': { [0/0] {45} + ¦ ¦ ¦--expr: 1 [0/2] {47} + ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {46} + ¦ ¦ °--'}': } [1/0] {48} + ¦ ¦--')': ) [0/1] {49} + ¦ °--expr: { + 1 [0/0] {50} + ¦ ¦--'{': { [0/2] {51} + ¦ ¦--expr: 1 [1/0] {53} + ¦ ¦ °--NUM_CONST: 1 [0/0] {52} + ¦ °--'}': } [1/0] {54} + °--expr: f1 <- [2/0] {55} + ¦--expr: f1 [0/1] {57} + ¦ °--SYMBOL: f1 [0/0] {56} + ¦--LEFT_ASSIGN: <- [0/1] {58} + °--expr: funct [0/0] {59} + ¦--FUNCTION: funct [0/0] {60} + ¦--'(': ( [0/0] {61} + ¦--SYMBOL_FORMALS: x [0/1] {62} + ¦--EQ_FORMALS: = [0/1] {63} + ¦--expr: {1} [0/0] {64} + ¦ ¦--'{': { [0/0] {65} + ¦ ¦--expr: 1 [0/0] {67} + ¦ ¦ °--NUM_CONST: 1 [0/0] {66} + ¦ °--'}': } [0/0] {68} + ¦--',': , [0/1] {69} + ¦--SYMBOL_FORMALS: y [0/1] {70} + ¦--EQ_FORMALS: = [0/1] {71} + ¦--expr: 0 [0/0] {73} + ¦ °--NUM_CONST: 0 [0/0] {72} + ¦--')': ) [0/1] {74} + °--expr: { + [0/0] {75} + ¦--'{': { [0/4] {76} + ¦--expr: c(x, [1/3] {77} + ¦ ¦--expr: c [0/0] {79} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: c [0/0] {78} + ¦ ¦--'(': ( [0/0] {80} + ¦ ¦--expr: x [0/0] {82} + ¦ ¦ °--SYMBOL: x [0/0] {81} + ¦ ¦--',': , [0/1] {83} + ¦ ¦--expr: y [0/0] {85} + ¦ ¦ °--SYMBOL: y [0/0] {84} + ¦ °--')': ) [0/0] {86} + °--'}': } [1/0] {87} diff --git a/tests/testthat/line_breaks_and_other/curly-in_tree b/tests/testthat/line_breaks_and_other/curly-in_tree index 5ebdd6ffb..ca61fa15b 100644 --- a/tests/testthat/line_breaks_and_other/curly-in_tree +++ b/tests/testthat/line_breaks_and_other/curly-in_tree @@ -99,22 +99,56 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦ ¦--expr: "y" [1/0] {93} ¦ ¦ °--STR_CONST: "y" [0/0] {92} ¦ °--'}': } [1/0] {94} - °--expr: test_ [2/0] {95} - ¦--expr: test_ [0/0] {97} - ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {96} - ¦--'(': ( [0/0] {98} - ¦--expr: "I am [0/0] {100} - ¦ °--STR_CONST: "I am [0/0] {99} - ¦--',': , [0/1] {101} - ¦--expr: { + ¦--expr: test_ [2/0] {95} + ¦ ¦--expr: test_ [0/0] {97} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {96} + ¦ ¦--'(': ( [0/0] {98} + ¦ ¦--expr: "I am [0/0] {100} + ¦ ¦ °--STR_CONST: "I am [0/0] {99} + ¦ ¦--',': , [0/1] {101} + ¦ ¦--expr: { a [0/0] {102} - ¦ ¦--'{': { [0/2] {103} - ¦ ¦--expr: a_tes [1/0] {104} - ¦ ¦ ¦--expr: a_tes [0/0] {106} - ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: a_tes [0/0] {105} - ¦ ¦ ¦--'(': ( [0/0] {107} - ¦ ¦ ¦--expr: x [0/0] {109} - ¦ ¦ ¦ °--SYMBOL: x [0/0] {108} - ¦ ¦ °--')': ) [0/0] {110} - ¦ °--'}': } [1/0] {111} - °--')': ) [1/0] {112} + ¦ ¦ ¦--'{': { [0/2] {103} + ¦ ¦ ¦--expr: a_tes [1/0] {104} + ¦ ¦ ¦ ¦--expr: a_tes [0/0] {106} + ¦ ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: a_tes [0/0] {105} + ¦ ¦ ¦ ¦--'(': ( [0/0] {107} + ¦ ¦ ¦ ¦--expr: x [0/0] {109} + ¦ ¦ ¦ ¦ °--SYMBOL: x [0/0] {108} + ¦ ¦ ¦ °--')': ) [0/0] {110} + ¦ ¦ °--'}': } [1/0] {111} + ¦ °--')': ) [1/0] {112} + °--expr: test_ [2/0] {113} + ¦--expr: test_ [0/0] {115} + ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {114} + ¦--'(': ( [0/2] {116} + ¦--SYMBOL_SUB: desc [1/1] {117} + ¦--EQ_SUB: = [0/1] {118} + ¦--expr: "bla" [0/0] {120} + ¦ °--STR_CONST: "bla" [0/0] {119} + ¦--',': , [0/2] {121} + ¦--SYMBOL_SUB: code [1/1] {122} + ¦--EQ_SUB: = [0/1] {123} + ¦--expr: { + + + + [0/0] {124} + ¦ ¦--'{': { [0/4] {125} + ¦ ¦--COMMENT: # com [4/4] {126} + ¦ ¦--expr: expec [1/2] {127} + ¦ ¦ ¦--expr: expec [0/0] {129} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: expec [0/0] {128} + ¦ ¦ ¦--'(': ( [0/0] {130} + ¦ ¦ ¦--expr: 1 + 1 [0/0] {131} + ¦ ¦ ¦ ¦--expr: 1 [0/1] {133} + ¦ ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {132} + ¦ ¦ ¦ ¦--'+': + [0/1] {134} + ¦ ¦ ¦ °--expr: 1 [0/0] {136} + ¦ ¦ ¦ °--NUM_CONST: 1 [0/0] {135} + ¦ ¦ ¦--',': , [0/1] {137} + ¦ ¦ ¦--expr: 2 [0/0] {139} + ¦ ¦ ¦ °--NUM_CONST: 2 [0/0] {138} + ¦ ¦ °--')': ) [0/0] {140} + ¦ °--'}': } [1/0] {141} + °--')': ) [0/0] {142} diff --git a/tests/testthat/line_breaks_fun_call/unindent-in_tree b/tests/testthat/line_breaks_fun_call/unindent-in_tree new file mode 100644 index 000000000..70fd2a441 --- /dev/null +++ b/tests/testthat/line_breaks_fun_call/unindent-in_tree @@ -0,0 +1,72 @@ +ROOT (token: short_text [lag_newlines/spaces] {pos_id}) + ¦--expr: test_ [0/0] {1} + ¦ ¦--expr: test_ [0/0] {3} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {2} + ¦ ¦--'(': ( [0/0] {4} + ¦ ¦--expr: key( + [0/0] {5} + ¦ ¦ ¦--expr: key [0/0] {7} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: key [0/0] {6} + ¦ ¦ ¦--'(': ( [0/2] {8} + ¦ ¦ ¦--expr: s [1/0] {10} + ¦ ¦ ¦ °--SYMBOL: s [0/0] {9} + ¦ ¦ °--')': ) [0/0] {11} + ¦ ¦--',': , [0/0] {12} + ¦ ¦--SYMBOL_SUB: x [0/1] {13} + ¦ ¦--EQ_SUB: = [0/1] {14} + ¦ ¦--expr: 1 [0/0] {16} + ¦ ¦ °--NUM_CONST: 1 [0/0] {15} + ¦ °--')': ) [0/0] {17} + ¦--expr: test_ [2/0] {18} + ¦ ¦--expr: test_ [0/0] {20} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {19} + ¦ ¦--'(': ( [0/0] {21} + ¦ ¦--expr: key( + [0/0] {22} + ¦ ¦ ¦--expr: key [0/0] {24} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: key [0/0] {23} + ¦ ¦ ¦--'(': ( [0/2] {25} + ¦ ¦ ¦--expr: s [1/0] {27} + ¦ ¦ ¦ °--SYMBOL: s [0/0] {26} + ¦ ¦ °--')': ) [0/0] {28} + ¦ ¦--',': , [0/2] {29} + ¦ ¦--SYMBOL_SUB: x [1/1] {30} + ¦ ¦--EQ_SUB: = [0/1] {31} + ¦ ¦--expr: 1 [0/0] {33} + ¦ ¦ °--NUM_CONST: 1 [0/0] {32} + ¦ °--')': ) [1/0] {34} + ¦--expr: test_ [3/0] {35} + ¦ ¦--expr: test_ [0/0] {37} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {36} + ¦ ¦--'(': ( [0/0] {38} + ¦ ¦--expr: key( + [0/0] {39} + ¦ ¦ ¦--expr: key [0/0] {41} + ¦ ¦ ¦ °--SYMBOL_FUNCTION_CALL: key [0/0] {40} + ¦ ¦ ¦--'(': ( [0/2] {42} + ¦ ¦ ¦--expr: s [1/0] {44} + ¦ ¦ ¦ °--SYMBOL: s [0/0] {43} + ¦ ¦ °--')': ) [0/0] {45} + ¦ ¦--',': , [0/0] {46} + ¦ ¦--SYMBOL_SUB: x [0/1] {47} + ¦ ¦--EQ_SUB: = [0/1] {48} + ¦ ¦--expr: 1 [0/0] {50} + ¦ ¦ °--NUM_CONST: 1 [0/0] {49} + ¦ °--')': ) [1/0] {51} + °--expr: test_ [3/0] {52} + ¦--expr: test_ [0/0] {54} + ¦ °--SYMBOL_FUNCTION_CALL: test_ [0/0] {53} + ¦--'(': ( [0/2] {55} + ¦--expr: key(s [1/0] {56} + ¦ ¦--expr: key [0/0] {58} + ¦ ¦ °--SYMBOL_FUNCTION_CALL: key [0/0] {57} + ¦ ¦--'(': ( [0/0] {59} + ¦ ¦--expr: s [0/0] {61} + ¦ ¦ °--SYMBOL: s [0/0] {60} + ¦ °--')': ) [0/0] {62} + ¦--',': , [0/0] {63} + ¦--SYMBOL_SUB: x [0/1] {64} + ¦--EQ_SUB: = [0/1] {65} + ¦--expr: 1 [0/0] {67} + ¦ °--NUM_CONST: 1 [0/0] {66} + °--')': ) [0/0] {68} diff --git a/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-in_tree b/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-in_tree new file mode 100644 index 000000000..3c5e44121 --- /dev/null +++ b/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-in_tree @@ -0,0 +1,12 @@ +ROOT (token: short_text [lag_newlines/spaces] {pos_id}) + ¦--COMMENT: #' Th [0/0] {1} + ¦--COMMENT: #' [1/0] {2} + ¦--COMMENT: #' [1/0] {3} + ¦--COMMENT: #' is [1/0] {4} + ¦--COMMENT: #' [1/0] {5} + ¦--COMMENT: #' @e [1/0] {6} + ¦--COMMENT: #' 1+ [1/0] {7} + ¦--COMMENT: #' no [3/0] {8} + ¦--COMMENT: #' @e [1/0] {9} + ¦--COMMENT: #' 32 [1/0] {10} + °--COMMENT: #' no [1/0] {11} diff --git a/tests/testthat/strict/non_strict-in_tree b/tests/testthat/strict/non_strict-in_tree index 224dcbbd2..2caa97471 100644 --- a/tests/testthat/strict/non_strict-in_tree +++ b/tests/testthat/strict/non_strict-in_tree @@ -675,12 +675,11 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦ ¦ ¦--expr: a [0/0] {662} ¦ ¦ ¦ °--SYMBOL: a [0/0] {661} ¦ ¦ ¦--'~': ~ [0/0] {663} - ¦ ¦ °--expr: b+c [0/0] {664} - ¦ ¦ ¦--expr: b [0/0] {666} - ¦ ¦ ¦ °--SYMBOL: b [0/0] {665} - ¦ ¦ ¦--'+': + [0/0] {667} - ¦ ¦ °--expr: c [0/0] {669} - ¦ ¦ °--SYMBOL: c [0/0] {668} + ¦ ¦ ¦--expr: b [0/0] {666} + ¦ ¦ ¦ °--SYMBOL: b [0/0] {665} + ¦ ¦ ¦--'+': + [0/0] {667} + ¦ ¦ °--expr: c [0/0] {669} + ¦ ¦ °--SYMBOL: c [0/0] {668} ¦ ¦--',': , [0/0] {670} ¦ ¦--SYMBOL_SUB: data [0/0] {671} ¦ ¦--EQ_SUB: = [0/0] {672} @@ -695,12 +694,11 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦ ¦ ¦--expr: a [0/0] {682} ¦ ¦ ¦ °--SYMBOL: a [0/0] {681} ¦ ¦ ¦--'~': ~ [0/0] {683} - ¦ ¦ °--expr: .-1 [0/0] {684} - ¦ ¦ ¦--expr: . [0/0] {686} - ¦ ¦ ¦ °--SYMBOL: . [0/0] {685} - ¦ ¦ ¦--'-': - [0/0] {687} - ¦ ¦ °--expr: 1 [0/0] {689} - ¦ ¦ °--NUM_CONST: 1 [0/0] {688} + ¦ ¦ ¦--expr: . [0/0] {686} + ¦ ¦ ¦ °--SYMBOL: . [0/0] {685} + ¦ ¦ ¦--'-': - [0/0] {687} + ¦ ¦ °--expr: 1 [0/0] {689} + ¦ ¦ °--NUM_CONST: 1 [0/0] {688} ¦ ¦--',': , [0/0] {690} ¦ ¦--SYMBOL_SUB: data [0/0] {691} ¦ ¦--EQ_SUB: = [0/0] {692} diff --git a/tests/testthat/strict/strict-in_tree b/tests/testthat/strict/strict-in_tree index b36bc8211..94428955b 100644 --- a/tests/testthat/strict/strict-in_tree +++ b/tests/testthat/strict/strict-in_tree @@ -659,12 +659,11 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦ ¦ ¦--expr: a [0/0] {646} ¦ ¦ ¦ °--SYMBOL: a [0/0] {645} ¦ ¦ ¦--'~': ~ [0/0] {647} - ¦ ¦ °--expr: b+c [0/0] {648} - ¦ ¦ ¦--expr: b [0/0] {650} - ¦ ¦ ¦ °--SYMBOL: b [0/0] {649} - ¦ ¦ ¦--'+': + [0/0] {651} - ¦ ¦ °--expr: c [0/0] {653} - ¦ ¦ °--SYMBOL: c [0/0] {652} + ¦ ¦ ¦--expr: b [0/0] {650} + ¦ ¦ ¦ °--SYMBOL: b [0/0] {649} + ¦ ¦ ¦--'+': + [0/0] {651} + ¦ ¦ °--expr: c [0/0] {653} + ¦ ¦ °--SYMBOL: c [0/0] {652} ¦ ¦--',': , [0/0] {654} ¦ ¦--SYMBOL_SUB: data [0/0] {655} ¦ ¦--EQ_SUB: = [0/0] {656} @@ -679,12 +678,11 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦ ¦ ¦--expr: a [0/0] {666} ¦ ¦ ¦ °--SYMBOL: a [0/0] {665} ¦ ¦ ¦--'~': ~ [0/0] {667} - ¦ ¦ °--expr: .-1 [0/0] {668} - ¦ ¦ ¦--expr: . [0/0] {670} - ¦ ¦ ¦ °--SYMBOL: . [0/0] {669} - ¦ ¦ ¦--'-': - [0/0] {671} - ¦ ¦ °--expr: 1 [0/0] {673} - ¦ ¦ °--NUM_CONST: 1 [0/0] {672} + ¦ ¦ ¦--expr: . [0/0] {670} + ¦ ¦ ¦ °--SYMBOL: . [0/0] {669} + ¦ ¦ ¦--'-': - [0/0] {671} + ¦ ¦ °--expr: 1 [0/0] {673} + ¦ ¦ °--NUM_CONST: 1 [0/0] {672} ¦ ¦--',': , [0/0] {674} ¦ ¦--SYMBOL_SUB: data [0/0] {675} ¦ ¦--EQ_SUB: = [0/0] {676}