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

fix #301: Rollback bc autowrap may ignore change from IAutoWrapFormatter

Browse source 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
This commit is contained in:
Moritz Eysholdt 2017-07-10 18:10:59 +02:00 committed by Moritz Eysholdt
parent 3d6b0883be
commit 906be319a4
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FormattableDocument.java
View file

@ -126,7 +126,8 @@ public abstract class FormattableDocument implements IFormattableDocument {
ITextReplacerContext wrappable = null;
Set<ITextReplacer> wrapped = Sets.newHashSet();
LinkedList<ITextReplacer> queue = new LinkedList<ITextReplacer>();
for (ITextReplacer replacer : getReplacers()) {
TextSegmentSet<ITextReplacer> replacers = getReplacers();
for (ITextReplacer replacer : replacers) {
queue.add(replacer);
}
while (!queue.isEmpty()) {
@ -140,8 +141,15 @@ public abstract class FormattableDocument implements IFormattableDocument {
// then doesn't
while (context != wrappable) {
ITextReplacer r = context.getReplacer();
if (r != null && getReplacers().get(r) == r) {
queue.addFirst(r);
if (r != null) {
ITextReplacer r2 = replacers.get(r);
if (r2 instanceof ICompositeTextReplacer) {
if (r == r2) {
queue.addFirst(r2);
}
} else if (r2 != null) {
queue.addFirst(r2);
}
}
context = context.getPreviousContext();
}