Skip to content

Commit 43d80e0

Browse files
palukkukoppor
palukku
and
koppor
authored
Feat: Add definition links for TeX Files (#14260)
* add support for latex citation definitions and refactor citation handling logic * enhance LSP range utility and modularize definition handling functions * improve citation and range handling across parser and definition providers * fix formatting * fix jbang * update associated tests * update associated tests2 --------- Co-authored-by: Oliver Kopp <[email protected]>
1 parent 1b78722 commit 43d80e0

File tree

10 files changed

+220
-117
lines changed

10 files changed

+220
-117
lines changed

‎.jbang/JabLsLauncher.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/LspRangeUtil.java
2424
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/definition/DefinitionProvider.java
2525
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/definition/DefinitionProviderFactory.java
26+
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/definition/LatexDefinitonProvider.java
2627
//SOURCES ../jabls/src/main/java/org/jabref/languageserver/util/definition/MarkdownDefinitionProvider.java
2728

2829
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/

‎jablib/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public class DefaultLatexParser implements LatexParser {
3636
"([aA]|[aA]uto|fnote|foot|footfull|full|no|[nN]ote|[pP]aren|[pP]note|[tT]ext|[sS]mart|super)cite([s*]?)",
3737
"footcitetext", "(block|text)cquote"
3838
};
39-
private static final String CITE_GROUP = "key";
39+
private static final String CITATION_KEYS_GROUP = "keys";
4040
private static final Pattern CITE_PATTERN = Pattern.compile(
4141
"\\\\(%s)\\*?(?:\\[(?:[^\\]]*)\\]){0,2}\\{(?<%s>[^\\}]*)\\}(?:\\{[^\\}]*\\})?".formatted(
42-
String.join("|", CITE_COMMANDS), CITE_GROUP));
42+
String.join("|", CITE_COMMANDS), CITATION_KEYS_GROUP));
4343

