Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect blanks with exercise.blanks opt, and add parse checking #547

Merged
merged 67 commits into from
Aug 24, 2021
Merged

Detect blanks with exercise.blanks opt, and add parse checking #547

merged 67 commits into from
Aug 24, 2021

Commits on Jun 25, 2021

  1. Add handler for underscores to render_exercise()

    @rossellhayes
    rossellhayes committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    efa9777 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2021

  1. Import and modify code from gradethis that serves a similar function

    @rossellhayes
    rossellhayes committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    8f1323c View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2021

  1. Add tests with unparsable code

    @rossellhayes
    rossellhayes committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    8ed3ae4 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. Add test for *parsable* code with ___

    @rossellhayes
    rossellhayes committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    0c8a229 View commit details
    Browse the repository at this point in the history

  2. Fix typo 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    b09a6d4 View commit details
    Browse the repository at this point in the history

  3. Fix formatting 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    05d5e57 View commit details
    Browse the repository at this point in the history

  4. Run parse check before global setup

    @rossellhayes
    rossellhayes committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    36c838a View commit details
    Browse the repository at this point in the history

  5. Add chunk option exercise.parse.error.check which disables parsabil… 

    …ity checking if `FALSE`
    @rossellhayes
    rossellhayes committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    0ebebfe View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Implement parse checking and blank checking as exercise.checker funct… 

    …ions
    @rossellhayes
    rossellhayes committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    e0c3fe1 View commit details
    Browse the repository at this point in the history

  2. Remove support for -parse-check chunk

    @rossellhayes
    rossellhayes committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    3931555 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Add isFALSE() as an internal function for R < 3.5

    @rossellhayes
    rossellhayes committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    e6ccad9 View commit details
    Browse the repository at this point in the history

  2. Ensure blank check and parse check options can be set in global setup

    @rossellhayes
    rossellhayes committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    b40c961 View commit details
    Browse the repository at this point in the history

  3. Refactor blank checking

    @rossellhayes
    rossellhayes committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    5f5f0fb View commit details
    Browse the repository at this point in the history

  4. Use as.character(user_code) in check_blanks() to avoid issue with… 

    … unserialized user code in R < 3.5
    @rossellhayes
    rossellhayes committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    4c023ec View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Merge branch 'master' into 'rossellhayes/catch-underscore' 

    Conflicts:
	R/exercise.R
	tests/testthat/test-exercise.R
    @gadenbuie
    gadenbuie committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    45ba98a View commit details
    Browse the repository at this point in the history

  2. Revert "Use as.character(user_code) in check_blanks() to avoid is… 

    …sue with unserialized user code in R < 3.5"

This reverts commit 4c023ec.
    @gadenbuie
    gadenbuie committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    0ddd0d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Add support for i18n in blanks error message

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    40685c3 View commit details
    Browse the repository at this point in the history

  2. Refactor parse check

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    551dfe9 View commit details
    Browse the repository at this point in the history

  3. Update tests for i18n error messages

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    de7198c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'catch-underscore' of https://github.com/rossellhayes/le… 

    …arnr into catch-underscore
    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    735038b View commit details
    Browse the repository at this point in the history

  5. Simplify try_checker() calls

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    c4ef322 View commit details
    Browse the repository at this point in the history

  6. Refactor i18n_combine_words() to not use glue

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    d765b69 View commit details
    Browse the repository at this point in the history

  7. Fix arguments to knitr::combine_words()

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    ff4c9a0 View commit details
    Browse the repository at this point in the history

  8. Include error message in parse check results

    @rossellhayes
    rossellhayes committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    c55d8ab View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. Add support for Oxford commas in i18n_combine_words() in languages … 

    …that use Oxford commas (i.e. only English)
    @rossellhayes
    rossellhayes committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    07a57e5 View commit details
    Browse the repository at this point in the history

  2. Namespace isTruthy() 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    a8f0895 View commit details
    Browse the repository at this point in the history

  3. Use sprintf() in i18n_combine_words()

    @rossellhayes
    rossellhayes committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    237cbce View commit details
    Browse the repository at this point in the history

  4. Merge branch 'catch-underscore' of https://github.com/rossellhayes/le… 

    …arnr into catch-underscore
    @rossellhayes
    rossellhayes committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    d2ab09e View commit details
    Browse the repository at this point in the history

  5. Make name = "exercise.checker" default in try_checker()

    @rossellhayes
    rossellhayes committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    afe015d View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Restructure flow of blank check results 

    1. Check for blanks first, store feedback and disable regular checking if any
