search

rouge-ruby / rouge

A pure Ruby code highlighter that is compatible with Pygments
https://rouge.jneen.net/
Other
3.32k stars 731 forks source link

Add Nial Lexer #1803

Closed razetime closed 2 years ago

razetime commented 2 years ago

For use in the main Nial language website: https://nial-array-language.org/

razetime commented 2 years ago

i've done the rebase. I hope this is correct.

tancnle commented 2 years ago

Thanks, @razetime. It seems that the rebase has gone awry with all the extra commits that are already in the upstream master branch. Generally, we would create a feature branch on your fork instead of using the master branch. Few options:

  1. Create a feature branch on your fork and cherry pick relevant commits. Close this PR and create a new one tracking the new feature branch. (preferred)
  2. Realign razetime/master with rouge-ruby/master (WARNING: this might blow away other changes on your local fork).
    1. Reset to earlier commit to exclude non-relevant commits 
      git reset --hard bb5c7d2
    2. Fetch upstream and rebase 
      git fetch upstream
git rebase upstream/master
    3. Add the last missing commit 
      git cherry-pick e09905c
    4. Force push to origin 
      git push -f origin master
razetime commented 2 years ago

Continued in #1844.