Merge pull request #173 from spdx/notsogreedy

Use non-greedy matches at start of textWith
spdx · May 9, 2023 · 46d5be3 · 46d5be3
2 parents a7fe5be + c7337a4
commit 46d5be3
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java b/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java
@@ -945,6 +945,15 @@ private static String findTemplateWithinText(String text, String template) throw
 		}
 
 		List<String> templateNonOptionalText = getNonOptionalLicenseText(removeCommentChars(template), VarTextHandling.REGEX);
+		if (templateNonOptionalText.size() > 0 && templateNonOptionalText.get(0).startsWith("~~~.")) {
+			// Change to a non-greedy match
+			String firstLine = templateNonOptionalText.get(0);
+			if (!firstLine.startsWith("~~~.?")) {
+				// yes - it's currently greedy
+				firstLine = "~~~.?" + firstLine.substring(4);
+				templateNonOptionalText.set(0, firstLine);
+			}
+		}
 		Pattern matchPattern = nonOptionalTextToStartPattern(templateNonOptionalText, CROSS_REF_NUM_WORDS_MATCH);
 		List<Pair<Integer, Integer>> charPositions = new ArrayList<>();
 		String normalizedText = removeCommentChars(normalizeText(text));