[lang] Implicitly imported functions in MapExtensions are moved from …

…SARL to Xtext. Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Aug 17, 2018 · 9847295 · 9847295
1 parent 18501d8
commit 9847295
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 2,912 deletions.
diff --git a/docs/io.sarl.docs.markdown/src/main/documentation/reference/general/Extension.md b/docs/io.sarl.docs.markdown/src/main/documentation/reference/general/Extension.md
@@ -174,8 +174,7 @@ The following functions are provided for extended the standard collection API:
 		org.eclipse.xtext.xbase.lib.IterableExtensions,
 		org.eclipse.xtext.xbase.lib.IteratorExtensions,
 		org.eclipse.xtext.xbase.lib.ListExtensions,
-		org.eclipse.xtext.xbase.lib.MapExtensions,
-		io.sarl.lang.scoping.batch.SARLMapExtensions)}
+		org.eclipse.xtext.xbase.lib.MapExtensions)}
 
 
 ### Number Category

diff --git a/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/scoping/batch/SARLMapExtensions.java b/main/coreplugins/io.sarl.lang.core/src/io/sarl/lang/scoping/batch/SARLMapExtensions.java
diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLImplicitlyImportedFeatures.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/scoping/SARLImplicitlyImportedFeatures.java
@@ -28,7 +28,6 @@
 import com.google.inject.Singleton;
 import org.eclipse.xtext.xbase.scoping.batch.ImplicitlyImportedFeatures;
 
-import io.sarl.lang.scoping.batch.SARLMapExtensions;
 import io.sarl.lang.scoping.batch.SARLTimeExtensions;
 import io.sarl.lang.scoping.numbers.NumberCastImplicitlyImportedFeatures;
 import io.sarl.lang.scoping.numbers.NumberOperatorImplicitlyImportedFeatures;
@@ -60,7 +59,6 @@ public SARLImplicitlyImportedFeatures() {
 	protected List<Class<?>> getExtensionClasses() {
 		final List<Class<?>> xtextList = super.getExtensionClasses();
 		// Insert at the beginning for ensuring the SARL extension is selected before any Xtext extension.
-		xtextList.add(0, SARLMapExtensions.class);
 		xtextList.add(0, SARLTimeExtensions.class);
 
 		// Add features related to numbers.