fix: Pass regex warnings to Logger instead of printing it to stderr

Fixes #534
eclipse · May 17, 2023 · a75a613 · a75a613
1 parent 85e9462
commit a75a613
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tm4e.core
-Bundle-Version: 0.5.3.qualifier
+Bundle-Version: 0.5.4.qualifier
 Require-Bundle: org.apache.batik.css;bundle-version="1.9.1";resolution:=optional,
  org.apache.batik.util;bundle-version="1.9.1";resolution:=optional,
  com.google.gson;bundle-version="2.9.0",

diff --git a/org.eclipse.tm4e.core/pom.xml b/org.eclipse.tm4e.core/pom.xml
@@ -10,7 +10,7 @@
 
 	<artifactId>org.eclipse.tm4e.core</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>0.5.3-SNAPSHOT</version>
+	<version>0.5.4-SNAPSHOT</version>
 
 	<profiles>
 		<profile>

diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java
@@ -19,6 +19,8 @@
 
 package org.eclipse.tm4e.core.internal.oniguruma;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
 import java.nio.charset.StandardCharsets;
 
 import org.eclipse.jdt.annotation.Nullable;
@@ -37,7 +39,18 @@
  *      github.com/atom/node-oniguruma/blob/master/src/onig-reg-exp.cc</a>
  */
 final class OnigRegExp {
+	private static final Logger LOGGER = System.getLogger(OnigRegExp.class.getName());
 
+	/**
+	 * {@link WarnCallback} which is used if log level is at least Level.WARNING.
+	 */
+	private static WarnCallback LOGGER_WARN_CALLBACK = new WarnCallback() {
+		@Override
+		public void warn(@Nullable String message) {
+			LOGGER.log(Level.WARNING, message);
+		}
+	};
+
 	@Nullable
 	private OnigString lastSearchString;
 
@@ -55,7 +68,7 @@ final class OnigRegExp {
 		final byte[] pattern = source.getBytes(StandardCharsets.UTF_8);
 		try {
 			regex = new Regex(pattern, 0, pattern.length, Option.CAPTURE_GROUP, UTF8Encoding.INSTANCE, Syntax.DEFAULT,
-					WarnCallback.DEFAULT);
+					LOGGER.isLoggable(Level.WARNING) ? LOGGER_WARN_CALLBACK : WarnCallback.NONE);
 		} catch (final SyntaxException ex) {
 			throw new TMException("Parsing regex pattern \"" + source + "\" failed with " + ex, ex);
 		}