Fix tab label disambiguation regression #2081
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jeremypw can you resolve conflicts here? |
danirabbit
added
the
Conflicts with master
added 2 commits
December 1, 2022 18:46
# Conflicts fixed: # src/View/ViewContainer.vala
|
@danirabbit Conflict fixed. |
jeremypw
removed
the
Conflicts with master
|
@jeremypw Conflicts with main again |
zeebok
added
the
Conflicts with master
zeebok
previously approved these changes
Mar 2, 2023
jeremypw
removed
the
Conflicts with master
zeebok
approved these changes
Mar 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At some point tab labels stopped being disambiguated. This PR moves the diambiguation code to
FileUtilsand further unit tests added to valid the function for some corner cases.The revised disambiguation code allows losing the
idproperty from the ViewContainer class.