Commit 18bc3c11 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ minor formatting refinements

parent 658ec010

plugins/Prototypes/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/formatting2/TDLtxFormatter.java

+5 −0
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ public class TDLtxFormatter extends AbstractJavaFormatter { 
		org.etsi.mts.tdl.Package e = _package;

		formatCustom(e, doc);

		

		var dots = this.textRegionExtensions.allRegionsFor(e).keywords(".", "@");

		for (var dot : dots) {

			doc.surround(dot, p -> p.noSpace());

		}



		for (Comment comment : _package.getComment()) {

			doc.surround(comment, p -> p.setNewLines(1));

			doc.format(comment);

plugins/Prototypes/org.etsi.mts.tdl.txi/src/org/etsi/mts/tdl/formatting2/TDLtxiFormatter.java

+25 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ import org.etsi.mts.tdl.PackageableElement; 
import org.etsi.mts.tdl.StructuredDataType;

import org.etsi.mts.tdl.StructuredDataInstance;

import org.etsi.mts.tdl.TestObjective;

import org.etsi.mts.tdl.TimeLabel;

import org.etsi.mts.tdl.TimeConstraint;

import org.etsi.mts.tdl.ComponentType;

import org.etsi.mts.tdl.Annotation;

import org.etsi.mts.tdl.Extension;
@@ -18,6 +20,7 @@ import org.etsi.mts.tdl.DataElementMapping; 
import org.etsi.mts.tdl.TestConfiguration;

import org.etsi.mts.tdl.TestDescription;

import org.etsi.mts.tdl.Behaviour;

import org.etsi.mts.tdl.Comment;

import org.etsi.mts.tdl.FormalParameter;

import org.etsi.mts.tdl.LocalExpression;

import org.etsi.mts.tdl.services.TDLtxiGrammarAccess;
@@ -47,6 +50,22 @@ public class TDLtxiFormatter extends TDLtxFormatter { 
		}

	}



	protected void format(org.etsi.mts.tdl.Element e, IFormattableDocument doc) {

		for (var m : e.eContents()) {

			if (m instanceof Comment || 

					m instanceof TimeLabel ||

					m instanceof TimeConstraint ||

					m instanceof TestObjective

					) {

				doc.prepend(m, p->p.newLine());

				doc.surround(m, p->p.indent());

				doc.append(m, p->p.newLine());

			}

			doc.format(m);

		}

	}



	

	@Override protected void format(org.etsi.mts.tdl.NamedElement e, IFormattableDocument doc) {

		doc.surround(e, p->p.newLine());

//		doc.interior(e, p->p.indent());
@@ -137,6 +156,11 @@ public class TDLtxiFormatter extends TDLtxFormatter { 
		// TODO: format HiddenRegions around keywords, attributes, cross references, etc. 

		doc.interior(_package, p->p.indent());



		var e = _package;

		var dots = this.textRegionExtensions.allRegionsFor(e).keywords(".", "@");

		for (var dot : dots) {

			doc.surround(dot, p -> p.noSpace());

		}

		for (ElementImport elementImport : _package.getImport()) {

			doc.surround(elementImport, p -> p.setNewLines(1));

			doc.format(elementImport);