Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Show original and changed linefeed in diff view#8645

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation

@Chris2011
Copy link
Contributor

@Chris2011Chris2011 commentedJul 10, 2025•
edited
Loading

The current behavior, when the linefeed changes, you just see, that the file was modified but you dunno why. This PR adds the original and the changed linefeed.

I used GridLayout for the header because I couldn't handle adding the exact position what it is now. But this changes the layout a bit, You can see it in the before and after image.

Before
Before

After
After

So I'm not that good at design JSwing UIs with correct position etc. So please have a look and if you find a better solution, please lemme know.

^Add meaningful description above

Click to collapse/expand PR instructions

If you're a committer, please label the PR before pressing "Create pull request" so that the right test jobs can run.

PR approval and merge checklist:

  1. Was this PRcorrectly labeled, did the right tests run? When did they run?
  2. Is this PRsquashed?
  3. Are author name / email address correct? Areco-authors correctly listed? Do the commit messages need updates?
  4. Does the PR title and description still fit after the Nth iteration? Is the description sufficient to appear in the release notes?

If this PR targets the delivery branch:don't merge. (full wiki article)

@Chris2011Chris2011 added enhancement git[ci] enable versioning job ci:dev-build[ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labelsJul 10, 2025
@Chris2011Chris2011 self-assigned thisJul 10, 2025
@Chris2011Chris2011force-pushed thefeature/show-linefeed-changes-in-diff-view branch from097cde8 to273527eCompareJuly 12, 2025 13:14
@Chris2011Chris2011 requested a review frommbienJuly 12, 2025 13:14
@Chris2011Chris2011 marked this pull request as ready for reviewJuly 12, 2025 13:14
@Chris2011Chris2011 added this to theNB28 milestoneJul 23, 2025
Copy link
Contributor

@matthiasblaesingmatthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Nice feature and works.

Independent of this change NetBeans will not detect changes to the line endings if the document is already opened (BaseDocument initializes the property exactly once). This is a different problem though.

For the implementation I left a few inline comments.

@Chris2011
Copy link
ContributorAuthor

Everything changed and tested as requested. Thx.

@Chris2011
Copy link
ContributorAuthor

I already added a background to make it more prominent. I already wanted to use the colors from the git integration for added, deleted and modified as forground colors for just the text, but they didn't fit on the light theme.

Copy link
Contributor

@matthiasblaesingmatthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Looks sane to me. Thank you. Please squash before merging.

Chris2011 reacted with thumbs up emoji
@Chris2011Chris2011force-pushed thefeature/show-linefeed-changes-in-diff-view branch from7487fb5 toc72e616CompareAugust 11, 2025 14:56
@Chris2011Chris2011force-pushed thefeature/show-linefeed-changes-in-diff-view branch fromc72e616 to0615a38CompareAugust 11, 2025 15:08
@Chris2011Chris2011 merged commit554e8f0 intoapache:masterAug 12, 2025
31 checks passed
@Chris2011Chris2011 deleted the feature/show-linefeed-changes-in-diff-view branchAugust 12, 2025 16:22
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@matthiasblaesingmatthiasblaesingmatthiasblaesing approved these changes

@lkishalmilkishalmiAwaiting requested review from lkishalmi

@neilcsmith-netneilcsmith-netAwaiting requested review from neilcsmith-net

@mbienmbienAwaiting requested review from mbien

Assignees

@Chris2011Chris2011

Labels

ci:dev-build[ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page)enhancementgit[ci] enable versioning job

Projects

None yet

Milestone

NB28

Development

Successfully merging this pull request may close these issues.

3 participants

@Chris2011@mbien@matthiasblaesing
[8]ページ先頭
©2009-2025 Movatter.jp