allow for the custom Xbase converter to be further customized,e.g.,Xtend

eclipse · Apr 27, 2024 · 9f1f33f · 9f1f33f
1 parent 38adf67
commit 9f1f33f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 28 deletions.
diff --git a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/XtendRuntimeModule.java b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/XtendRuntimeModule.java
@@ -296,6 +296,7 @@ public Class<? extends XbaseValueConverterService.IntUnderscoreValueConverter> b
 		return IntUnderscoreValueConverter.class;
 	}
 
+	@Override
 	public Class<? extends STRINGValueConverter> bindSTRINGValueConverter() {
 		return StringValueConverter.class;
 	}

diff --git a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/conversion/StringValueConverter.java b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/conversion/StringValueConverter.java
@@ -12,14 +12,14 @@
 
 import org.antlr.runtime.TokenSource;
 import org.eclipse.xtend.core.parser.antlr.internal.FlexerFactory;
-import org.eclipse.xtext.conversion.impl.STRINGValueConverter;
+import org.eclipse.xtext.xbase.conversion.XbaseStringValueConverter;
 
 import com.google.inject.Inject;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
  */
-public class StringValueConverter extends STRINGValueConverter {
+public class StringValueConverter extends XbaseStringValueConverter {
 
 	@Inject
 	private FlexerFactory flexerFactory;

diff --git a/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/DefaultXbaseRuntimeModule.java b/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/DefaultXbaseRuntimeModule.java
@@ -10,6 +10,7 @@
 
 import org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule;
 import org.eclipse.xtext.conversion.IValueConverterService;
+import org.eclipse.xtext.conversion.impl.STRINGValueConverter;
 import org.eclipse.xtext.debug.IStratumBreakpointSupport;
 import org.eclipse.xtext.documentation.IJavaDocTypeReferenceProvider;
 import org.eclipse.xtext.findReferences.TargetURICollector;
@@ -39,6 +40,7 @@
 import org.eclipse.xtext.xbase.annotations.validation.UnresolvedFeatureCallTypeAwareMessageProvider;
 import org.eclipse.xtext.xbase.compiler.JvmModelGenerator;
 import org.eclipse.xtext.xbase.compiler.output.TraceAwarePostProcessor;
+import org.eclipse.xtext.xbase.conversion.XbaseStringValueConverter;
 import org.eclipse.xtext.xbase.conversion.XbaseValueConverterService;
 import org.eclipse.xtext.xbase.debug.XbaseStratumBreakpointSupport;
 import org.eclipse.xtext.xbase.featurecalls.IdentifiableSimpleNameProvider;
@@ -242,5 +244,11 @@ public Class<? extends TargetURICollector> bindTargetURICollector() {
 	public Class<? extends IJavaDocTypeReferenceProvider> bindIJavaDocReferenceProvider() {
 		return XbaseJavaDocTypeReferenceProvider.class;
 	}
-
+
+	/**
+	 * @since 2.35
+	 */
+	public Class<? extends STRINGValueConverter> bindSTRINGValueConverter() {
+		return XbaseStringValueConverter.class;
+	}
 }
diff --git a/...eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseStringValueConverter.java b/...eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseStringValueConverter.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Lorenzo Bettini and others.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.xtext.xbase.conversion;
+
+import org.eclipse.xtext.conversion.impl.STRINGValueConverter;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.util.Strings;
+
+/**
+ * Avoid Windows EOL characters from the original parsed text: this would result
+ * in different generated Java files in Windows see
+ * https://github.com/eclipse/xtext/issues/2293 This is aligned with Java text
+ * blocks' "Normalization of Line Terminators"
+ * 
+ * @author Lorenzo Bettini - Initial contribution and API
+ * @since 2.35
+ */
+public class XbaseStringValueConverter extends STRINGValueConverter {
+	@Override
+	public String toValue(String string, INode node) {
+		return super.toValue(Strings.toUnixLineSeparator(string), node);
+	}
+}
diff --git a/...clipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseValueConverterService.java b/...clipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseValueConverterService.java
@@ -19,7 +19,6 @@
 import org.eclipse.xtext.conversion.impl.KeywordAlternativeConverter;
 import org.eclipse.xtext.conversion.impl.KeywordBasedValueConverter;
 import org.eclipse.xtext.conversion.impl.QualifiedNameValueConverter;
-import org.eclipse.xtext.conversion.impl.STRINGValueConverter;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.util.Strings;
 
@@ -255,28 +254,4 @@ public Integer toValue(String string, INode node) {
 		}
 	}
 
-	@Inject
-	private WindowsEOLsAwareSTRINGValueConverter windowsEOLsAwareSTRINGValueConverter;
-
-	@Override
-	@ValueConverter(rule = "STRING")
-	public IValueConverter<String> STRING() {
-		return windowsEOLsAwareSTRINGValueConverter;
-	}
-
-	/**
-	 * Avoid Windows EOL characters from the original parsed text: this would
-	 * result in different generated Java files in Windows see
-	 * https://github.com/eclipse/xtext/issues/2293 This is aligned with Java
-	 * text blocks' "Normalization of Line Terminators"
-	 * 
-	 * @author Lorenzo Bettini - Initial contribution and API
-	 * @since 2.35
-	 */
-	public static class WindowsEOLsAwareSTRINGValueConverter extends STRINGValueConverter {
-		@Override
-		public String toValue(String string, INode node) {
-			return super.toValue(Strings.toUnixLineSeparator(string), node);
-		}
-	}
 }