Feature/search uhighlighter #2732
Open
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
|
Don't worry about squashing the changesets. I am well aware you craft the csets carefully. In general I squash only csets that are not of value w.r.t. history like small code review induced changes. |
idodeclare
force-pushed
the
feature/search_uhighlighter
branch
from
c0395a4
to
34ab983
Compare
|
Rebased with no conflicts |
idodeclare
force-pushed
the
feature/search_uhighlighter
branch
from
25925aa
to
fde4ed2
Compare
|
Rebased with just a conflict in a SearchEngineTest.java import due to #2983. |
idodeclare
force-pushed
the
feature/search_uhighlighter
branch
from
fde4ed2
to
f10f0f1
Compare
|
Rebased with just conflicts in copyright text. |
|
@tarzanek , please would you take a look at this one if you get some time? |
|
I just merged #3130 , thank you for that I will try to review and sorry for delays |
|
@ahornace will you have time to have a quick look at this too? |
idodeclare
force-pushed
the
feature/search_uhighlighter
branch
from
f10f0f1
to
ccc5e17
Compare
|
Just rebased on master to resolve conflicts from #3130, which had been extracted from this patch. |
idodeclare
force-pushed
the
feature/search_uhighlighter
branch
from
ccc5e17
to
0736f12
Compare
- path, filename, and directory are now immutable, so require initialization
Addresses the source-code related part of oracle#2612 since `OGKUnifiedHighlighter` allows straight- forward, alternate formatters. `HistoryContext` is still a custom highlighting, so it will still return HTML-like content.
idodeclare
force-pushed
the
feature/search_uhighlighter
branch
from
0736f12
to
bd1e3ae
Compare
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.
Hello,
Please consider for integration this patch to add
HitFormatterto extendOGKUnifiedHighlighterfor use bySearchEngine.There are some known, pending migrations to
uhighlightremaining in OpenGrok.Hitgeneration was one area, andHistoryContextcontinues to be a legacy highlighter.@wy193777 requested in #2612 that search results not be HTML-ized. This patch mostly addresses the request by enhancing
SearchEngineto return code-matching results forfull|defs|refsand to add substring offsets to theHitresults in lieu of the former HTML-emphasis.histsearches will still return legacy, HTML-fragment results viaHistoryContext.For testing, I uncommented
SearchEngineTest.testSearch()but set it to@Ignore. The test is still useful even with its race condition bugs.Thank you.
(@vladak, I see you're squash-merging again; please may I ask you don't subject my PRs to that.)