2. Check for parse error, if an error: return blanks %||% parse feedback
3. Check for code feedback, if any: return blanks %||% code feedback
4. Evaluate the exercise and the rest of checking, using blank feedback if we found some
    @gadenbuie
    gadenbuie committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    bde61e5 View commit details
    Browse the repository at this point in the history

  2. Use html code style around blanks

    @gadenbuie
    gadenbuie committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    a07db75 View commit details
    Browse the repository at this point in the history

  3. Return parse error result as regular html output, rather than in an e… 

    …rror alert div
    @gadenbuie
    gadenbuie committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    fd4b19a View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2021

  1. Test if blank_feedback exists directly before exercise$check; if … 

    …so, skip `exercise$check`
    @rossellhayes
    rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    65829c0 View commit details
    Browse the repository at this point in the history

  2. Update check_blanks test

    @rossellhayes
    rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    1fadf91 View commit details
    Browse the repository at this point in the history

  3. Restyle error_message_html() as literal code by default 

    Co-authored-by: Alex Rossell Hayes <alexander@rossellhayes.com>
    @gadenbuie @rossellhayes
    gadenbuie and rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    d73b52b View commit details
    Browse the repository at this point in the history

  4. Include error message output in error checker feedback 

    Co-authored-by: Alex Rossell Hayes <alexander@rossellhayes.com>
    @gadenbuie @rossellhayes
    gadenbuie and rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    bcf328d View commit details
    Browse the repository at this point in the history

  5. Move checker_feedback <- NULL immediately before it is possibly set… 

    … by `exercise$check`
    @rossellhayes
    rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    44a6853 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'catch-underscore' of https://github.com/rossellhayes/le… 

    …arnr into catch-underscore
    @rossellhayes
    rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    84efe93 View commit details
    Browse the repository at this point in the history

  7. Use alert style for timeout error

    @rossellhayes
    rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    1dd4f11 View commit details
    Browse the repository at this point in the history

  8. If exercise.blanks = TRUE, use underscores

    @rossellhayes
    rossellhayes committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    9c5e618 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2021

  1. i18n_set_language_option() sets env var to translate R messages

    @rossellhayes
    rossellhayes committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    fde70e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2021

  1. Merge commit 'f260faa2292f4342da741714fef4a8bcb9776938' 

    Conflicts:
	R/i18n.R
	tests/testthat/test-i18n.R
    @rossellhayes
    rossellhayes committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    d5a2881 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2021

  1. Merge master into catch-underscore

    @rossellhayes
    rossellhayes committed Aug 4, 2021
    Configuration menu
    Copy the full SHA
    53d6f3f View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2021

  1. Refactor and add internal documention about exercise blanks checking

    @gadenbuie
    gadenbuie committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    39c0fe4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 'rossellhayes/catch-underscore' 

    Conflicts:
	R/exercise.R
	R/utils.R
    @gadenbuie
    gadenbuie committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    517ac18 View commit details
    Browse the repository at this point in the history

  3. Remove temporary translations

    @rossellhayes
    rossellhayes committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    73e4d71 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. refactor: exercise_should_check_parsability()

    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    bdf29c6 View commit details
    Browse the repository at this point in the history

  2. Merged upstream/master into rossellhayes-catch-underscore

    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    2117659 View commit details
    Browse the repository at this point in the history

  3. Use HTML instead of markdown in text.unparsable translation

    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    4766531 View commit details
    Browse the repository at this point in the history

  4. Don't escape HTML in the translation JSON dependency

    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    1f2d393 View commit details
    Browse the repository at this point in the history

  5. minor style adjustment

    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    5014bec View commit details
    Browse the repository at this point in the history

  6. Always check R code parsability prior to evaluation

    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    dbd02ce View commit details
    Browse the repository at this point in the history

  7. Rename exercise checking functions 

    - `check_blanks()` -> `exercise_check_code_for_blanks()`
- `check_parsable()` -> `exercise_check_code_is_parsable()`
    @gadenbuie
    gadenbuie committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    5814717 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2021

  1. Update exercise_check_code_*() functions to use the exercise obje… 

    …ct directly
    @gadenbuie
    gadenbuie committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    1148e33 View commit details
    Browse the repository at this point in the history

  2. Test exercise_check_code_*() functions directly in tests

    @gadenbuie
    gadenbuie committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    60fbd45 View commit details
    Browse the repository at this point in the history

  3. Add exercise.blanks argument to tutorial_options()

    @gadenbuie
    gadenbuie committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    fa6c547 View commit details
    Browse the repository at this point in the history

  4. Document exercise.blanks in learnr webpage

    @gadenbuie
    gadenbuie committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    1c79d27 View commit details
    Browse the repository at this point in the history

  5. Rebuild docs/

    @gadenbuie
    gadenbuie committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    bfbf7bb View commit details
    Browse the repository at this point in the history

  6. Build docs (GitHub Actions)

    @gadenbuie
    gadenbuie committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    d3c4972 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2021

  1. Fix typo

    @gadenbuie
    gadenbuie committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    183f07d View commit details
    Browse the repository at this point in the history

  2. version must be length-1 or NULL in mock_exercise()

    @gadenbuie
    gadenbuie committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    5d60fed View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2021

  1. Return nothing if not exercise result 

    Return nothing to better signal this function is called for side-effects, not return values
    @gadenbuie
    gadenbuie committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    4ff1d59 View commit details
    Browse the repository at this point in the history

  2. Return early after code eval if blanks were detected

    @gadenbuie
    gadenbuie committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    908b0cb View commit details
    Browse the repository at this point in the history

  3. Move exercise_get_blanks_pattern() closer to `exercise_check_code_f… 

    …or_blanks()`
    @gadenbuie
    gadenbuie committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    36712fa View commit details
    Browse the repository at this point in the history

  4. Require knitr >= 1.31 

    When the `oxford_comma` argument was added to `knitr::combine_words()`
    @gadenbuie
    gadenbuie committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    f382a18 View commit details
    Browse the repository at this point in the history

  5. Add NEWS for rstudio#547

    @gadenbuie
    gadenbuie committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    45f4c94 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into 'rossellhayes/catch-underscore' 

    Conflicts:
	NEWS.md
	R/knitr-hooks.R
    @gadenbuie
    gadenbuie committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    3b0466e View commit details
    Browse the repository at this point in the history