sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1476 from eclipse/cd_xtext_issue1738b

Browse source 
[eclipse/xtext#1738] avoid usage of icu.Transliterator
This commit is contained in:
Christian Dietrich 2020-05-06 09:44:39 +02:00 committed by GitHub
commit 34c2846870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarAccessExtensionsTest.java
View file

@ -29,6 +29,7 @@ public class GrammarAccessExtensionsTest {
Assert.assertEquals("CommercialAtApostrophe", grammarAccessExtensions.toJavaIdentifier("@\'", false));
Assert.assertEquals("Grün", grammarAccessExtensions.toJavaIdentifier("Grün", true));
Assert.assertEquals("DollarSign", grammarAccessExtensions.toJavaIdentifier("$", true));
Assert.assertEquals("ColonExclamationMarkQuestionMark", grammarAccessExtensions.toJavaIdentifier(":!?", true));
Assert.assertEquals("_", grammarAccessExtensions.toJavaIdentifier("_", true));
}

8
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) 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.
@ -12,7 +12,6 @@ import com.google.common.collect.Maps
import com.google.inject.Binder
import com.google.inject.Guice
import com.google.inject.Inject
import com.ibm.icu.text.Transliterator
import java.util.ArrayList
import java.util.List
import java.util.Map
@ -69,8 +68,6 @@ class GrammarAccessExtensions {
};
val Map<String, ISerializer> xtextSerializerByLineDelimiter = Maps.newHashMapWithExpectedSize(2)
val transliterator = Transliterator.getInstance('Any-Name')
@Inject CodeConfig codeConfig
@Inject extension XtextGeneratorNaming
@ -139,8 +136,7 @@ class GrammarAccessExtensions {
* Returns the Unicode string name for a character.
*/
def String getUnicodeName(char character) {
val transliterated = transliterator.transliterate(String.valueOf(character))
return transliterated.substring('\\N{'.length, transliterated.length - '}'.length)
Character.getName(character)
}
private def String toJavaIdentifierSegmentInt(String text, boolean isFirst, boolean uppercaseFirst) {

12
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) 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.
@ -15,7 +15,6 @@ import com.google.inject.Binder;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.ibm.icu.text.Transliterator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -96,8 +95,6 @@ public class GrammarAccessExtensions {
private final Map<String, ISerializer> xtextSerializerByLineDelimiter = Maps.<String, ISerializer>newHashMapWithExpectedSize(2);
private final Transliterator transliterator = Transliterator.getInstance("Any-Name");
@Inject
private CodeConfig codeConfig;
@ -201,12 +198,7 @@ public class GrammarAccessExtensions {
* Returns the Unicode string name for a character.
*/
public String getUnicodeName(final char character) {
final String transliterated = this.transliterator.transliterate(String.valueOf(character));
int _length = "\\N{".length();
int _length_1 = transliterated.length();
int _length_2 = "}".length();
int _minus = (_length_1 - _length_2);
return transliterated.substring(_length, _minus);
return Character.getName(character);
}
private String toJavaIdentifierSegmentInt(final String text, final boolean isFirst, final boolean uppercaseFirst) {