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

New tokens format & theme matching #17933

Merged
merged 45 commits into from
Jan 9, 2017
Merged

New tokens format & theme matching #17933

merged 45 commits into from
Jan 9, 2017

Commits on Dec 27, 2016

  1. Standalone token themes as JS rules

    @alexdima
    alexdima committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    c4b03ec View commit details
    Browse the repository at this point in the history

  2. Add tokenization/themes test

    @alexdima
    alexdima committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    ab2b0d2 View commit details
    Browse the repository at this point in the history

  3. Simplify ITokenizationSupport: 

     - remove ILineTokens.actualStopOffset
 - remove stopAtOffset
 - refactor MonarchLexer
    @alexdima
    alexdima committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    659914b View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2016

  1. New tokens format

    @alexdima
    alexdima committed Dec 30, 2016
    Configuration menu
    Copy the full SHA
    122a07b View commit details
    Browse the repository at this point in the history

  2. Remove token class name from every token

    @alexdima
    alexdima committed Dec 30, 2016
    Configuration menu
    Copy the full SHA
    8905cb1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into alex/tokenization 

    # Conflicts:
#	src/vs/editor/contrib/suggest/common/snippetCompletion.ts
#	src/vs/editor/node/textMate/TMSyntax.ts
    @alexdima
    alexdima committed Dec 30, 2016
    Configuration menu
    Copy the full SHA
    3767bd1 View commit details
    Browse the repository at this point in the history

  4. Add tokenization API

    @alexdima
    alexdima committed Dec 30, 2016
    Configuration menu
    Copy the full SHA
    3b45a32 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2017

  1. Adopt latest loader

    @alexdima
    alexdima committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    7efe807 View commit details
    Browse the repository at this point in the history

  2. Monarch should always return non-null tokens

    @alexdima
    alexdima committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    74b5f50 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2017

  1. Allow for theme switching

    @alexdima
    alexdima committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    2319f16 View commit details
    Browse the repository at this point in the history

  2. merge tokens with equal metadata in manual tokenizer

    @alexdima
    alexdima committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    8572daa View commit details
    Browse the repository at this point in the history

  3. Remove log statement

    @alexdima
    alexdima committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    0d3ac4f View commit details
    Browse the repository at this point in the history

  4. Memory usage improvements in KeybindingResolver

    @alexdima
    alexdima committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    941812f View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2017

  1. [email protected]

    @alexdima
    alexdima committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    6e61a29 View commit details
    Browse the repository at this point in the history

  2. Remove standalone tokens CSS

    @alexdima
    alexdima committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    9cebde9 View commit details
    Browse the repository at this point in the history

  3. Adopt new vscode textmate

    @alexdima
    alexdima committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    8998f7a View commit details
    Browse the repository at this point in the history

  4. Remove ModeTransition

    @alexdima
    alexdima committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    616957b View commit details
    Browse the repository at this point in the history

  5. Prepare for theme integration tests

    @alexdima
    alexdima committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    467f42d View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2017

  1. [email protected]

    @alexdima
    alexdima committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    d43423b View commit details
    Browse the repository at this point in the history

  2. Themes integration tests

    @alexdima
    alexdima committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    10f6835 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. Use hex colors in themes integration tests

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    90d74c5 View commit details
    Browse the repository at this point in the history

  2. Do not generate CSS for tokens in stylesContribution

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    c7c64c3 View commit details
    Browse the repository at this point in the history

  3. Remove paranoia check in ViewLineToken

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    c794f31 View commit details
    Browse the repository at this point in the history

  4. [email protected]

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    a115c02 View commit details
    Browse the repository at this point in the history

  5. Do not wrap StackElement in TMState

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    4ae1714 View commit details
    Browse the repository at this point in the history

  6. Fix tests

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    68b8ad5 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into alex/tokenization

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    ebc43b3 View commit details
    Browse the repository at this point in the history

  8. Rename properties of LanguageIdentifier

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    8df18d0 View commit details
    Browse the repository at this point in the history

  9. Remove model.getMode()

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    bb49af3 View commit details
    Browse the repository at this point in the history

  10. Remove model.getModeId()

    @alexdima
    alexdima committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    badd8d1 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Small css tweaks

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    89d594a View commit details
    Browse the repository at this point in the history

  2. Fix layer breaker in TMSyntax

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    845bcec View commit details
    Browse the repository at this point in the history

  3. Tweaks

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    4100f3e View commit details
    Browse the repository at this point in the history

  4. Load language configuration when hitting embedded languages

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    4c3e4ee View commit details
    Browse the repository at this point in the history

  5. Phase out IMode

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    a7c53f5 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into alex/tokenization

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    51b5727 View commit details
    Browse the repository at this point in the history

  7. First cut of TM scopes inspection

    @alexdima
    alexdima committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    eff52e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2017

  1. Improve TM inspect scopes

    @alexdima
    alexdima committed Jan 9, 2017
    3 Configuration menu
    Copy the full SHA
    e3dbd85 View commit details
    Browse the repository at this point in the history

  2. Extract findMatchingThemeRule from themes test

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    6de9bfd View commit details
    Browse the repository at this point in the history

  3. Show matching theme rule in TM scopes inspector

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    8c668e8 View commit details
    Browse the repository at this point in the history

  4. Reduce standalone editor API breakage

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    38912c0 View commit details
    Browse the repository at this point in the history

  5. Add token inspector for standalone editor

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    ed5613d View commit details
    Browse the repository at this point in the history

  6. Add standalone editor API for theme customization

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    8ba6bc5 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into alex/tokenization

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    88c45c4 View commit details
    Browse the repository at this point in the history

  8. Skip tokenizing with TM lines over 20k chars

    @alexdima
    alexdima committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    a5a583e View commit details
    Browse the repository at this point in the history