Commit d388f923 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ formatter refinements

parent 08f2eeb0
Loading
Loading
Loading
Loading
+16 −3
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ class TTCN3Formatter extends AbstractDeclarativeFormatter {
            c.setLinewrap().after(keyword)
        }
        
        c.setLinewrap.before(functionStatementRule)
        c.setLinewrap.after(componentDefListRule)
        

        for (r: findRuleCalls(structFieldDefRule)) {
            c.setLinewrap.before(r)
        }
@@ -51,7 +55,11 @@ class TTCN3Formatter extends AbstractDeclarativeFormatter {
        }

        for (r: findRuleCalls(FUNCTIONKEYWORDRule)) {
            c.setLinewrap.before(r)
            c.setLinewrap(2,2,2).before(r)
        }

        for (r: findRuleCalls(TESTCASEKEYWORDRule)) {
            c.setLinewrap(2,2,2).before(r)
        }

        for (r: findRuleCalls(CONSTKEYWORDRule)) {
@@ -62,8 +70,13 @@ class TTCN3Formatter extends AbstractDeclarativeFormatter {
            c.setLinewrap.before(r)
        }

        for (r: findRuleCalls(altGuardListRule)) {
            c.setLinewrap.before(r)
        }

        for (r: findRuleCalls(SEMICOLONRule)) {
            c.setLinewrap.after(r)
            //c.setLinewrap(0,1,1).after(r)
//            c.setLinewrap.after(r)
        }

        for (r: findRuleCalls(DOTRule)) {
@@ -72,7 +85,7 @@ class TTCN3Formatter extends AbstractDeclarativeFormatter {
        }

        for (r: findRuleCalls(SQUAREOPENRule)) {
            c.setNoSpace.before(r)
//            c.setNoSpace.before(r)
            c.setNoSpace.after(r)
        }