Keyboard shortcut to switch sidebar navigator tabs

[FastestMolasses]

Description

Edited: This PR now adds the shortcuts to change between the sidebar navigator tabs. This also removes the old shortcut of using ⌘+index to change between files. Finally, these shortcuts are also added in the View/Navigators menu item like how Xcode has it. Each tab is now draggable and they can be reordered by the user to their preference.

The shortcut is: ⌘+ number

With number ranging from 1 - 9. Because each sidebar navigator tab is now draggable, you can rearrange the order and the following keyboard shortcuts will update accordingly.

Related Issues

Closes #1384

Checklist

• I read and understood the contributing guide as well as the code of conduct
• The issues this PR addresses are related to each other
• My changes generate no new warnings
• My code builds and runs on my machine
• My changes are all related to the related issue above
• I documented my code

Screenshots

Here's how the shortcut menu looks in Xcode

Here it is in CodeEdit

Demo

[austincondiff]

These buttons theoretically will still consume space otherwise not occupied. Maybe setting width and height to 0 and clip. We could create a custom modifier for this. However there may be a better alternative. Anyone else have any better ideas?

[FastestMolasses]

I believe it's not taking any space due to this modifier:

.frame(width: 0, height: 0)

Here is a screenshot of my change:

And a screenshot of the original code using .hidden()

[matthijseikelenboom]

There is no issue for this?

[FastestMolasses]

There is no issue for this?

Created an issue and updated the pull request comment

[FastestMolasses]

Updated!

[austincondiff]

Great work! Why is the Find Navigator command 4 and not command 3?

[FastestMolasses]

I put it as 4 because in Xcode, 3 is reserved for the symbols tab, which I wasnt sure if it was going to be added to CodeEdit or not. If not I can change it to cmd+3. Lmk!

[austincondiff]

I see. These keyboard shortcuts should be dynamic. You will be able to rearrange these icons. The shortcuts should always be in the order in which they appear. So say you move the Find Navigator from the third to the first position, it should then be ⌘1 instead of ⌘3.

[bombardier200]

@FastestMolasses There are some SwiftLint errors that need to be fixed please.

[austincondiff]

What do we have left on this PR?

[austincondiff]

@matthijseikelenboom if this is the case, should we just merge this as is for now?

[matthijseikelenboom]

@austincondiff Hmm yeah we could, but we don't know if it will ever get fixed. It can also just be a limitation of SwiftUI.

Anyway, if we merge this, we need an issue that notes everything that is broken or missing. But I think its a better idea to disable dragging icons, otherwise we have broken functionality in the app, which I'm not a favor of. More so, it wasn't part of the issue that is being addressed here.

[Wouter01]

This isn't a SwiftUI issue, but rather a mistake in the code. In ViewCommands.swift, a reference to the navigatorSidebarViewModel is used, but is not observed. Thus, the commands will only be set once and won't be updated afterwards. This can be easily solved:

extension ViewCommands {
    struct NavigatorCommands: View {
        @ObservedObject var model: NavigatorSidebarViewModel
        
        var body: some View {
            Menu("Navigators", content: {
                ForEach(Array(model.items.enumerated()), id: \.element) { index, tab in
                    Button(tab.title) {
                        model.setNavigatorTab(tab: tab)
                    }
                    .keyboardShortcut(KeyEquivalent(Character(String(index + 1))))
                }
            })
        }
    }
}

And then in ViewCommands:

if let model = windowController?.navigatorSidebarViewModel {
    Divider()
    
    NavigatorCommands(model: model)
}

NavigatorCommands is provided as an extension of ViewCommands, so it doesn't clutter the global scope

Could you add these changes in your PR, @FastestMolasses ?

[FastestMolasses]

@Wouter01 Great catch, it's working perfectly now. This PR is ready to be reviewed now.

[austincondiff]

Great work @FastestMolasses! ✅

[FastestMolasses]

Theres 1 swift lint error, where the swapTab function has 6 parameters, where only 5 are allowed. Can I add an exception to this rule, or does anyone have any ideas on how to not use a 6th parameter?

[thecoolwinter]

@FastestMolasses yes that's an okay exception. I don't feel like adding a struct just for that function call is a good trade off, which is what I'd usually suggest in place of it. Just make sure each parameter is on a new line in that function declaration.

[FastestMolasses]

Ready for a re-review!

[austincondiff]

LGTM! ✅

[FastestMolasses]

Bumping!

Changes were made