Navigation style setting and file history navigation improvements #1603

austincondiff · 2024-03-05T08:15:47Z

Description

The new Navigation Style setting allows users to open a single file instead of multiple files in an editor. When this is set, the tab bar is hidden when there is only a single temporary tab.

When splitting an editor, the new editors only tab (copied from the previous editor) will now be a temporary tab (previously not temporary). This is so that when using a "open in place" navigation style, the tabs will remain hidden when splitting an editor.

If going back or forward in history to a file for a tab that was previously closed, we now open it as a temporary tab. Again this will prevent the tab bar from unnecessarily showing up in certain edge-cases.

We are also now invalidating history when opening file with project navigator so user cannot go forward.

Related Issues

closes ✨ Navigation Style Setting in Navigation Settings #1602

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

Screen.Recording.2024-03-05.at.9.23.14.AM.mp4

CodeEditTextView will need work to fix a bug revealed by this work, see below video (@thecoolwinter)
https://github.com/CodeEditApp/CodeEdit/assets/806104/f1a57323-98a7-4bdb-baaa-aa39ddf4e166 ↩
I might need to iterate over all editor splits to determine this. See TODO in code. (@Wouter01 any ideas?) ↩

Wouter01 · 2024-03-05T15:21:30Z

Is this issue related to the safe area height?

austincondiff · 2024-03-05T15:31:10Z

I had to modify the safe area height depending on what is in display. CodeEditTextView does not update when the safe area is changed. Also I discovered that the line numbers are hidden in the safe area and need to be visible.

@Wouter01 The footnote I mentioned you in was relating to the EditorManager (previously called the TabGroupManager). We need to iterate over all editors to see if any of the editors have temporary tabs. If any do, we need to show the tab bar in all editors when the navigation style is set to open in place.

Wouter01 · 2024-03-05T16:48:53Z

The code mentioned with the TODO seems fine to me! It's been some time since I worked on it so I can't tell for sure, but I don't see anything wrong with it immediately

…across other editors

…ges to open in place, we change the tab to be termporary so that tab bar will hide

austincondiff · 2024-03-06T08:15:37Z

This is now ready for review.

0xWDG

LGTM,

One note, maybe it is better to change
.padding(.horizontal, shouldShowTabBar ? file == nil ? 10 : 4 : 0)
to
.padding(.horizontal, shouldShowTabBar ? (file == nil ? 10 : 4) : 0)
to make it more clear what the ternary operator is doing.
But that's more my personal style preference.

CodeEdit/Features/Editor/Models/EditorManager.swift

austincondiff · 2024-03-07T18:51:28Z

@FastestMolasses and @0xWDG I just pushed both of your suggestions.

0xWDG

🎉

CodeEdit/Features/Editor/Models/EditorManager.swift

CodeEdit/Features/Editor/Models/EditorLayout.swift

thecoolwinter · 2024-03-09T03:11:12Z

I have a PR open to fix the related issue on CodeEditSourceEditor here.

### Description - Refactors a few style functions to correctly update the gutter view's position when the content insets change. - Adds the gutter view position to the content insets test case. ### Related Issues * Required to finish [CodeEdit#1603](CodeEditApp/CodeEdit#1603) ### Checklist - [x] I read and understood the [contributing guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md) as well as the [code of conduct](https://github.com/CodeEditApp/CodeEdit/blob/main/CODE_OF_CONDUCT.md) - [x] The issues this PR addresses are related to each other - [x] My changes generate no new warnings - [x] My code builds and runs on my machine - [x] My changes are all related to the related issue above - [x] I documented my code ### Screenshots N/A

austincondiff · 2024-03-09T14:49:55Z

@thecoolwinter merged now. Do you want to create a new release of CESE and I can add the new version in this branch?

…for a teb that was previously closed, we now open it as a temporary tab

thecoolwinter · 2024-03-11T20:02:30Z

@austincondiff thanks for the approval on CESE, I made a release for that package if you update to 0.7.2 it should work correctly.

