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.

Sign up for GitHub

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

Jump to bottom

Add support for iterable, nested commands #6856

Merged
82 commits merged into from
Aug 13, 2020
Merged

Add support for iterable, nested commands #6856

82 commits merged into from
Aug 13, 2020

Commits on Apr 30, 2020

  1. Add a ton of text regarding Commandline Mode vs Action Mode

    @zadjii-msft
    zadjii-msft committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    c56eb8f View commit details
    Browse the repository at this point in the history

  2. move this spec out of drafts/

    @zadjii-msft
    zadjii-msft committed Apr 30, 2020
    1 Configuration menu
    Copy the full SHA
    fe640ff View commit details
    Browse the repository at this point in the history

  3. last little todos for review

    @zadjii-msft
    zadjii-msft committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    614d1b2 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/s/5400-C… 

    …ommandPalette-v1
    @zadjii-msft
    zadjii-msft committed May 7, 2020
    Configuration menu
    Copy the full SHA
    ead76d7 View commit details
    Browse the repository at this point in the history

  2. Move this section to 'future considerations'

    @zadjii-msft
    zadjii-msft committed May 7, 2020
    Configuration menu
    Copy the full SHA
    2e56436 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/s/5400-C… 

    …ommandPalette-v1
    @zadjii-msft
    zadjii-msft committed May 20, 2020
    Configuration menu
    Copy the full SHA
    0886e8f View commit details
    Browse the repository at this point in the history

  2. Add some notes about the advanced tab switcher and how that might int… 

    …erplay with this
    @zadjii-msft
    zadjii-msft committed May 20, 2020
    1 Configuration menu
    Copy the full SHA
    11130a4 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/s/5400-C… 

    …ommandPalette-v1
    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    f53553f View commit details
    Browse the repository at this point in the history

  2. good bot

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    0672812 View commit details
    Browse the repository at this point in the history

  3. Blind port these files from the old branch

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    43bd483 View commit details
    Browse the repository at this point in the history

  4. Hook up all the parsing once again

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    75af4ca View commit details
    Browse the repository at this point in the history

  5. Get names from the resources if provided as an object, not a string

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    33a9e32 View commit details
    Browse the repository at this point in the history

  6. This should have been in the previous commit

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    3627d8a View commit details
    Browse the repository at this point in the history

  7. Hook up the parsing of ActionAndArgss to the command palette

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    0416a94 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/master' into dev/migrie/f/2046-C… 

    …ommand-Palette-v2

# Conflicts:
#	src/cascadia/TerminalApp/TerminalPage.h
    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    6905065 View commit details
    Browse the repository at this point in the history

  9. Make the action names map public, so the ToJson in AKBSerialization c… 

    …an use it
    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    02f47f4 View commit details
    Browse the repository at this point in the history

  10. Move the action into it's own sub-object

    @zadjii-msft
    zadjii-msft committed May 28, 2020
    Configuration menu
    Copy the full SHA
    62b9a0d View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Add a ton of default commands

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    1 Configuration menu
    Copy the full SHA
    207666e View commit details
    Browse the repository at this point in the history

  2. Make sure to scroll the selected item into view

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    b88be45 View commit details
    Browse the repository at this point in the history

  3. Add duplicate pane to the default commands

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    00763fd View commit details
    Browse the repository at this point in the history

  4. Add some stability 

      Don't die when we encounter an unexpected key
  Reload successfully
    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    bc546db View commit details
    Browse the repository at this point in the history

  5. Do this in WinRTUtils instead of hackily doing it manually

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    e1be26b View commit details
    Browse the repository at this point in the history

  6. Rename private methods, fix wraparound logic

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    a309191 View commit details
    Browse the repository at this point in the history

  7. Return focus to the active control when closed

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    9905945 View commit details
    Browse the repository at this point in the history

  8. Try to do this with a shadow, but it crashes inexplicably

    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    cf6e1f2 View commit details
    Browse the repository at this point in the history

  9. Well, this is neat, and works, but requires 18362 and also casts a sh… 

    …adow on the menuflyout???
    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    fa93fdc View commit details
    Browse the repository at this point in the history

  10. Turns out, the shadow on the menuflyout isn't my fault, it's on every… 

    …thing that uses MUX
    @zadjii-msft
    zadjii-msft committed May 29, 2020
    Configuration menu
    Copy the full SHA
    1fbe8e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Extract ActionAndArgs::FromJson into it's own class, so it can be re-… 

    …used later
    @zadjii-msft
    zadjii-msft committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    6e6979a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into dev/migrie/f/2046-C… 

    …ommand-Palette-v2

# Conflicts:
#	src/cascadia/TerminalApp/GlobalAppSettings.cpp
#	src/cascadia/TerminalApp/GlobalAppSettings.h
    @zadjii-msft
    zadjii-msft committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    829beda View commit details
    Browse the repository at this point in the history

  3. Merge commit '6e6979abe' into dev/migrie/f/2046-Command-Palette-v2 

    # Conflicts:
