From efadb604b8cb965083e0cc4e0ac65ad5d93cccd4 Mon Sep 17 00:00:00 2001
From: Fernando Dodino <fernando.dodino@gmail.com>
Date: Sun, 23 May 2021 11:38:18 -0300
Subject: [PATCH] Adding fix for #1638 (#1996)

* Adding fix for #1638

* Removing GFM viewer plugin

* Removing SGit plugin

* Removing SGit and GFM viewer
---
 .../launch/WollokLauncherInterpreterEvaluator.xtend      | 4 +---
 .../org.uqbar.project.wollok.targetplatform.target       | 9 ---------
 .../ui/perspectives/WollokCodingPerspectiveFactory.xtend | 1 -
 .../wollok-product.product                               | 2 --
 wollok-language                                          | 2 +-
 5 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherInterpreterEvaluator.xtend b/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherInterpreterEvaluator.xtend
index 966327fbed..5510cf7146 100644
--- a/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherInterpreterEvaluator.xtend
+++ b/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherInterpreterEvaluator.xtend
@@ -159,9 +159,7 @@ class SuiteBuilder {
 			suiteObject.addMember(attribute)
 			suiteObject.initializeAttribute(attribute)
 		]
-		if (suite.initializeMethod !== null) {
-			interpreter.performOnStack(test, suiteObject, [| interpreter.eval(suite.initializeMethod.expression) ])			
-		}
+		WollokInterpreterEvaluator.callInitIfDefined(suiteObject)
 		if (test !== null) {
 			// Now, declaring test local variables as suite wko instance variables
 			test.variableDeclarations.forEach[ attribute |
diff --git a/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target b/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target
index 3a29f5a5f0..dd02be540c 100644
--- a/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target
+++ b/org.uqbar.project.wollok.targetplatform/org.uqbar.project.wollok.targetplatform.target
@@ -44,15 +44,6 @@
 			<unit id="org.eclipse.egit.source.feature.group" version="5.5.1.201910021850-r" />
 			<repository location="http://eclipse.c3sl.ufpr.br/egit/updates-5.5.1/" />
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="code.satyagraha.gfm.viewer.feature.feature.group" version="2.0.1" />
-			<repository location="http://dl.bintray.com/satyagraha/generic/2.0.1/" />
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="SGit.feature.group" version="1.0.0.202008021346" />
-			<unit id="SGit.source.feature.group" version="1.0.0.202008021346" />
-			<repository location="http://dl.bintray.com/wollok/sgit-update-site/" />
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://ci.eclipse.org/xpect/job/Xpect/job/release_0.2.0/lastBuild/artifact/org.eclipse.xpect.releng/p2-repository/target/repository/" />
 			<unit id="org.eclipse.xpect.sdk.feature.group" version="0.2.0.v20190619" />
diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/perspectives/WollokCodingPerspectiveFactory.xtend b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/perspectives/WollokCodingPerspectiveFactory.xtend
index 7ff331ab0a..38038578d6 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/perspectives/WollokCodingPerspectiveFactory.xtend
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/perspectives/WollokCodingPerspectiveFactory.xtend
@@ -42,7 +42,6 @@ class WollokCodingPerspectiveFactory implements IPerspectiveFactory {
 			addView(IConsoleConstants.ID_CONSOLE_VIEW)
 			addView("org.uqbar.project.wollok.ui.diagrams.class")
 			addView("org.eclipse.team.ui.GenericHistoryView")
-			addView("code.satyagraha.gfm.viewer.views.GfmView")
 		]
 
 		createFolder("topLeft", IPageLayout.LEFT, 0.25f, factory.editorArea) => [
diff --git a/org.uqbar.project.wollok.updatesite/wollok-product.product b/org.uqbar.project.wollok.updatesite/wollok-product.product
index d9ed79730c..4c70529cf4 100644
--- a/org.uqbar.project.wollok.updatesite/wollok-product.product
+++ b/org.uqbar.project.wollok.updatesite/wollok-product.product
@@ -610,12 +610,10 @@ Library.
       <feature id="org.eclipse.babel.nls_eclipse_es"/>
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.egit"/>
-      <feature id="code.satyagraha.gfm.viewer.feature"/>
       <feature id="org.eclipse.jgit"/>
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
-      <feature id="SGit"/>
    </features>
 
    <configurations>
diff --git a/wollok-language b/wollok-language
index 4d4e09f8ff..1cf92ea406 160000
--- a/wollok-language
+++ b/wollok-language
@@ -1 +1 @@
-Subproject commit 4d4e09f8ffa7758eabe57ba15c812253b0699cf9
+Subproject commit 1cf92ea4060e7b2130d394f5953743ba83554326