Made changes

Made suggested changes

austincondiff · 2024-03-12T02:49:23Z

Please note the following additions:

When splitting an editor, the new editors only tab (copied from the previous editor) will now be a temporary tab (previously not temporary). This is so that when using a "open in place" navigation style, the tabs will remain hidden when splitting an editor.

If going back or forward in history to a file for a tab that was previously closed, we now open it as a temporary tab. Again this will prevent the tab bar from unnecessarily showing up in certain edge-cases.

We are also now invalidating history when opening file with project navigator so user cannot go forward.

thecoolwinter

Some UX stuff and looks like @matthijseikelenboom comment wasn't resolved.

CodeEdit/Features/Editor/Views/EditorView.swift

CodeEdit/Features/Editor/TabBar/Views/EditorTabBarTrailingAccessories.swift

CodeEdit/Features/Editor/Models/EditorLayout.swift

matthijseikelenboom

I see it's already merged, but still

matthijseikelenboom · 2024-03-12T10:11:47Z

CodeEdit/Features/Editor/Models/EditorManager.swift

@@ -61,10 +72,21 @@ class EditorManager: ObservableObject {

    /// Flattens the splitviews.
    func flatten() {


Calling this function "flatten" is a bit weird. editorManager.flatten() kind of reads like this function flattens the manager

Probably should be flattenEditors. I did not write this. We can go in and change this later.

Come to think of it, we might even consider other words like join, combine, or merge. (VS Code uses join)

…deEditApp#1603) * Added navigation style setting * Added navigation style setting * If one editors tab bar should be shown, all tab bars should be shown across other editors * Removed complete TODO comment * When there is only one tab in an editor and the navigation style changes to open in place, we change the tab to be termporary so that tab bar will hide * Invalidating flattenedEditors cache when editors change. * New editors open first tab as a temporary tab. * History improvements - if going back or forward in history to a file for a teb that was previously closed, we now open it as a temporary tab * Update CodeEditSourceEditor dependency version * Invalidating flattenedEditors cache when closing an editor * Removing last change * Fixed PR issue.

austincondiff added 2 commits March 5, 2024 02:04

Added navigation style setting

8e40f5d

Added navigation style setting

5061ebe

austincondiff added 3 commits March 6, 2024 01:51

If one editors tab bar should be shown, all tab bars should be shown …

8187910

…across other editors

Removed complete TODO comment

1d9f98e

When there is only one tab in an editor and the navigation style chan…

f4f257a

…ges to open in place, we change the tab to be termporary so that tab bar will hide

austincondiff marked this pull request as ready for review March 6, 2024 08:13

austincondiff requested review from 0xWDG, FastestMolasses, EstebanBorai, thecoolwinter, Wouter01 and tom-ludwig March 6, 2024 08:14

0xWDG previously approved these changes Mar 6, 2024

View reviewed changes

FastestMolasses previously requested changes Mar 7, 2024

View reviewed changes

CodeEdit/Features/Editor/Models/EditorManager.swift Outdated Show resolved Hide resolved

Invalidating flattenedEditors cache when editors change.

d571c73

austincondiff dismissed 0xWDG’s stale review via d571c73 March 7, 2024 18:50

austincondiff requested review from 0xWDG and FastestMolasses March 7, 2024 18:51

austincondiff added enhancement New feature or request settings labels Mar 7, 2024

0xWDG previously approved these changes Mar 8, 2024

View reviewed changes

matthijseikelenboom previously requested changes Mar 8, 2024

View reviewed changes

CodeEdit/Features/Editor/Models/EditorManager.swift Outdated Show resolved Hide resolved

CodeEdit/Features/Editor/Models/EditorLayout.swift Outdated Show resolved Hide resolved

thecoolwinter mentioned this pull request Mar 9, 2024

Update GutterView Insets Correctly CodeEditApp/CodeEditSourceEditor#240

Merged

6 tasks

New editors open first tab as a temporary tab.

a02bf0b

austincondiff dismissed 0xWDG’s stale review via a02bf0b March 11, 2024 14:42

austincondiff requested review from matthijseikelenboom and 0xWDG March 11, 2024 14:43

austincondiff marked this pull request as draft March 11, 2024 17:37

History improvements - if going back or forward in history to a file …

86ddbb8

…for a teb that was previously closed, we now open it as a temporary tab

austincondiff changed the title ~~Navigation style setting~~ Navigation style setting and history improvements Mar 11, 2024

austincondiff changed the title ~~Navigation style setting and history improvements~~ Navigation style setting and file history navigation improvements Mar 11, 2024

austincondiff marked this pull request as ready for review March 11, 2024 19:54

Update CodeEditSourceEditor dependency version

5ef954a

Invalidating flattenedEditors cache when closing an editor

afa32e3

Removing last change

29a0c76

austincondiff requested a review from bombardier200 March 12, 2024 02:38

bombardier200 previously approved these changes Mar 12, 2024

View reviewed changes

austincondiff self-assigned this Mar 12, 2024

thecoolwinter requested changes Mar 12, 2024

View reviewed changes

Fixed PR issue.

2cd2022

austincondiff dismissed bombardier200’s stale review via 2cd2022 March 12, 2024 05:26

thecoolwinter approved these changes Mar 12, 2024

View reviewed changes

austincondiff requested a review from bombardier200 March 12, 2024 15:35

austincondiff enabled auto-merge (squash) March 12, 2024 15:35

austincondiff disabled auto-merge March 12, 2024 15:35

austincondiff merged commit 4d9a5d4 into CodeEditApp:main Mar 12, 2024
2 checks passed

matthijseikelenboom reviewed Mar 12, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Navigation style setting and file history navigation improvements #1603

Navigation style setting and file history navigation improvements #1603

austincondiff commented Mar 5, 2024 •

edited

Loading

Wouter01 commented Mar 5, 2024

austincondiff commented Mar 5, 2024

Wouter01 commented Mar 5, 2024

austincondiff commented Mar 6, 2024

0xWDG left a comment

austincondiff commented Mar 7, 2024

0xWDG left a comment

thecoolwinter commented Mar 9, 2024

austincondiff commented Mar 9, 2024 •

edited

Loading

thecoolwinter commented Mar 11, 2024

austincondiff commented Mar 12, 2024

thecoolwinter left a comment

matthijseikelenboom left a comment

matthijseikelenboom Mar 12, 2024

austincondiff Mar 12, 2024

austincondiff Mar 12, 2024 •

edited

Loading

		@@ -61,10 +72,21 @@ class EditorManager: ObservableObject {

		/// Flattens the splitviews.
		func flatten() {

Navigation style setting and file history navigation improvements #1603

Navigation style setting and file history navigation improvements #1603

Conversation

austincondiff commented Mar 5, 2024 • edited Loading

Description

Related Issues

Checklist

Screenshots

Footnotes

Wouter01 commented Mar 5, 2024

austincondiff commented Mar 5, 2024

Wouter01 commented Mar 5, 2024

austincondiff commented Mar 6, 2024

0xWDG left a comment

Choose a reason for hiding this comment

austincondiff commented Mar 7, 2024

0xWDG left a comment

Choose a reason for hiding this comment

thecoolwinter commented Mar 9, 2024

austincondiff commented Mar 9, 2024 • edited Loading

thecoolwinter commented Mar 11, 2024

austincondiff commented Mar 12, 2024

thecoolwinter left a comment

Choose a reason for hiding this comment

matthijseikelenboom left a comment

Choose a reason for hiding this comment

matthijseikelenboom Mar 12, 2024

Choose a reason for hiding this comment

austincondiff Mar 12, 2024

Choose a reason for hiding this comment

austincondiff Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

austincondiff commented Mar 5, 2024 •

edited

Loading

austincondiff commented Mar 9, 2024 •

edited

Loading

austincondiff Mar 12, 2024 •

edited

Loading