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

Proposal/issue 44#45

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

Merged
wumpz merged 3 commits intojava-diff-utils:masterfromrosta:proposal/issue-44
Sep 21, 2019
Merged

Conversation

@rosta
Copy link
Contributor

Correction to reportLinesUnchanged / showInlineDiffs incompatibility

Possible implementation of rawValue option

It appears that the configuration reportLinesUnchanged has no effectwhen showInlineDiffs is true. That is '<' and '>' characters areconverted to HTML entities regardless.
@rosta
Copy link
ContributorAuthor

I'm beginning to think that this might not be the best solution.

A better way forward might be to split the diffing and the formatting into two phases and let the client code call appropriate formatting routines directly. However that would mean that differences are calculated twice. Once when differences are found and classified, and once when the diff marker tags are interpolated into the formatted text.

Hmmm...

@wumpz
Copy link
Collaborator

The diffing and formatting are done in two phases, IMHO. How do you want to split it?

@rosta
Copy link
ContributorAuthor

Yes, I hear what you say. I don't mean to dish what has already been doneand works.

It's just that I haven't yet found how to get the output I need. Worse, I don't even know what that is exactly :-( I'll be looking at that this week. Please don't do anything with this PR for the moment until I can update it.

@wumpz
Copy link
Collaborator

Would it be an improvement, if you don't use the default line normalizer?LINE_NORMALIZER_FOR_HTML simply callsStringUtils::normalize. Without it, you would not have those html tags preprocessed. I know this is not a complete solution.

@rosta
Copy link
ContributorAuthor

I rolled back most of the changes. Just left a single correction.

FI: I replaced the lineNormalizer in my code to the identity function, and renormalize afterwards.

Sorry to take so long with this but I had other things ongoing!

@wumpzwumpz merged commitc5b88e0 intojava-diff-utils:masterSep 21, 2019
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rosta@wumpz@rstawsk

[8]ページ先頭

©2009-2025 Movatter.jp