#	src/cascadia/TerminalApp/ActionAndArgs.cpp
#	src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp
    @zadjii-msft
    zadjii-msft committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    487f33e View commit details
    Browse the repository at this point in the history

  4. Tons of commenting

    @zadjii-msft
    zadjii-msft committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    58be8cd View commit details
    Browse the repository at this point in the history

  5. Make the commands a map, so we can override on "name"

    @zadjii-msft
    zadjii-msft committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    9d411d4 View commit details
    Browse the repository at this point in the history

  6. Ready for review.

    @zadjii-msft
    zadjii-msft committed Jun 4, 2020
    1 Configuration menu
    Copy the full SHA
    d71d8d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/2046-C… 

    …ommand-Palette-v2
    @zadjii-msft
    zadjii-msft committed Jun 9, 2020
    1 Configuration menu
    Copy the full SHA
    b3d8f0e View commit details
    Browse the repository at this point in the history

  2. I couldn't tell you how long this took

    @zadjii-msft
    zadjii-msft committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    67c7969 View commit details
    Browse the repository at this point in the history

  3. If a key is bound to that action, then display the keybinding in the … 

    …palette
    @zadjii-msft
    zadjii-msft committed Jun 9, 2020
    1 Configuration menu
    Copy the full SHA
    82f968d View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Add much better key chord text to the command palette

    @zadjii-msft
    zadjii-msft committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    edc8b55 View commit details
    Browse the repository at this point in the history

  2. implement a weighted ordering for command palette entries

    @zadjii-msft
    zadjii-msft committed Jun 10, 2020
    1 Configuration menu
    Copy the full SHA
    dd684cb View commit details
    Browse the repository at this point in the history

  3. Add support for expanding a command into many commands for every prof… 

    …ile. This is so dirty, but works so well.
    @zadjii-msft
    zadjii-msft committed Jun 10, 2020
    1 Configuration menu
    Copy the full SHA
    3674c61 View commit details
    Browse the repository at this point in the history

  4. lets clean this up so it's not so horrifying.

    @zadjii-msft
    zadjii-msft committed Jun 10, 2020
    1 Configuration menu
    Copy the full SHA
    0b126f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn

# Conflicts:
#	doc/specs/#2046 - Command Palette.md
#	src/cascadia/TerminalApp/ActionAndArgs.cpp
#	src/cascadia/TerminalApp/ActionAndArgs.h
#	src/cascadia/TerminalApp/AppActionHandlers.cpp
#	src/cascadia/TerminalApp/AppKeyBindings.cpp
#	src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp
#	src/cascadia/TerminalApp/CascadiaSettings.cpp
#	src/cascadia/TerminalApp/Command.cpp
#	src/cascadia/TerminalApp/Command.h
#	src/cascadia/TerminalApp/Command.idl
#	src/cascadia/TerminalApp/CommandPalette.cpp
#	src/cascadia/TerminalApp/CommandPalette.h
#	src/cascadia/TerminalApp/CommandPalette.idl
#	src/cascadia/TerminalApp/CommandPalette.xaml
#	src/cascadia/TerminalApp/GlobalAppSettings.cpp
#	src/cascadia/TerminalApp/GlobalAppSettings.h
#	src/cascadia/TerminalApp/Resources/en-US/Resources.resw
#	src/cascadia/TerminalApp/ShortcutActionDispatch.cpp
#	src/cascadia/TerminalApp/ShortcutActionDispatch.h
#	src/cascadia/TerminalApp/ShortcutActionDispatch.idl
#	src/cascadia/TerminalApp/TerminalPage.cpp
#	src/cascadia/TerminalApp/TerminalPage.h
#	src/cascadia/TerminalApp/TerminalPage.xaml
    @zadjii-msft
    zadjii-msft committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    4420aea View commit details
    Browse the repository at this point in the history

  2. get it building again

    @zadjii-msft
    zadjii-msft committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    4e134e3 View commit details
    Browse the repository at this point in the history

  3. This works to auto-generate names from iterable commands without give… 

    …n names
    @zadjii-msft
    zadjii-msft committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    946d710 View commit details
    Browse the repository at this point in the history

  4. add some stubs for tests in the future

    @zadjii-msft
    zadjii-msft committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    a5eba5a View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. escape profile names for json before re-parsing

    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    ac74de4 View commit details
    Browse the repository at this point in the history

  2. re-use FromJson when expanding, as to not just duplicate the entire m… 

    …ethod
    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    7321639 View commit details
    Browse the repository at this point in the history

  3. start working on nested actions

    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    d953d8b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn
    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    dc7a816 View commit details
    Browse the repository at this point in the history

  5. holy shit this worked on the first try

    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    1 Configuration menu
    Copy the full SHA
    0c8471d View commit details
    Browse the repository at this point in the history

  6. write a test that _should_ check if an iterable command can have nest… 

    …ed commands
    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    bdd7e3b View commit details
    Browse the repository at this point in the history

  7. This was a failure 

      I'm gonna revert this because this does not fix the tests at all
    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    93d31c2 View commit details
    Browse the repository at this point in the history

  8. Revert "This was a failure" 

    This reverts commit 93d31c2.
    @zadjii-msft
    zadjii-msft committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    5052e64 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. more tests, more!

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    c6a8fe9 View commit details
    Browse the repository at this point in the history

  2. this fixes TestNestedInIterableCommand, but `TestMixedNestedAndIter… 

    …ableCommand` is still returning only 1 child command
    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    f5659d2 View commit details
    Browse the repository at this point in the history

  3. this mysteriously fixes the mixed test, which I was pretty onfident I… 

    … had tried before...
    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    077cd6e View commit details
    Browse the repository at this point in the history

  4. man these are some great tests

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    26a1a41 View commit details
    Browse the repository at this point in the history

  5. clean up this duplicated code

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    33ee177 View commit details
    Browse the repository at this point in the history

  6. make sure to actually update the xaml lists as well.

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    1 Configuration menu
    Copy the full SHA
    be5aee3 View commit details
    Browse the repository at this point in the history

  7. code cleanup

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    92167a5 View commit details
    Browse the repository at this point in the history

  8. more tests, code cleanup

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    1 Configuration menu
    Copy the full SHA
    7968b2a View commit details
    Browse the repository at this point in the history

  9. finish remaining todos, also, good bot

    @zadjii-msft
    zadjii-msft committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    c5208e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn

