Just some tests for #696, but it is discouraging

uqbar-project · Apr 7, 2017 · dcb8274 · dcb8274
1 parent 8631f74
commit dcb8274
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/org.uqbar.project.wollok.ui.launch/src/org/uqbar/project/wollok/ui/launch/Activator.java b/org.uqbar.project.wollok.ui.launch/src/org/uqbar/project/wollok/ui/launch/Activator.java
@@ -39,6 +39,8 @@ public void stop(BundleContext context) throws Exception {
 	public ImageDescriptor getImageDescriptor(String name) {
 		try {
 			// First of all, we try to find image from shared images of Workbench (defined in target platform project)
+			// http://www.eclipse.org/articles/Article-Using%20Images%20In%20Eclipse/Using%20Images%20In%20Eclipse.html
+			// http://help.eclipse.org/mars/index.jsp?topic=%2Forg.eclipse.pde.doc.user%2Fguide%2Ftools%2Fviews%2Fimage_browser_view.htm 
 			ImageDescriptor id = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(name);
 			if (id != null) {
 				return id;

diff --git a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/formatting/WollokDslFormatter.xtend b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/formatting/WollokDslFormatter.xtend
@@ -323,20 +323,19 @@ class WollokDslFormatter extends AbstractDeclarativeFormatter {
 	}
 
 	def dispatch formatting(FormattingConfig it, extension WTryElements i) {
-		setLinewrap(1, 1, 2).before(group)
 		setLinewrap(1, 1, 1).after(tryKeyword_0)
 		setLinewrap(1, 1, 1).after(catchBlocksAssignment_2)
-
 		setIndentation(tryKeyword_0, catchBlocksAssignment_2)
-//		setIndentation(catchBlocksAssignment_2, catchBlocksWCatchParserRuleCall_2_0)
-//		setIndentation(catchBlocksWCatchParserRuleCall_2_0, catchBlocksWCatchParserRuleCall_2_0)
+		setLinewrap(1, 1, 1).before(alwaysExpressionWBlockOrExpressionParserRuleCall_3_1_0)
+		//setIndentationIncrement.after(thenAlwaysKeyword_3_0)
+		//setIndentationDecrement.after(alwaysExpressionWBlockOrExpressionParserRuleCall_3_1_0)
 	}
 
 	def dispatch formatting(FormattingConfig it, extension WCatchElements i) {
-		setSpace(' ').after(catchKeyword_0)
+		//setSpace(' ').after(catchKeyword_0)
 		setLinewrap(1,1,1).before(catchKeyword_0)
 		setLinewrap(1,1,1).around(expressionAssignment_3)
-		setIndentationIncrement.before(expressionAssignment_3)
+		//setIndentationIncrement.around(expressionWBlockOrExpressionParserRuleCall_3_0)
 	}
 
 	def dispatch formatting(FormattingConfig it, extension WSuperInvocationElements i) {