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

[ST4] A whole bunch of fixes and improvements. #216

Merged
merged 22 commits into from
Feb 1, 2023
Merged

[ST4] A whole bunch of fixes and improvements. #216

merged 22 commits into from
Feb 1, 2023

Commits on Sep 9, 2021

  1. Add section separators

    Improve readability.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    2cd5fce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    30c74d9 View commit details
    Browse the repository at this point in the history
  3. Fix meta scopes of template tags

    This commit...
    
    1. fixes duplicated meta.tag scopes in `<template>` tags
    2. fixes missing meta.tag scope at the closing `>` in `<template>` tags
    3. adds syntax tests for template tags
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    bfb0a83 View commit details
    Browse the repository at this point in the history
  4. Fix mustage template interpolation

    This commit fixes implementation of mustage template tags {{...}}.
    
    Before this commit they tried to pop the `main` context off stack
    and caused `template-tag-content` to never have been popped off stack
    properly.
    
    With this commit the syntax distinguishes between embedded template
    tags and those which interpolate strings. The latter one remove
    `string` scope for better highlighting java code in `{{ ... }}`.
    
    It also does no longer push a dedicated `mustage-content` context on
    stack as this is the same content as the whole document. It's not
    required.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    7ecf306 View commit details
    Browse the repository at this point in the history
  5. Fix meta-attribute scopes in vue-directives

    All `v-foo` directive attributes have not been scoped
    `meta-attribute-with-value` which effects syntax highlighting when
    using certain color schemes. That's fixed by this commit.
    
    Note: It appears YAMLmacros sorts generated output randomly, so many
    changes of the generated sublime-syntax file can be ignored.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    884d955 View commit details
    Browse the repository at this point in the history
  6. Fix stray script/style/template close tags

    This commit refactors close-tag context handling in order to fix meta
    scopes of stray closing tags.
    
    Before this commit they received the default meta and entity scope from
    HTML.sublime-syntax. This may result in inconsistent highlighting once
    they are directly addressed by a color scheme.
    
    That's a fix which is planned for core HTML.sublime-syntax, too.
    The change of `script-tag` and `style-tag` also fixes duplicated
    meta.tag scopes for script/style tags for ST builds before 4114.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    71d282f View commit details
    Browse the repository at this point in the history
  7. Reorganize context/section order

    This commit just moves sections/contexts around. It doesn't change
    behavior.
    
    The goal is to end up with the same order as HTML.sublime-syntax which
    uses a top-down-order.
    
    1. managing contexts
    2. tag contexts
    3. attribute contexts
    4. other reusable contexts
    5. prototypes
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    023ade4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0e4f459 View commit details
    Browse the repository at this point in the history
  9. Replace remaining pop: true by pop: 1

    All sublime-syntax version 2 files should use explicit `pop: 1` instead
    of `pop: true`. It looks more consistent in case `pop: 2` are used.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    cf103cc View commit details
    Browse the repository at this point in the history
  10. Reuse tag-end context

    No need to duplicate the match directive if it already exists.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    0af7f8b View commit details
    Browse the repository at this point in the history
  11. Exclude prototypes from attribute value starts

    This commit fixes sublimehq/Packages#2910 for
    all ST builds before 4114.
    deathaxe committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    5b0e5de View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2022

  1. Prepare for future changes of ST's HTML.sublime-syntax

    ST's HTML.sublime-syntax may change in the future so that the change of
    this commit is required to maintain compatibility. It is planned to
    highlight certain self-closing tags illegal, if they are known not to
    support it.
    
    This change is backward compatible with older builds of ST4.
    deathaxe committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    00ad76b View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2022

  1. Fix JS expression interpolation in directives

    Addresses #216 (comment)
    
    This commit includes `JavaScript#expression-statement` context in
    attribute/directive values to highlight mappings correctly.
    
    The `pop: 1` is removed as the included context pops itself off stack.
    deathaxe committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    78f5c47 View commit details
    Browse the repository at this point in the history
  2. Opt-in to python 3.8 plugin host

    Run YAML macros in python 3.8 in order to maintain dictionary key sort
    order.
    deathaxe committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    c05ea53 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2022

  1. Use vue suffix for embed_scope in attributes and mustache

    This allows easily targeting the embed scopes inside attributes as
    something that is contributed and supported by the vue syntax only as
    opposed to a a `<script>` tag which uses HTML syntax.
    FichteFoll committed Oct 15, 2022
    Configuration menu
    Copy the full SHA
    34d3b01 View commit details
    Browse the repository at this point in the history
  2. Add line break at EOL

    FichteFoll committed Oct 15, 2022
    Configuration menu
    Copy the full SHA
    e576c31 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a5b2f14 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Configuration menu
    Copy the full SHA
    b010989 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1 from FichteForks/pr/embed-enhancements

    Use vue suffix for embed_scope in attributes and mustache
    deathaxe committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    bb01737 View commit details
    Browse the repository at this point in the history
  3. Tweak script/style pattern order

    This commit moves terminating patterns to the top so they match with
    max priority in case of overlapping patterns. This change is just to
    be future proof if core HTML syntax changes.
    deathaxe committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    63fb8bf View commit details
    Browse the repository at this point in the history
  4. Drop meta.template

    This commit follows a scope naming scheme introduced to Astro, Blade, Liquid, PHP and Slim recently, which uses
    
    1. `meta.embedded.<template-name>` for those template code sections,
       which are used for control structures primarily.
    
       This scope has already been in use in PHP syntax to scope all
       `<?php ... ?>` code sections.
    
    2. `meta.interpolation.<template-name>` for those template code
        sections, which primarily emit data to the output document.
    
        That's what Mustage tags `{{ expr }}` do primarily.
    deathaxe committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    b083a27 View commit details
    Browse the repository at this point in the history
  5. Fix attribute name interpolation

    1. extend `meta.interpolation` to include leading and trailing
       punctuation to comply with ST's scope naming guidelines.
    2. fix closing `]` scope.
    3. adjust/add tests
    deathaxe committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    30380d0 View commit details
    Browse the repository at this point in the history