From 4e2b990d1471d6bf61257c4e493fd40da30dfa20 Mon Sep 17 00:00:00 2001 From: Asger F Date: Tue, 22 Sep 2020 14:07:21 +0100 Subject: [PATCH] Add doc string to semVerToken Co-authored-by: Erik Krogh Kristensen --- .../src/com/semmle/js/dependencies/DependencyResolver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/javascript/extractor/src/com/semmle/js/dependencies/DependencyResolver.java b/javascript/extractor/src/com/semmle/js/dependencies/DependencyResolver.java index 3049c78e260..d3ea4b61392 100644 --- a/javascript/extractor/src/com/semmle/js/dependencies/DependencyResolver.java +++ b/javascript/extractor/src/com/semmle/js/dependencies/DependencyResolver.java @@ -57,7 +57,8 @@ public class DependencyResolver { } } - private static final Pattern semVerToken = Pattern.compile("[~^<>=|&-]+|\\d+(?:\\.[\\dx]+)+(?:-[\\w.-]*)?"); + // Matches either a version ("2.1.x" / "3.0", etc..), or a version constraint operator ("<", "||", "~", etc...). + private static final Pattern semVerToken = Pattern.compile("\\d+(?:\\.[\\dx]+)+(?:-[\\w.-]*)?|[~^<>=|&-]+"); /** * Returns the first version number mentioned in the given constraints, excluding upper bounds such as `< 2.0.0`,