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

Update Alloy DSL for Alloy 6 #1963

Closed
wants to merge 33 commits into from
Closed

Update Alloy DSL for Alloy 6 #1963

wants to merge 33 commits into from

Commits on Nov 17, 2021

  1. Make default style meet WCAG AA

    Accessibility by default is important.
    
    The colors with a too low contrast were adjusted just
    so much that they match the required contrast of 4.5.
    
    Part of pygments#1718.
    not-my-profile authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    089a723 View commit details
    Browse the repository at this point in the history
  2. Regenerate HTML test files.

    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    970dc34 View commit details
    Browse the repository at this point in the history
  3. Improve NSIS lexer.

    * Correctly identify whitespace.
    * Merge consecutive tokens where possible.
    * Consistently use String.Double for the opening and closing quotation
      marks
    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    622609f View commit details
    Browse the repository at this point in the history
  4. Improve HexdumpLexer.

    Correctly identify whitespace.
    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    cd897be View commit details
    Browse the repository at this point in the history
  5. Fix pygments#1896.

    Use a simpler expression to match comments in HTML/XML.
    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    fe3e101 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6fcc278 View commit details
    Browse the repository at this point in the history
  7. Update CHANGES.

    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    272b1fe View commit details
    Browse the repository at this point in the history
  8. Fix pygments#1479.

    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    28c9d43 View commit details
    Browse the repository at this point in the history
  9. Update CHANGES.

    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    6dd14ca View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8555313 View commit details
    Browse the repository at this point in the history
  11. Fix docs build.

    wcag-contrast-ratio is now a build-time dependency for the docs.
    Anteru authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    ea12e00 View commit details
    Browse the repository at this point in the history
  12. Add missing colors to dark styles

    Some dark styles did not define a color for every token type,
    resulting in black text (the browser default for text) on dark
    backgrounds (defined by the styles) unless the web page had some
    CSS to remedy that like:
    
      body { color: white; background: black; }
    
    We however don't want the readability of styles to rely on external CSS.
    
    Part of pygments#1718. Fixes some unreadable styles reported in pygments#1526.
    not-my-profile authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    7be47bb View commit details
    Browse the repository at this point in the history
  13. Slightly adjust sas style to meet WCAG AA

    Part of pygments#1718.
    not-my-profile authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    0d19572 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    e2e0d4f View commit details
    Browse the repository at this point in the history
  15. CSharp: add "cs" alias

    birkenfeld authored and hwayne committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    cf51855 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    ebf0161 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    4e34d1a View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    7a8223c View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. Configuration menu
    Copy the full SHA
    7da4cb2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c48cca4 View commit details
    Browse the repository at this point in the history
  3. Fix highlighting for alloy facts

    Alloy (http://alloytools.org/) facts can take a string token in addition
    to an identifier. This is because the name isn't actually used for
    facts, it's just for readability.
    
    This is technically undocumented behavior, but it's widely used in
    legacy specs and is handled this way in the official Alloy IDE.
    hwayne committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    ddf0217 View commit details
    Browse the repository at this point in the history
  4. Add new Alloy 6 temporal keywords

    Alloy 6 adds temporal logic to Alloy. This includes the following
    keywords:
    
    * Three new symbols: `'` (prime), `..` (step interval), and `;` (sequential composition)
    * Five future-time keywords: `always`, `after`, `eventually`, `until`,
      `releases`
    * Five past-time keywords: `historically`, `before`, `once`, `since`,
      `triggered`
    * A new `steps` keyword for specifying a range to model check.
    
    See here for full changes: https://alloytools.org/alloy6.html
    hwayne committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    fc6b812 View commit details
    Browse the repository at this point in the history
  5. Fix handling of " as a token

    Legacy alloy uses `'` to distinguish variables:
    
        all b, b': Foo | bar
    
    But since Alloy 6 makes `'` into an operator, the new recommendation is
    to use `"`:
    
        all b, b": Foo | bar
    
    See
    https://alloytools.org/alloy6.html#compatibility-with-pre-6-models.
    
    The lexer currently reads `b"` as starting a string. This commit fixes
    this by only having `"` begin a string if it's the start of a token.
    
    Additionally, `'` is removed from identifiers.
    hwayne committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    2759c7a View commit details
    Browse the repository at this point in the history
  6. Update the alloy golden test

    Alloy 6 recommends changing `'` in legacy specs to `"`. Since this is a
    breaking change, the golden test is updated to reflect that.
    hwayne committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    f92ecf0 View commit details
    Browse the repository at this point in the history
  7. Fix golden tests again

    hwayne committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    b0aa980 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Configuration menu
    Copy the full SHA
    fa8755a View commit details
    Browse the repository at this point in the history
  2. Fix highlighting for alloy facts

    Alloy (http://alloytools.org/) facts can take a string token in addition
    to an identifier. This is because the name isn't actually used for
    facts, it's just for readability.
    
    This is technically undocumented behavior, but it's widely used in
    legacy specs and is handled this way in the official Alloy IDE.
    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    41293ec View commit details
    Browse the repository at this point in the history
  3. Add new Alloy 6 temporal keywords

    Alloy 6 adds temporal logic to Alloy. This includes the following
    keywords:
    
    * Three new symbols: `'` (prime), `..` (step interval), and `;` (sequential composition)
    * Five future-time keywords: `always`, `after`, `eventually`, `until`,
      `releases`
    * Five past-time keywords: `historically`, `before`, `once`, `since`,
      `triggered`
    * A new `steps` keyword for specifying a range to model check.
    
    See here for full changes: https://alloytools.org/alloy6.html
    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    ee9fd8f View commit details
    Browse the repository at this point in the history
  4. Fix handling of " as a token

    Legacy alloy uses `'` to distinguish variables:
    
        all b, b': Foo | bar
    
    But since Alloy 6 makes `'` into an operator, the new recommendation is
    to use `"`:
    
        all b, b": Foo | bar
    
    See
    https://alloytools.org/alloy6.html#compatibility-with-pre-6-models.
    
    The lexer currently reads `b"` as starting a string. This commit fixes
    this by only having `"` begin a string if it's the start of a token.
    
    Additionally, `'` is removed from identifiers.
    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    3b57033 View commit details
    Browse the repository at this point in the history
  5. Update the alloy golden test

    Alloy 6 recommends changing `'` in legacy specs to `"`. Since this is a
    breaking change, the golden test is updated to reflect that.
    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    bed19fb View commit details
    Browse the repository at this point in the history
  6. Fix golden tests again

    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    3e9d1f6 View commit details
    Browse the repository at this point in the history
  7. Fix regexlint issue

    As mentioned in pygments#1963 (comment), the problem is that the rule matched . before .., so .. would never be matched. Fixed here.
    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    f64c531 View commit details
    Browse the repository at this point in the history
  8. Fix merge conflict

    hwayne committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    79f60b9 View commit details
    Browse the repository at this point in the history