Skip to content

Conversation

@jurgenvinju
Copy link
Member

@jurgenvinju jurgenvinju commented Jul 16, 2024

  • used git-filter-repo to remove all unnecessary scaffolding from rascal-tutor, and rename its source folder to
    src/org/rascalmpl/tutor.
# cloned rascal-tutor from scratch
git clone git@github.com:usethesource/rascal-tutor.git
# this removed everthing from the project's history except this path:
git-filter-repo --path src/lang/rascal/tutor  
# this put the code back into the original folder in the rascal project (src/org/rascalmpl/tutor)
git-filter-repo --path src/lang/rascal/tutor --path-rename src/lang/rascal/tutor:/src/org/rascalmpl/tutor/lang/rascal/tutor 
# remove all the tags locally
git tag --delete $(git tag --list)
# remove all the branches locally (except the main branch and possibly a current branch marked with *)
git branch remove $(git branch --list | grep -v "^\*" | grep -v "main")
# then switch to the rascal project
cd ../rascal
git checkout -b adopt-tutor
# add the clean project as a remote
git remote add -f tutor-baby ../rascal-tutor
# merge the code into this branch
git merge tutor-baby/main --no-ff --allow-unrelated-histories

The goal is to:

  • move the selenium dependent code to rascal-maven-plugin as a service
  • load this service via dependency injection into the tutor repl executor
  • make sure the tutor's tests are executed by the rascal project as well
  • make sure the rascal-maven-plugin can work without a dependency on the old rascal-tutor project
  • remove the rascal-tutor from the website
  • make sure the rascal-tutor documentation is added to the Rascal documentation
  • upgrade the tutor repl wrapper for the changes made to the REPL interfaces in the jline3 PR

…call-outs in source text and itemized lists with unicode inverted circled digits
…explicit pathConfig that is passed to the create function
…ded the classes we need to shutdown the external processes
… their bodies because those communicate how to use functions and what to expect of the output
@jurgenvinju jurgenvinju self-assigned this Jul 16, 2024
@jurgenvinju jurgenvinju marked this pull request as ready for review July 16, 2024 19:47
@jurgenvinju
Copy link
Member Author

See usethesource/rascal-maven-plugin#22 for the use of these changes in the rascal-maven-plugin project, which now depends on selenium to make the screenshots.

@jurgenvinju
Copy link
Member Author

See usethesource/rascal-website#58 for the addition of the tutor's documentation to the website.

@codecov
Copy link

codecov bot commented Jan 29, 2025

Codecov Report

Attention: Patch coverage is 0% with 165 lines in your changes missing coverage. Please review.

Project coverage is 50%. Comparing base (27c2891) to head (39a03ee).
Report is 150 commits behind head on main.

Files with missing lines Patch % Lines
...r/lang/rascal/tutor/repl/TutorCommandExecutor.java 0% 113 Missing ⚠️
...rascal/tutor/repl/TutorCommandExecutorCreator.java 0% 26 Missing ⚠️
...tutor/lang/rascal/tutor/repl/TutorIDEServices.java 0% 13 Missing ⚠️
...pl/tutor/lang/rascal/tutor/questions/Feedback.java 0% 10 Missing ⚠️
...g/rascalmpl/repl/rascal/RascalInterpreterREPL.java 0% 3 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##              main   #2001    +/-   ##
========================================
  Coverage       49%     50%            
+ Complexity    6251    6248     -3     
========================================
  Files          675     677     +2     
  Lines        59270   58995   -275     
  Branches      8642    8617    -25     
========================================
- Hits         29579   29575     -4     
+ Misses       27458   27185   -273     
- Partials      2233    2235     +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jurgenvinju jurgenvinju merged commit c53a238 into main Feb 4, 2025
5 of 7 checks passed
@jurgenvinju jurgenvinju deleted the adopt-tutor-code branch February 4, 2025 12:15
jurgenvinju added a commit that referenced this pull request May 10, 2025
Merges tutor code back into the rascal project
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants