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.

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

Syntax highlighting for REPL using ammonite as base instead of JLine #1233

Merged
merged 13 commits into from May 10, 2016

Commits on Apr 28, 2016

  1. Initial implementation featuring two different highlighters

    One was implemted by hand and the other by using dotty's parser. The one
    built by hand is shorter, and behaves correctly.
    
    The scanner one is unfortunately not ready for testing - there are too
    many things that are workarounds for it to be a good solution as of now
    
    The code added from Ammonite is licensed under MIT, not sure where to
    put the license - but will add it once I know.
    felixmulder committed Apr 28, 2016
    Copy the full SHA
    53bd25f View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    96cedcd View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    d049845 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    57670a3 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    0f91408 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    d1ec140 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    4d53d33 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    b5d6df2 View commit details
    Browse the repository at this point in the history
  9. Revert Scanners and Tokens to their original form

    Since we decided to go with the non dotty-scanner approach these are
    unnecessary to have altered, might just as well revert them.
    felixmulder committed Apr 28, 2016
    Copy the full SHA
    f010c62 View commit details
    Browse the repository at this point in the history
  10. Fix stdin/out for repl launched by SBT

    Launching the repl with: `runMain dotty.tools.dotc.repl.Main` is now
    working correctly
    felixmulder committed Apr 28, 2016
    Copy the full SHA
    43f3916 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2016

  1. Copy the full SHA
    4fadce4 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    29fc55a View commit details
    Browse the repository at this point in the history
  3. Fix keywords sometimes not highlighted in multiln

    When enter pressed immediately after keyword, the highlighting would be
    aborted
    felixmulder committed Apr 29, 2016
    Copy the full SHA
    1582959 View commit details
    Browse the repository at this point in the history