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

Merge pull request #986 from eclipse/me/formatter1

Browse source 
[formatter/textRegions] fixed some IllegalStateExceptions
This commit is contained in:
Moritz Eysholdt 2016-04-05 21:50:00 +02:00
commit 29ddc6b881
3 changed files with 132 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccessBuilder.java
View file

@ -96,8 +96,7 @@ public class NodeModelBasedRegionAccessBuilder {
return true;
} else if (node instanceof ICompositeNode) {
EObject element = node.getGrammarElement();
return GrammarUtil.isDatatypeRuleCall(element) || element instanceof CrossReference
|| GrammarUtil.isEnumRuleCall(element);
return GrammarUtil.isDatatypeRuleCall(element) || element instanceof CrossReference || GrammarUtil.isEnumRuleCall(element);
}
return false;
}
@ -113,6 +112,8 @@ public class NodeModelBasedRegionAccessBuilder {
protected boolean isEObjectRoot(INode node) {
if (node instanceof ICompositeNode) {
ICompositeNode parent = node.getParent();
while (parent != null && GrammarUtil.isEObjectFragmentRuleCall(parent.getGrammarElement()))
parent = parent.getParent();
if (parent == null)
return true;
INode root = parent;
@ -121,7 +122,7 @@ public class NodeModelBasedRegionAccessBuilder {
if (root == null)
return false;
EObject element = node.getGrammarElement();
if (GrammarUtil.isEObjectRuleCall(element)) {
if (GrammarUtil.isEObjectRuleCall(element) && !GrammarUtil.isEObjectFragmentRuleCall(element)) {
if (!parent.hasDirectSemanticElement())
return false;
BidiTreeIterator<INode> iterator = node.getAsTreeIterable().iterator();

124
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessBuilderTest.xtend
View file

@ -491,6 +491,130 @@ class RegionAccessBuilderTest {
18 0 H
'''
}
@Test def void testFragmentID() {
'''
6 (fragment foo)
'''.toString.trim === '''
0 0 H
B Action Root
0 1 S "6" Root:'6'
1 1 H " " Whitespace:TerminalRule'WS'
2 1 S "(" Mixed:'('
3 0 H
3 8 S "fragment" Mixed:'fragment'
11 1 H " " Whitespace:TerminalRule'WS'
12 3 S "foo" Fragment:fragName=ID
15 0 H
15 1 S ")" Mixed:')'
E Action Root
16 0 H
'''
}
@Test def void testFragmentRecursionID() {
'''
6 (fragment recursion foo)
'''.toString.trim === '''
0 0 H
B Action Root
0 1 S "6" Root:'6'
1 1 H " " Whitespace:TerminalRule'WS'
2 1 S "(" Mixed:'('
3 0 H
3 8 S "fragment" Mixed:'fragment'
11 1 H " " Whitespace:TerminalRule'WS'
12 9 S "recur..." Fragment:'recursion'
21 1 H " " Whitespace:TerminalRule'WS'
22 3 S "foo" Fragment:fragName=ID
25 0 H
25 1 S ")" Mixed:')'
E Action Root
26 0 H
'''
}
@Test def void testFragmentChildAction() {
'''
6 (fragment child ())
'''.toString.trim === '''
0 0 H
B Action Root
0 1 S "6" Root:'6'
1 1 H " " Whitespace:TerminalRule'WS'
2 1 S "(" Mixed:'('
3 0 H
3 8 S "fragment" Mixed:'fragment'
11 1 H " " Whitespace:TerminalRule'WS'
12 5 S "child" Fragment:'child'
17 1 H " " Whitespace:TerminalRule'WS'
B Action Fragment:mixed=Mixed path:Action/mixed
18 1 S "(" Mixed:'('
19 0 H
19 1 S ")" Mixed:')'
E Action Fragment:mixed=Mixed path:Action/mixed
20 0 H
20 1 S ")" Mixed:')'
E Action Root
21 0 H
'''
}
@Test def void testFragmentChildID() {
'''
6 (fragment child (foo))
'''.toString.trim === '''
0 0 H
B Action Root
0 1 S "6" Root:'6'
1 1 H " " Whitespace:TerminalRule'WS'
2 1 S "(" Mixed:'('
3 0 H
3 8 S "fragment" Mixed:'fragment'
11 1 H " " Whitespace:TerminalRule'WS'
12 5 S "child" Fragment:'child'
17 1 H " " Whitespace:TerminalRule'WS'
B Mixed'foo' Fragment:mixed=Mixed path:Action/mixed
18 1 S "(" Mixed:'('
19 0 H
19 3 S "foo" Mixed:name=ID
22 0 H
22 1 S ")" Mixed:')'
E Mixed'foo' Fragment:mixed=Mixed path:Action/mixed
23 0 H
23 1 S ")" Mixed:')'
E Action Root
24 0 H
'''
}
@Test def void testFragmentRecursionChild() {
'''
6 (fragment recursion child ())
'''.toString.trim === '''
0 0 H
B Action Root
0 1 S "6" Root:'6'
1 1 H " " Whitespace:TerminalRule'WS'
2 1 S "(" Mixed:'('
3 0 H
3 8 S "fragment" Mixed:'fragment'
11 1 H " " Whitespace:TerminalRule'WS'
12 9 S "recur..." Fragment:'recursion'
21 1 H " " Whitespace:TerminalRule'WS'
22 5 S "child" Fragment:'child'
27 1 H " " Whitespace:TerminalRule'WS'
B Action Fragment:mixed=Mixed path:Action/mixed
28 1 S "(" Mixed:'('
29 0 H
29 1 S ")" Mixed:')'
E Action Fragment:mixed=Mixed path:Action/mixed
30 0 H
30 1 S ")" Mixed:')'
E Action Root
31 0 H
'''
}
private def ===(CharSequence file, CharSequence expectation) {
val exp = expectation.toString

5
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtext
View file

@ -44,7 +44,7 @@ Parenthesized returns Expression:
Mixed:
"("
("unassigned" (ID | Datatype))?
({Action} |
({Action} ("fragment" Fragment)? |
Mixed |
(name=ID | "child" eobj=Mixed | datatype=Datatype | "ref" ref=[Mixed|ID] | lit=Enum))
")"
@ -52,6 +52,9 @@ Mixed:
Datatype:
"datatype" (Datatype | ID);
fragment Fragment returns Mixed:
fragName=ID | "child" mixed=Mixed | "recursion" Fragment;
enum Enum:
lit1 | lit2;