Skip to content

Commit

Permalink
Adding fix for #1638 (#1996)
Browse files Browse the repository at this point in the history
* Adding fix for #1638

* Removing GFM viewer plugin

* Removing SGit plugin

* Removing SGit and GFM viewer
  • Loading branch information
fdodino authored May 23, 2021
1 parent 8b7fa71 commit efadb60
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) => [
Expand Down
2 changes: 0 additions & 2 deletions org.uqbar.project.wollok.updatesite/wollok-product.product
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion wollok-language

0 comments on commit efadb60

Please sign in to comment.