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

add missing prop comments when merging global configs on upgrade #1004

Merged
merged 3 commits into from
Nov 15, 2021

Commits on Nov 15, 2021

  1. add missing prop comments when merging global configs on upgrade

    Fixes an issue where new prop comments would not be added to a user's
    global config on upgrade. This issue occurred due to how comment-json
    stores comments in CommentToken arrays, under a symbol determined by the
    closest json property, such as `Symbol.for('before:sessionTracking)`
    When a comment-json assign is done on two CommentJSONValue-s that both
    have comments under the same symbol, the json with higher priority will override
    the other, as opposed to magically merging the arrays together with no duplicates.
    
    This was fixed by re-adding in any missing comments.
    No guarantees are made about the exact locations of re-added comments, to avoid
    risk associated with a larger rework. I re-added them to the front for now, because
    that works the best for the specific issue pointed out ("token" missing").
    
    J=SLAP-1694
    TEST=manual,auto
    
    jambo upgrade, saw token added to my global config
    oshi97 committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    b683e02 View commit details
    Browse the repository at this point in the history
  2. empty because github is bork

    oshi97 committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    6fa2221 View commit details
    Browse the repository at this point in the history
  3. add return types

    oshi97 committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    e5aad38 View commit details
    Browse the repository at this point in the history