4444
private static final String BIBLIOGRAPHY_GROUP = "bib";
4545
private static final Pattern BIBLIOGRAPHY_PATTERN = Pattern.compile(
@@ -49,11 +49,17 @@ public class DefaultLatexParser implements LatexParser {
4949
private static final Pattern INCLUDE_PATTERN = Pattern.compile(
5050
"\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}".formatted(INCLUDE_GROUP));
5151

52+
private static final String CITATION_KEY_INSIDE_GROUP = "key";
53+
private static final Pattern CITATION_KEY_INSIDE_PATTERN = Pattern.compile("(?<%s>[^,]+)".formatted(CITATION_KEY_INSIDE_GROUP), Pattern.CASE_INSENSITIVE);
54+
5255
@Override
5356
public LatexParserResult parse(String citeString) {
5457
Path path = Path.of("");
5558
LatexParserResult latexParserResult = new LatexParserResult(path);
56-
matchCitation(path, 1, citeString, latexParserResult);
59+
String[] citeStrings = citeString.split(System.lineSeparator());
60+
for (int line = 0; line < citeStrings.length; line++) {
61+
matchCitation(path, line + 1, citeStrings[line], latexParserResult);
62+
}
5763
return latexParserResult;
5864
}
5965

@@ -105,8 +111,9 @@ private void matchCitation(Path file, int lineNumber, String line, LatexParserRe
105111
Matcher citeMatch = CITE_PATTERN.matcher(line);
106112

107113
while (citeMatch.find()) {
108-
for (String key : citeMatch.group(CITE_GROUP).split(",")) {
109-
latexParserResult.addKey(key.trim(), file, lineNumber, citeMatch.start(), citeMatch.end(), line);
114+
Matcher citationKeyInsideMatch = CITATION_KEY_INSIDE_PATTERN.matcher(citeMatch.group(CITATION_KEYS_GROUP));
115+
while (citationKeyInsideMatch.find()) {
116+
latexParserResult.addKey(citationKeyInsideMatch.group(CITATION_KEY_INSIDE_GROUP), file, lineNumber, citeMatch.start(CITATION_KEYS_GROUP) + citationKeyInsideMatch.start(), citeMatch.start(CITATION_KEYS_GROUP) + citationKeyInsideMatch.end(), line);
110117
}
111118
}
112119
}

‎jablib/src/main/java/org/jabref/model/texparser/Citation.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
import org.jspecify.annotations.NonNull;
66

7+
/**
8+
*
9+
* @param path the path to the file containing the citationkey
10+
* @param line the line number of the citationkey (starting at 1)
11+
* @param colStart the column number of the start of the citation key (starting at 0)
12+
* @param colEnd the column number of the end of the citation key (starting at 0)
13+
* @param lineText the text of the line containing the citationkey
14+
*/
715
public record Citation(Path path, int line, int colStart, int colEnd, String lineText) {
816
/**
917
* The total number of characters that are shown around a cite (cite width included).

‎jablib/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class DefaultTexParserTest {
2727
private final static String UNRESOLVED = "UnresolvedKey";
2828
private final static String UNKNOWN = "UnknownKey";
2929

30-
private void testMatchCite(String key, String citeString) {
30+
private void testMatchCite(String key, int expectedStart, int expectedEnd, String citeString) {
3131
Path path = Path.of("");
3232
LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
3333
LatexParserResult expectedParserResult = new LatexParserResult(path);
3434

35-
expectedParserResult.addKey(key, path, 1, 0, citeString.length(), citeString);
35+
expectedParserResult.addKey(key, path, 1, expectedStart, expectedEnd, citeString);
3636

3737
assertEquals(expectedParserResult, latexParserResult);
3838
}
@@ -55,21 +55,21 @@ void nonMatchCite(String citeString) {
5555

5656
private static Stream<Arguments> matchCiteCommandsProvider() {
5757
return Stream.of(
58-
Arguments.of(UNRESOLVED, "\\cite[pre][post]{UnresolvedKey}"),
59-
Arguments.of(UNRESOLVED, "\\cite*{UnresolvedKey}"),
60-
Arguments.of(UNRESOLVED, "\\parencite[post]{UnresolvedKey}"),
61-
Arguments.of(EINSTEIN_C, "\\citep{Einstein1920c}"),
62-
Arguments.of(EINSTEIN_C, "\\autocite{Einstein1920c}"),
63-
Arguments.of(EINSTEIN_C, "\\Autocite{Einstein1920c}"),
64-
Arguments.of(DARWIN, "\\blockcquote[p. 28]{Darwin1888}{some text}"),
65-
Arguments.of(DARWIN, "\\textcquote[p. 18]{Darwin1888}{blablabla}")
58+
Arguments.of(UNRESOLVED, 17, 30, "\\cite[pre][post]{UnresolvedKey}"),
59+
Arguments.of(UNRESOLVED, 7, 20, "\\cite*{UnresolvedKey}"),
60+
Arguments.of(UNRESOLVED, 17, 30, "\\parencite[post]{UnresolvedKey}"),
61+
Arguments.of(EINSTEIN_C, 7, 20, "\\citep{Einstein1920c}"),
62+
Arguments.of(EINSTEIN_C, 10, 23, "\\autocite{Einstein1920c}"),
63+
Arguments.of(EINSTEIN_C, 10, 23, "\\Autocite{Einstein1920c}"),
64+
Arguments.of(DARWIN, 20, 30, "\\blockcquote[p. 28]{Darwin1888}{some text}"),
65+
Arguments.of(DARWIN, 19, 29, "\\textcquote[p. 18]{Darwin1888}{blablabla}")
6666
);
6767
}
6868

6969
@ParameterizedTest
7070
@MethodSource("matchCiteCommandsProvider")
71-
void matchCiteCommands(String expectedKey, String citeString) {
72-
testMatchCite(expectedKey, citeString);
71+
void matchCiteCommands(String expectedKey, int expectedStart, int expectedEnd, String citeString) {
72+
testMatchCite(expectedKey, expectedStart, expectedEnd, citeString);
7373
}
7474

7575
@Test
@@ -80,8 +80,8 @@ void twoCitationsSameLine() {
8080
LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
8181
LatexParserResult expectedParserResult = new LatexParserResult(path);
8282

83-
expectedParserResult.addKey(EINSTEIN_C, path, 1, 0, 21, citeString);
84-
expectedParserResult.addKey(EINSTEIN_A, path, 1, 26, 47, citeString);
83+
expectedParserResult.addKey(EINSTEIN_C, path, 1, 7, 20, citeString);
84+
expectedParserResult.addKey(EINSTEIN_A, path, 1, 33, 46, citeString);
8585

8686
assertEquals(expectedParserResult, latexParserResult);
8787
}
@@ -93,7 +93,7 @@ void fileEncodingUtf8() throws URISyntaxException {
9393
LatexParserResult parserResult = new DefaultLatexParser().parse(texFile).get();
9494
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
9595

96-
expectedParserResult.addKey("anykey", texFile, 1, 32, 45,
96+
expectedParserResult.addKey("anykey", texFile, 1, 38, 44,
9797
"Danach wir anschließend mittels \\cite{anykey}.");
9898

9999
assertEquals(expectedParserResult, parserResult);
@@ -107,7 +107,7 @@ void fileEncodingIso88591() throws URISyntaxException {
107107
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
108108

109109
// The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see ADR-0005
110-
expectedParserResult.addKey("anykey", texFile, 1, 32, 45,
110+
expectedParserResult.addKey("anykey", texFile, 1, 38, 44,
111111
"Danach wir anschlie�end mittels \\cite{anykey}.");
112112

113113
assertEquals(expectedParserResult, parserResult);
@@ -121,7 +121,7 @@ void fileEncodingIso885915() throws URISyntaxException {
121121
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
122122

123123
// The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see ADR-0005
124-
expectedParserResult.addKey("anykey", texFile, 1, 32, 45,
124+
expectedParserResult.addKey("anykey", texFile, 1, 38, 44,
125125
"Danach wir anschlie�end mittels \\cite{anykey}.");
126126

127127
assertEquals(expectedParserResult, parserResult);
@@ -137,12 +137,12 @@ void fileEncodingForThreeFiles() throws URISyntaxException {
137137
List.of(texFile, texFile2, texFile3));
138138

139139
LatexParserResult result1 = new LatexParserResult(texFile);
140-
result1.addKey("anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
140+
result1.addKey("anykey", texFile, 1, 38, 44, "Danach wir anschließend mittels \\cite{anykey}.");
141141
LatexParserResult result2 = new LatexParserResult(texFile2);
142-
result2.addKey("anykey", texFile2, 1, 32, 45,
142+
result2.addKey("anykey", texFile2, 1, 38, 44,
143143
"Danach wir anschlie�end mittels \\cite{anykey}.");
144144
LatexParserResult result3 = new LatexParserResult(texFile3);
145-
result3.addKey("anykey", texFile3, 1, 32, 45,
145+
result3.addKey("anykey", texFile3, 1, 38, 44,
146146
"Danach wir anschlie�end mittels \\cite{anykey}.");
147147

148148
LatexParserResults expectedParserResults = new LatexParserResults(result1, result2, result3);
@@ -158,11 +158,11 @@ void singleFile() throws URISyntaxException {
158158
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
159159

160160
expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
161-
expectedParserResult.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
162-
expectedParserResult.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
163-
expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33,
161+
expectedParserResult.addKey(EINSTEIN, texFile, 4, 6, 18, "\\cite{Einstein1920}");
162+
expectedParserResult.addKey(DARWIN, texFile, 5, 6, 16, "\\cite{Darwin1888}.");
163+
expectedParserResult.addKey(EINSTEIN, texFile, 6, 20, 32,
164164
"Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
165-
expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84,
165+
expectedParserResult.addKey(DARWIN, texFile, 7, 73, 83,
166166
"Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
167167

168168
assertEquals(expectedParserResult, parserResult);
@@ -177,20 +177,20 @@ void twoFiles() throws URISyntaxException {
177177

178178
LatexParserResult result1 = new LatexParserResult(texFile);
179179
result1.addBibFile(texFile.getParent().resolve("origin.bib"));
180-
result1.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
181-
result1.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
182-
result1.addKey(EINSTEIN, texFile, 6, 14, 33,
180+
result1.addKey(EINSTEIN, texFile, 4, 6, 18, "\\cite{Einstein1920}");
181+
result1.addKey(DARWIN, texFile, 5, 6, 16, "\\cite{Darwin1888}.");
182+
result1.addKey(EINSTEIN, texFile, 6, 20, 32,
183183
"Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
184-
result1.addKey(DARWIN, texFile, 7, 67, 84,
184+
result1.addKey(DARWIN, texFile, 7, 73, 83,
185185
"Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
186186

187187
LatexParserResult result2 = new LatexParserResult(texFile2);
188188
result2.addBibFile(texFile2.getParent().resolve("origin.bib"));
189-
result2.addKey(DARWIN, texFile2, 4, 48, 65,
189+
result2.addKey(DARWIN, texFile2, 4, 54, 64,
190190
"This is some content trying to cite a bib file: \\cite{Darwin1888}");
191-
result2.addKey(EINSTEIN, texFile2, 5, 48, 67,
191+
result2.addKey(EINSTEIN, texFile2, 5, 54, 66,
192192
"This is some content trying to cite a bib file: \\cite{Einstein1920}");
193-
result2.addKey(NEWTON, texFile2, 6, 48, 65,
193+
result2.addKey(NEWTON, texFile2, 6, 54, 64,
194194
"This is some content trying to cite a bib file: \\cite{Newton1999}");
195195

196196
LatexParserResults expectedParserResults = new LatexParserResults(result1, result2);
@@ -207,11 +207,11 @@ void duplicateFiles() throws URISyntaxException {
207207
LatexParserResult result = new LatexParserResult(texFile);
208208

209209
result.addBibFile(texFile.getParent().resolve("origin.bib"));
210-
result.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
211-
result.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
212-
result.addKey(EINSTEIN, texFile, 6, 14, 33,
210+
result.addKey(EINSTEIN, texFile, 4, 6, 18, "\\cite{Einstein1920}");
211+
result.addKey(DARWIN, texFile, 5, 6, 16, "\\cite{Darwin1888}.");
212+
result.addKey(EINSTEIN, texFile, 6, 20, 32,
213213
"Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
214-
result.addKey(DARWIN, texFile, 7, 67, 84,
214+
result.addKey(DARWIN, texFile, 7, 73, 83,
215215
"Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
216216

217217
LatexParserResults expectedParserResults = new LatexParserResults(result, result);
@@ -227,11 +227,11 @@ void unknownKey() throws URISyntaxException {
227227
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
228228

229229
expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
230-
expectedParserResult.addKey(DARWIN, texFile, 4, 48, 65,
230+
expectedParserResult.addKey(DARWIN, texFile, 4, 54, 64,
231231
"This is some content trying to cite a bib file: \\cite{Darwin1888}");
232-
expectedParserResult.addKey(EINSTEIN, texFile, 5, 48, 67,
232+
expectedParserResult.addKey(EINSTEIN, texFile, 5, 54, 66,
233233
"This is some content trying to cite a bib file: \\cite{Einstein1920}");
234-
expectedParserResult.addKey(UNKNOWN, texFile, 6, 48, 65,
234+
expectedParserResult.addKey(UNKNOWN, texFile, 6, 54, 64,
235235
"This is some content trying to cite a bib file: \\cite{UnknownKey}");
236236

237237
assertEquals(expectedParserResult, parserResult);

‎jablib/src/test/java/org/jabref/logic/texparser/LatexParserTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ void sameFileDifferentDatabases() throws URISyntaxException {
9494

9595
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
9696
expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
97-
expectedParserResult.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
98-
expectedParserResult.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
99-
expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
100-
expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
97+
expectedParserResult.addKey(EINSTEIN, texFile, 4, 6, 18, "\\cite{Einstein1920}");
98+
expectedParserResult.addKey(DARWIN, texFile, 5, 6, 16, "\\cite{Darwin1888}.");
99+
expectedParserResult.addKey(EINSTEIN, texFile, 6, 20, 32, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
100+
expectedParserResult.addKey(DARWIN, texFile, 7, 73, 83, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
101101

102102
LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(new LatexParserResults(parserResult));
103103
LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(new LatexParserResults(expectedParserResult));
@@ -123,16 +123,16 @@ void twoFilesDifferentDatabases() throws URISyntaxException {
123123

124124
LatexParserResult expectedParserResult = new LatexParserResult(texFile);
125125
expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
126-
expectedParserResult.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
127-
expectedParserResult.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
128-
expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
129-
expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
126+
expectedParserResult.addKey(EINSTEIN, texFile, 4, 6, 18, "\\cite{Einstein1920}");
127+
expectedParserResult.addKey(DARWIN, texFile, 5, 6, 16, "\\cite{Darwin1888}.");
128+
expectedParserResult.addKey(EINSTEIN, texFile, 6, 20, 32, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
129+
expectedParserResult.addKey(DARWIN, texFile, 7, 73, 83, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
130130

131131
LatexParserResult expectedParserResult2 = new LatexParserResult(texFile2);
132132
expectedParserResult2.addBibFile(texFile2.getParent().resolve("origin.bib"));
133-
expectedParserResult2.addKey(DARWIN, texFile2, 4, 48, 65, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
134-
expectedParserResult2.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
135-
expectedParserResult2.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
133+
expectedParserResult2.addKey(DARWIN, texFile2, 4, 54, 64, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
134+
expectedParserResult2.addKey(EINSTEIN, texFile2, 5, 54, 66, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
135+
expectedParserResult2.addKey(NEWTON, texFile2, 6, 54, 64, "This is some content trying to cite a bib file: \\cite{Newton1999}");
136136

137137
LatexParserResults expectedParserResults = new LatexParserResults(expectedParserResult, expectedParserResult2);
138138

‎jabls/src/main/java/org/jabref/languageserver/util/LspRangeUtil.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ public static Range convertToLspRange(ParserResult.Range range) {
4444
);
4545
}
4646

47+
/**
48+
*
49+
* @param line line starting at 1
50+
* @param colStart column starting at 1
51+
* @param colEnd column starting at 1
52+
* @return the LSP4J Range of the line and columns
53+
*/
54+
public static Range convertToLspRange(int line, int colStart, int colEnd) {
55+
return new Range(new Position(line - 1, colStart), new Position(line - 1, colEnd));
56+
}
57+
4758
public static Range convertToLspRange(String content, int startIndex, int endIndex) {
4859
Position start = convertToLspPosition(content, startIndex);
4960
Position end = convertToLspPosition(content, endIndex);
@@ -66,4 +77,20 @@ public static Position convertToLspPosition(String content, int index) {
6677

6778
return new Position(line, column);
6879
}
80+
81+
public static boolean isPositionInRange(Position position, Range range) {
82+
return isRangeInRange(range, new Range(position, position));
83+
}
84+
85+
public static boolean isRangeInRange(Range outer, Range inner) {
86+
return comparePositions(outer.getStart(), inner.getStart()) <= 0
87+
&& comparePositions(outer.getEnd(), inner.getEnd()) >= 0;
88+
}
89+
90+
public static int comparePositions(Position p1, Position p2) {
91+
if (p1.getLine() != p2.getLine()) {
92+
return Integer.compare(p1.getLine(), p2.getLine());
93+
}
94+
return Integer.compare(p1.getCharacter(), p2.getCharacter());
95+
}
6996
}

0 commit comments

Comments
 (0)