Skip to content

fix(retrieval): keep final release in Oxford-comma version lists #234

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.

Sign up for GitHub

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

Open
detail-app wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(retrieval): keep final release in Oxford-comma version lists #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/williamcallahan/javachat/util/QueryVersionExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public final class QueryVersionExtractor {
private static final Pattern EXPLICIT_QUANTITY_SUFFIX_PATTERN =
Pattern.compile("[\\s-]+(?:days?|hours?|minutes?|seconds?|times|lines?)\\b", Pattern.CASE_INSENSITIVE);
private static final Pattern SHORTHAND_VERSION_PATTERN = Pattern.compile(
"^\\s*(?:,|and\\b|vs(?:\\.|\\b)|versus\\b|\\+|/|&)\\s*(\\d{1,3})\\b", Pattern.CASE_INSENSITIVE);
"^\\s*(?:,(?:\\s*and\\b)?|and\\b|vs(?:\\.|\\b)|versus\\b|\\+|/|&)\\s*(\\d{1,3})\\b",
Pattern.CASE_INSENSITIVE);

private QueryVersionExtractor() {}

Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/williamcallahan/javachat/util/QueryVersionExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,20 @@ void extractsComparisonShorthandAfterAnExplicitVersion() {
assertEquals(List.of("21", "22", "25"), QueryVersionExtractor.extractVersionNumbers("Java 21/22/25 streams"));
}

@Test
void extractsOxfordCommaEnumerationWithoutDroppingFinalRelease() {
// Oxford-comma form keeps the final release (the bug: ", and" was two connectors in sequence)
assertEquals(List.of("21", "25", "26"), QueryVersionExtractor.extractVersionNumbers("Java SE 21, 25, and 26"));
// Longer Oxford-comma chain generalizes beyond three releases
assertEquals(
List.of("21", "22", "23", "25"),
QueryVersionExtractor.extractVersionNumbers("Java 21, 22, 23, and 25"));
// All-comma chain (no trailing "and") keeps every release
assertEquals(List.of("21", "22", "25"), QueryVersionExtractor.extractVersionNumbers("Java 21, 22, 25"));
// Non-Oxford "and" (no comma before "and") keeps every release
assertEquals(List.of("21", "22", "25"), QueryVersionExtractor.extractVersionNumbers("Java 21, 22 and 25"));
}

@Test
void ignoresUnprefixedNumbersOutsideAComparisonChain() {
assertEquals(List.of("21"), QueryVersionExtractor.extractVersionNumbers("Java 21 with 50 examples"));
Expand Down