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

Some JSON reworks #8

Merged
merged 22 commits into from
Dec 8, 2021
Merged

Some JSON reworks #8

merged 22 commits into from
Dec 8, 2021

Commits on Dec 4, 2021

  1. [JSON] Simplify JSON5 escape patterns

    Removes some quotes and unnecessary groups.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    fdeb5d0 View commit details
    Browse the repository at this point in the history
  2. [JSON] Tidy mapping key contexts

    Use `\"` as it is more common in most syntaxes.
    Use fixed order of quoted/unquoted key patterns in JSON5.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    65b0338 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c5f9f3e View commit details
    Browse the repository at this point in the history
  4. [JSON] Remove unnecessary meta_include_prototype

    This directive is required only if contexts are designed to be pushed
    or set onto stack directly.
    
    Example:
    
    main:
      - match:
        push: context
    
    context:
      - meta_include_prototype: false
    
    They are not needed if contexts are only `- include`ed.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    6c6ede1 View commit details
    Browse the repository at this point in the history
  5. [JSON] Remove top-level-objects and meta.toc-list

    Indexing top-level keys can be achieved by a selector in 
    Symbol List.tmPreference even without `meta.toc-list`.
    
    Beyond that a general purpose JSON syntax doesn't need to distinguish
    between top-level and other mapping keys.
    
    Note:
    A common SymbolList.tmPreferences for all JSON dialects is sufficient.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    f7b1f50 View commit details
    Browse the repository at this point in the history
  6. [JSON] Rename object body context

    Only contexts whose purpose is to set a meta scope should contain a
    `meta` in their name.
    
    Note:
    
    Such contexts should use `...-body` or `...-content`.
    
    The latter one feels more natural for comments/strings while the former
    one should be preferred for code blocks.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    61f64e1 View commit details
    Browse the repository at this point in the history
  7. [JSON] Rename inside-... contexts

    Such contexts should use `...-body` or `...-content`.
    
    The latter one feels more natural for comments/strings while the former
    one should be preferred for code blocks.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    ebcec17 View commit details
    Browse the repository at this point in the history
  8. [JSON] Enable interpolation in ecma mapping keys

    This commit uses `{{identifier_start}}` and `{{identifier_break}}` to
    push and pop `mapping-key-ecma` context on/off stack. By not consuming
    anything, string interpolation is enabled for syntaxes which embed JSON.
    
    An example might be PHP HEREDOCs.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    5202263 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d6a5b30 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    f7258bc View commit details
    Browse the repository at this point in the history
  11. [JSON] Remove JSON (Basic)

    There's no use for that syntax as it is nothing else as plain JSON.
    
    Inheritance order is: JSON5 < JSONC < JSON
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    384dcc7 View commit details
    Browse the repository at this point in the history
  12. [JSON] Be less restrictive with missing array separators

    Just highlight the space illegal between two values, instead of the
    whole next value.
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    ad36b3f View commit details
    Browse the repository at this point in the history
  13. [JSON] Tweak illegal remainder

    Improve tokenization
    deathaxe committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    40c90df View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. Configuration menu
    Copy the full SHA
    2acda82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc94247 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. Configuration menu
    Copy the full SHA
    5ee4121 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    222ab04 View commit details
    Browse the repository at this point in the history
  3. Update ci.yml

    jrappen authored Dec 6, 2021
    Configuration menu
    Copy the full SHA
    8c952ba View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2021

  1. Configuration menu
    Copy the full SHA
    4c9a692 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    59291c9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ce53c28 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0335220 View commit details
    Browse the repository at this point in the history