Skip to content

Add new marking levels for inline differences #74

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

Merged
merged 4 commits into from
Nov 17, 2020
Merged

Conversation

DigiLive
Copy link
Collaborator

  • In addition to the existing line level, this commit adds marking at
    character level, word level and no inline marking.

  • PhpUnit tests added for line, word and character-level marking.

* In addition to the existing line level, this commit adds marking at
  character level, word level and no inline marking.

* PhpUnit tests added for line, word and character-level marking.
@DigiLive DigiLive marked this pull request as draft November 16, 2020 10:03
@DigiLive DigiLive self-assigned this Nov 16, 2020
@DigiLive DigiLive requested a review from JBlond November 16, 2020 10:05
@DigiLive
Copy link
Collaborator Author

The different levels are build into the mainRenderer as an option.

ExtendsMainRenderer->setOptions(['inlineMarking' => ExtendsMainRenderer::CHANGE_LEVEL_CHAR]); // Mark changes at character level.
ExtendsMainRenderer->setOptions(['inlineMarking' => ExtendsMainRenderer::CHANGE_LEVEL_WORD]); // Mark changes at word level.
ExtendsMainRenderer->setOptions(['inlineMarking' => ExtendsMainRenderer::CHANGE_LEVEL_LINE]); // Mark changes at line level.
ExtendsMainRenderer->setOptions(['inlineMarking' => 'Any other Value']); // Don't mark inline changes.

Sample text A is altered to see difference between word and line level
more clearly.
Sample text A is altered to see difference between word and line level
more clearly.
Inline sequence changes at version 1 where assumed to exist at
version 2 also. This isn't true.
1: This is a first sample.
2: this is a sample.
Change "first" at 1 doesn't exist at 2.
This is an effect of marking inline differences at word level.
@DigiLive DigiLive marked this pull request as ready for review November 17, 2020 10:53
@DigiLive
Copy link
Collaborator Author

I think adding this feature is finished.
Please review and merge if there aren't any remarks.

@DigiLive DigiLive requested a review from JBlond November 17, 2020 10:56
@JBlond JBlond merged commit eb5ae61 into master Nov 17, 2020
@JBlond JBlond deleted the marking-levels branch November 17, 2020 11:00
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

2 participants