# Conflicts:
#	src/cascadia/TerminalApp/Command.cpp
#	src/cascadia/TerminalApp/CommandPalette.cpp
#	src/cascadia/TerminalApp/CommandPalette.h
    @zadjii-msft
    zadjii-msft committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    7cb870c View commit details
    Browse the repository at this point in the history

  2. These changes to defaults.json are out-of-date, and Command doesn't n… 

    …eed an ObservableVector
    @zadjii-msft
    zadjii-msft committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    8fd3e0d View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn

# Conflicts:
#	src/cascadia/TerminalApp/ColorScheme.cpp
#	src/cascadia/TerminalApp/ColorScheme.h
    @zadjii-msft
    zadjii-msft committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    2763c90 View commit details
    Browse the repository at this point in the history

  2. the tiniest nit

    @zadjii-msft
    zadjii-msft committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    3d0c81c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn
    @zadjii-msft
    zadjii-msft committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    50bdc3d View commit details
    Browse the repository at this point in the history

  2. well, we definitely want this

    @zadjii-msft
    zadjii-msft committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    2a8d4c5 View commit details
    Browse the repository at this point in the history

  3. This makes command expansion the TerminalPage's responsibility, but i… 

    …t also only does it when the settings are reloaded. Lets try doing it every time the list of tabs changes
    @zadjii-msft
    zadjii-msft committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    0719b42 View commit details
    Browse the repository at this point in the history

  4. expand commands every time the list of tabs changes

    @zadjii-msft
    zadjii-msft committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    77e51af View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn

# Conflicts:
#	src/cascadia/TerminalApp/TerminalPage.cpp
    @zadjii-msft
    zadjii-msft committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    1e9bf47 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn

# Conflicts:
#	src/cascadia/TerminalApp/Command.h
#	src/cascadia/TerminalApp/Command.idl
#	src/cascadia/TerminalApp/CommandPalette.cpp
#	src/cascadia/TerminalApp/CommandPalette.h
#	src/cascadia/TerminalApp/TerminalPage.cpp
    @zadjii-msft
    zadjii-msft committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    b60b82b View commit details
    Browse the repository at this point in the history

  3. I guess we only really need to do this once

    @zadjii-msft
    zadjii-msft committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    ec2db21 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev/migrie/f/6856-let-terminalpa… 

    …ge-expandcommands' into dev/migrie/f/command-palette-iterateOn
    @zadjii-msft
    zadjii-msft committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    c8c0032 View commit details
    Browse the repository at this point in the history

  5. nits from PR

    @zadjii-msft
    zadjii-msft committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    b4eb86d View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. Merge remote-tracking branch 'origin/master' into dev/migrie/f/comman… 

    …d-palette-iterateOn
    @zadjii-msft
    zadjii-msft committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    1975e8c View commit details
    Browse the repository at this point in the history

  2. Add a helper for find/replace-ing a string

    @zadjii-msft
    zadjii-msft committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    57abe29 View commit details
    Browse the repository at this point in the history

  3. Clean up our string handling substantially

    @zadjii-msft
    zadjii-msft committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    9981126 View commit details
    Browse the repository at this point in the history

  4. minor nits, more tracing

    @zadjii-msft
    zadjii-msft committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    c55d53e View commit details
    Browse the repository at this point in the history

  5. some cleaner lifetime management for these variables

    @zadjii-msft
    zadjii-msft committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    3269309 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. use a IMap to store subcommands, and then generate the vector when we… 

    … enter the nesting
    @zadjii-msft
    zadjii-msft committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    933dc7e View commit details
    Browse the repository at this point in the history

  2. Fix the localtests for commands

    @zadjii-msft
    zadjii-msft committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    5198142 View commit details
    Browse the repository at this point in the history

  3. Dustin wanted every command to not necessarily have a subcommand map,… 

    … so here he goes
    @zadjii-msft
    zadjii-msft committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    7b014d9 View commit details
    Browse the repository at this point in the history