Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-03 14:48:50 +02:00
Code Issues Packages Projects Releases Activity

Fix display of ellipsis in search fragments (#1896)

Browse Source 
Display ellipsis as an indicator that there is more content before or behind a search result fragment only if there really is more content.
This commit is contained in:
Matthias Thieroff
2021-12-15 15:07:46 +01:00
committed by GitHub
parent 1118ddd146
commit 11673e6d07
11 changed files with 135 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
scm-webapp/src/test/java/sonia/scm/search/LuceneHighlighterTest.java
View File

@@ -56,43 +56,47 @@ class LuceneHighlighterTest {
String content = content("content");
LuceneHighlighter highlighter = new LuceneHighlighter(analyzer, query);
String[] snippets = highlighter.highlight("content", Indexed.Analyzer.DEFAULT, content);
ContentFragment[] contentFragments = highlighter.highlight("content", Indexed.Analyzer.DEFAULT, content);
assertThat(snippets).hasSize(1).allSatisfy(
snippet -> assertThat(snippet).contains("<|[[--Golgafrinchan--]]|>")
assertThat(contentFragments).hasSize(1).allSatisfy(
contentFragment -> assertThat(contentFragment.getFragment()).contains("<|[[--Golgafrinchan--]]|>")
);
}
@Test
void shouldHighlightCodeAndKeepLines() throws IOException, InvalidTokenOffsetsException {
String[] snippets = highlightCode("GameOfLife.java", "die");
ContentFragment[] contentFragments = highlightCode("GameOfLife.java", "die");
assertThat(snippets).hasSize(1).allSatisfy(
snippet -> assertThat(snippet.split("\n")).contains(
"\t\t\t\tint neighbors= getNeighbors(above, same, below);",
"\t\t\t\tif(neighbors < 2 || neighbors > 3){",
"\t\t\t\t\tnewGen[row]+= \"_\";//<2 or >3 neighbors -> <|[[--die--]]|>",
"\t\t\t\t}else if(neighbors == 3){",
"\t\t\t\t\tnewGen[row]+= \"#\";//3 neighbors -> spawn/live"
)
assertThat(contentFragments).hasSize(1).allSatisfy(
contentFragment -> {
assertThat(contentFragment.getFragment().split("\n")).contains(
"\t\t\t\tint neighbors= getNeighbors(above, same, below);",
"\t\t\t\tif(neighbors < 2 || neighbors > 3){",
"\t\t\t\t\tnewGen[row]+= \"_\";//<2 or >3 neighbors -> <|[[--die--]]|>",
"\t\t\t\t}else if(neighbors == 3){",
"\t\t\t\t\tnewGen[row]+= \"#\";//3 neighbors -> spawn/live"
);
assertThat(contentFragment.isMatchesContentEnd()).isFalse();
assertThat(contentFragment.isMatchesContentEnd()).isFalse();
}
);
}
@Test
void shouldNotStartHighlightedFragmentWithLineBreak() throws IOException, InvalidTokenOffsetsException {
String[] snippets = highlightCode("GameOfLife.java", "die");
ContentFragment[] contentFragments = highlightCode("GameOfLife.java", "die");
assertThat(snippets).hasSize(1).allSatisfy(
snippet -> assertThat(snippet).doesNotStartWith("\n")
assertThat(contentFragments).hasSize(1).allSatisfy(
contentFragment -> assertThat(contentFragment.getFragment()).doesNotStartWith("\n")
);
}
@Test
void shouldHighlightCodeInTsx() throws IOException, InvalidTokenOffsetsException {
String[] snippets = highlightCode("Button.tsx", "inherit");
ContentFragment[] contentFragments = highlightCode("Button.tsx", "inherit");
assertThat(snippets).hasSize(1).allSatisfy(
snippet -> assertThat(snippet.split("\n")).contains(
assertThat(contentFragments).hasSize(1).allSatisfy(
contentFragment -> assertThat(contentFragment.getFragment().split("\n")).contains(
"}) => {",
" const renderIcon = () => {",
" return <>{icon ? <Icon name={icon} color=\"<|[[--inherit--]]|>\" className=\"is-medium pr-1\" /> : null}</>;",
@@ -103,16 +107,20 @@ class LuceneHighlighterTest {
@Test
void shouldHighlightFirstCodeLine() throws InvalidTokenOffsetsException, IOException {
String[] snippets = highlightCode("GameOfLife.java", "gameoflife");
ContentFragment[] contentFragments = highlightCode("GameOfLife.java", "gameoflife");
assertThat(snippets).hasSize(1);
assertThat(contentFragments).hasSize(1);
assertThat(contentFragments[0].isMatchesContentStart()).isTrue();
assertThat(contentFragments[0].isMatchesContentEnd()).isFalse();
}
@Test
void shouldHighlightLastCodeLine() throws InvalidTokenOffsetsException, IOException {
String[] snippets = highlightCode("Button.tsx", "default");
ContentFragment[] contentFragments = highlightCode("Button.tsx", "default");
assertThat(snippets).hasSize(1);
assertThat(contentFragments).hasSize(1);
assertThat(contentFragments[0].isMatchesContentStart()).isFalse();
assertThat(contentFragments[0].isMatchesContentEnd()).isTrue();
}
@Nested
@@ -154,7 +162,7 @@ class LuceneHighlighterTest {
}
private String[] highlightCode(String resource, String search) throws IOException, InvalidTokenOffsetsException {
private ContentFragment[] highlightCode(String resource, String search) throws IOException, InvalidTokenOffsetsException {
NonNaturalLanguageAnalyzer analyzer = new NonNaturalLanguageAnalyzer();
Query query = new TermQuery(new Term("content", search));