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

Render tabs in the text viewer #8659

Merged
1 commit merged into from Dec 9, 2020

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Dec 6, 2020

Update TextViewer to include a submodule update by @lhiginbotham that not yet is applied to the main application.
https://github.com/gitextensions/ICSharpCode.TextEditor/pull/23/files
gitextensions/ICSharpCode.TextEditor#22

Proposed changes

See submodule changes

Test methodology

Manual - see submodule


✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned gerhardol Dec 6, 2020
@codecov
Copy link

codecov bot commented Dec 6, 2020

Codecov Report

Merging #8659 (c52eb70) into master (0dbdcd6) will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #8659   +/-   ##
=======================================
  Coverage   55.15%   55.15%           
=======================================
  Files         907      907           
  Lines       65626    65626           
  Branches    11881    11881           
=======================================
+ Hits        36193    36194    +1     
+ Misses      26604    26603    -1     
  Partials     2829     2829           
Flag Coverage Δ
production 42.11% <ø> (-0.01%) ⬇️
tests 94.94% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@mstv
Copy link
Member

mstv commented Dec 6, 2020

Good catch. But I don't see a difference in the commit-message editor. Tabs have already been rendered.

@lhiginbotham
Copy link
Contributor

@mstv

Good catch. But I don't see a difference in the commit-message editor. Tabs have already been rendered.

How do you mean? If you go to reword a commit and put some tabs in the editor, you will not see them, but they exist (can be deleted accordingly i.e. press tab 7 times, you will have to delete or traverse with arrow keys 7 times to account for it).

@mstv
Copy link
Member

mstv commented Dec 8, 2020

Good catch

... that the changed submodule is not used yet.

  1. I missed that the original issue was just about rewording commits. Other usages of TextEditor are able to display tabs (FormCommit and F4).
    That's why there was no need to alter the submodule.
    But you are going to enable it by default. 👍
  2. If testing the portable build, the git config for file editor must be updated manually. Works 👍.

@gerhardol
Copy link
Member Author

I also had some problems to find the issue...

@gerhardol
Copy link
Member Author

@msftbot merge in 24 hours

@ghost ghost added the status: auto merge label Dec 8, 2020
@ghost
Copy link

ghost commented Dec 8, 2020

Hello @gerhardol!

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 won't merge this pull request until after the UTC date Wed, 09 Dec 2020 20:46:43 GMT, which is in 1 day

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 fe76945 into gitextensions:master Dec 9, 2020
@ghost ghost added this to the 4.0 milestone Dec 9, 2020
@gerhardol gerhardol deleted the feature/render-text-tabs branch December 9, 2020 22:41
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants