Changeset 440 for java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/formatting/FramScriptFormatter.java

Timestamp:

10/21/15 02:55:11 (9 years ago)

Author:

Mateusz Poszwa

Message:

• Updated Xtext-based Framclipse
• Deleted previous version of Framclipse

File:

• java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/formatting/FramScriptFormatter.java (modified) (5 diffs)

java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/formatting/FramScriptFormatter.java

@@ -17 +17 @@
 
 /**
- * This class contains custom formatting description.
+ * This class contains custom formatting declarations.
  * 
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#formatting
+ * on how and when to use it.
  * 
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an
- * example
+ * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
  */
 public class FramScriptFormatter extends AbstractDeclarativeFormatter {
-        
-        @Override
-        protected FramScriptGrammarAccess getGrammarAccess() {
-                return (FramScriptGrammarAccess) super.getGrammarAccess();
-        }
-
         @Override
         protected void configureFormatting(FormattingConfig c) {
-                FramScriptGrammarAccess f = getGrammarAccess();
+                FramScriptGrammarAccess f = (FramScriptGrammarAccess) getGrammarAccess();
                 
                 //Headers
@@ -68 +61 @@
                 c.setNoSpace().before(f.getFlagsHeaderAccess().getIntValueAssignment_2());
                 
-                c.setNoSpace().after(f.getTypeHeaderAccess().getNameTypeKeyword_0_0());
+                c.setNoSpace().after(f.getTypeHeaderAccess().getNameTYPE_HEADERTerminalRuleCall_0_0());
                 c.setLinewrap().after(f.getTypeHeaderAccess().getTypeAssignment_1());
                 
@@ -94 +87 @@
                 // BlockIndentation
                 BlockElements block = f.getBlockAccess();
-                c.setIndentation(block.getLeftCurlyBracketKeyword_1(), 
-                                block.getRightCurlyBracketKeyword_3());
-                c.setLinewrap().before(block.getLeftCurlyBracketKeyword_1());
-                c.setLinewrap().after(block.getLeftCurlyBracketKeyword_1());
-                c.setLinewrap().after(block.getRightCurlyBracketKeyword_3());
+                c.setIndentation(block.getLeftCurlyBracketKeyword_0(),
+                                block.getRightCurlyBracketKeyword_2());
+                c.setLinewrap().before(block.getLeftCurlyBracketKeyword_0());
+                c.setLinewrap().after(block.getLeftCurlyBracketKeyword_0());
+                c.setLinewrap().after(block.getRightCurlyBracketKeyword_2());
 
                 // Param
@@ -104 +97 @@
                 c.setNoLinewrap().around(fullStop);
                 c.setNoSpace().around(fullStop);
-                c.setNoSpace().after(f.getPropertyAccessAccess().getAlternatives_0());
+                c.setNoSpace().after(f.getPropertyAccessAccess().getAlternatives_1());
+                c.setNoSpace().after(f.getPropertyAccessAccess().getAlternatives_2());
                 
                 // Invocation
@@ -117 +111 @@
                 
                 //Arrays
-                c.setNoSpace().after(f.getArrayAccess().getLeftSquareBracketKeyword_0());
+                c.setNoSpace().after(f.getArrayAccess().getLeftSquareBracketKeyword_1());
                 c.setNoSpace().before(f.getArrayAccess().getRightSquareBracketKeyword_3());
-                c.setNoSpace().before(f.getArrayAccess().getCommaKeyword_2_0());
+                c.setNoSpace().before(f.getArrayAccess().getCommaKeyword_2_1_0());
                 
                 // Unary expression