From 34f259c5b3c8316edef0f29a3aa775ea7cfa6be6 Mon Sep 17 00:00:00 2001
From: Sven Efftinge <sven.efftinge@itemis.de>
Date: Wed, 1 Jul 2015 10:21:15 +0200
Subject: [PATCH] [incremental builder] configure language specific encoding
 provider

---
 .../src/org/eclipse/xtext/build/IncrementalBuilder.xtend      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend
index faaa45e04..ef8a8332a 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/build/IncrementalBuilder.xtend
@@ -32,6 +32,7 @@ import org.eclipse.xtext.generator.trace.TraceFileNameProvider
 import org.eclipse.xtext.generator.trace.TraceRegionSerializer
 import org.eclipse.xtext.generator.IFilePostProcessor
 import org.eclipse.emf.common.util.URI
+import org.eclipse.xtext.parser.IEncodingProvider
 
 /**
  * @author Jan Koehnlein - Initial contribution and API
@@ -145,6 +146,9 @@ import org.eclipse.emf.common.util.URI
 				outputConfigurations = outputConfigProvider.getOutputConfigurations(resource).toMap[name]
 				
 				postProcessor = serviceProvider.get(IFilePostProcessor)
+				val newEncodingProvider = serviceProvider.get(IEncodingProvider)
+				if (newEncodingProvider != null)
+					encodingProvider = newEncodingProvider
 				traceFileNameProvider = serviceProvider.get(TraceFileNameProvider)
 				traceRegionSerializer = serviceProvider.get(TraceRegionSerializer)
 				generateTraces = true