Fix #1830 - formatter conflicts

uqbar-project · Nov 3, 2019 · 151ed17 · 151ed17
1 parent 108cbd9
commit 151ed17
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/org.uqbar.project.wollok.tests/formatters.launch b/org.uqbar.project.wollok.tests/formatters.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.uqbar.project.wollok.tests/xtend-gen/org/uqbar/project/wollok/tests/formatter"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="2"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="formatters"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.uqbar.project.wollok.tests/xtend-gen&lt;org.uqbar.project.wollok.tests.formatter"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.uqbar.project.wollok.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+</launchConfiguration>
diff --git a/....tests/src/org/uqbar/project/wollok/tests/formatter/AbstractWollokFormatterTestCase.xtend b/....tests/src/org/uqbar/project/wollok/tests/formatter/AbstractWollokFormatterTestCase.xtend
@@ -20,7 +20,7 @@ class AbstractWollokFormatterTestCase {
 	@Inject protected extension ISerializer
 
 	def assertFormatting(String program, String expected) {
-		//program.parse.eContents.show(1)
+		// program.parse.eContents.show(1)
 		Assert.assertEquals(expected,
         program.parse.serialize(SaveOptions.newBuilder.format().getOptions()))		
 	}

diff --git a/....wollok.tests/src/org/uqbar/project/wollok/tests/formatter/TestingFormatterTestCase.xtend b/....wollok.tests/src/org/uqbar/project/wollok/tests/formatter/TestingFormatterTestCase.xtend
@@ -25,6 +25,7 @@ class TestingFormatterTestCase extends AbstractWollokFormatterTestCase {
     	const b = new Sobreviviente()
     	test "aSimpleTest"{              assert.that(true)           }''', '''
 			const a = new Sobreviviente()
+			
 			const b = new Sobreviviente()
 
 			test "aSimpleTest" {

diff --git a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/formatting2/WollokDslFormatter.xtend b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/formatting2/WollokDslFormatter.xtend
@@ -65,11 +65,7 @@ class WollokDslFormatter extends AbstractFormatter2 {
 			]
 			elements.forEach [ element, i |
 				element.format
-				if (elements.size - 1 == i) {
-					element.append [ setNewLines(2) ]
-				} else {
-					element.append [ newLine ]
-				}
+				element.append [ setNewLines(2) ]
 			]
 			main.format
 			tests.formatTests(document)
@@ -566,11 +562,7 @@ class WollokDslFormatter extends AbstractFormatter2 {
 	def void formatSuites(Iterable<WSuite> suites, extension IFormattableDocument document) {
 		suites.forEach [ suite, i |
 			suite.format
-			if (suites.size - 1 == i) {
-				suite.append [ newLine ]
-			} else {
-				suite.append [ setNewLines(2) ]
-			}
+			suite.append [ setNewLines(2) ]
 		]	
 	}