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

Fix fragments that update other profiles #11343

Merged
1 commit merged into from
Sep 27, 2021

Conversation

lhecker
Copy link
Member

@lhecker lhecker commented Sep 27, 2021

SettingsLoader::_parse used to skip profiles which didn't have either a "guid"
or "name" field, due to #9962. This is however wrong for fragment loading, as
fragments can alternatively use an "updates" field instead of guid/name.

SettingsLoader::_parse was updated to allow profiles with this alternative
field during fragment loading.

PR Checklist

Validation Steps Performed

  • Wrote the following to
    %LOCALAPPDATA%\Microsoft\Windows Terminal\Fragments\test\test.json:
    {
      "profiles": [
        {
          "updates": "{574e775e-4f2a-5b96-ac1e-a2962a402336}",
          "background": "#FFD700"
        }
      ]
    }

@ghost ghost added Area-Settings Issues related to settings and customizability, for console or terminal Issue-Bug It either shouldn't be doing this or needs an investigation. Product-Terminal The new Windows Terminal. labels Sep 27, 2021
@lhecker
Copy link
Member Author

lhecker commented Sep 27, 2021

Use white-space suppression to review 👌: https://github.com/microsoft/terminal/pull/11343/files?diff=split&w=1

@zadjii-msft
Copy link
Member

@msftbot make sure @PankajBhojwani signs off on this

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Sep 27, 2021
@ghost
Copy link

ghost commented Sep 27, 2021

Hello @zadjii-msft!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@lhecker
Copy link
Member Author

lhecker commented Sep 27, 2021

@msftbot merge this in 2 minutes

@ghost
Copy link

ghost commented Sep 27, 2021

Hello @lhecker!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I'll only merge this pull request if it's approved by @PankajBhojwani
  • I won't merge this pull request until after the UTC date Mon, 27 Sep 2021 17:09:02 GMT, which is in 2 minutes

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ghost ghost merged commit 2d583fc into main Sep 27, 2021
@ghost ghost deleted the dev/lhecker/11331-fix-fragment-updates branch September 27, 2021 17:09
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Settings Issues related to settings and customizability, for console or terminal AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Product-Terminal The new Windows Terminal.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fragments that update profiles don't work
3 participants