Updated to Xtext 2.23.0 #532

kittaakos · 2020-10-12T17:59:21Z

This PR is intended to close #506.

crapo · 2020-10-22T17:01:19Z

@kittaakos , what's the status of this. I think you're still working on it, true?

kittaakos · 2020-10-23T10:45:12Z

I think you're still working on it, true?

Yes. Work in progress.

kittaakos · 2020-10-27T14:12:19Z

@crapo, although this PR is work in progress, I am done with the Eclipse and p2 part. I did the verification of the SADL p2 update in the following Eclipse installations:

Eclipse 2020-03 DSL
Eclipse 2020-03 Java
Eclipse 2020-06 DSL
Eclipse 2020-06 Java
Eclipse 2020-09 DSL
Eclipse 2020-09 Java

All of them worked. Please check the changeset, I am still struggling with the Theia dependencies and the Docker image. I am hoping to finish it today.

Let me know if you have any questions. Thank you!

tuxji · 2020-10-27T15:37:32Z

sadl3/com.ge.research.sadl.parent/com.ge.research.sadl.feature/feature.xml

+   <includes
+         id="org.eclipse.xtext.xtext.ui"
+         version="0.0.0"/>
+


I've looked over the changeset quickly and I think it looks great, especially the removal of the xtext version ranges from the MANIFEST.MF files. That will make it easier to build and/or import SADL into future Xtext/Eclipse platforms.

I'm curious about this particular change. What is the purpose of this change? Is the purpose to bundle the Xtext bundles that SADL was built with so that SADL can be installed into an Eclipse platform which doesn't have any Xtext bundles at all? Or is the purpose to bundle the Xtext bundles that SADL was built with so that SADL can be installed into an Eclipse platform which has Xtext bundles older than 2.14.0 and therefore SADL needs to bring its own Xtext bundles just in case?

I'm curious about this particular change. What is the purpose of this change?

Thanks for asking. Let assume you have an Eclipse 2020-03 for DSL developers:

It comes with Xtext 2.21:

With this additional include (Xtext) in the manifest, when installing the SADL p2 into Eclipse 2020-3 DSL, it will automatically force updating the Xtext version shipped with Eclipse:

So once the SADL p2 installation is done, you will see the Xtext version update in the underlying platform:

If we do not force the Xtext version update when installing the SADL p2, we might run into incompatible APIs, causing a runtime error. Such as this.

Note, if you install the SADL p2 into any Eclipse for Java developers, it will just make Xtext only dependent on SADL:

kittaakos · 2020-10-27T16:01:23Z

@crapo, although this PR is work in progress,

It's ready for review. I tried the WebSADL application locally, it worked with the new theme and the rewritten coloring. I also managed to put together a Docker image locally and build it, but since the CI is down you won't be able to try out the latest state with docker pull theiaide/sadl until we fix the CI.

Made compatible with SemanticApplicationDesignLanguage/sadl#532. Closes #129 Signed-off-by: Akos Kitta <[email protected]>

crapo · 2020-11-03T21:32:18Z

@kittaakos , I did some testing on this branch and only found one issue. In the attached project, if I have both .sadl files open in the editor and I rename "Man" to "MaleMan", I get an error in George.sadl. If I make an edit or close and reopen George.sadl the error is gone, but until then it shows an error and MaleMan as undefined..
MyFamily.zip

crapo · 2020-11-03T21:44:34Z

@agabaldon , I have created an update ZIP file on this branch and installed it into Eclipse 2020-09 for Java Developers as well as into Eclipse 2020-03 for Java Developers and with the exception of the rename error mentioned here, everything seems fine. As soon as there is a release of SADL 3.4.1 that resolves the javax.activation.DataSource issue I recommend merging this to development branch and preparing for a major release that removes the pin to Xtext 2.21 and Eclipse 2020-03. I recommend that this major release be labeled SADL version 3.5.0.

kittaakos · 2020-11-05T10:40:27Z

and only found one issue

Does the same rename work correctly from the HEAD of the development branch?

crapo · 2020-11-05T12:47:54Z

and only found one issue

Does the same rename work correctly from the HEAD of the development branch?

The rename seems to work correctly in the HEAD of the development branch. During the renaming process the second file has errors but as soon as it is finished the errors go away instead of persisting until something happens to cause it to refresh.

kittaakos · 2020-11-05T12:49:44Z

The rename seems to work correctly in the HEAD of the development branch. During the renaming process the second file has errors but as soon as it is finished the errors go away instead of persisting until something happens to cause it to refresh.

Thank you! If it works on development, I will look into it early next week.

kittaakos · 2020-11-08T18:36:39Z

The rename seems to work correctly in the HEAD of the development branch.

I can confirm the regression. Unfortunately, I have no idea what's causing it. Most likely the heavy rename/refactoring customization we did for DARPA does not work well with the most recent Xtext version.

tuxji · 2020-11-13T15:24:55Z

What is the status of this pull request? I know there are conflicts that will need to be resolved because of changes to how CI publishes WebSADL, but is there any reason why not to resolve the conflicts and merge the PR now?

Revers commit of #492. [f4db832] Signed-off-by: Akos Kitta <[email protected]>

- Also bumped up MWE to `2.11.3`, - Explicitly depend on Xtext in the SADL feature. Signed-off-by: Akos Kitta <[email protected]>

Signed-off-by: Akos Kitta <[email protected]>

`bundle-version="2.14.0"` changes were auto-generated in the manifests. Signed-off-by: Akos Kitta <[email protected]>

Signed-off-by: Akos Kitta <[email protected]>

tuxji · 2020-12-01T18:13:03Z

Resolved the conflicts and merged this PR. CI will build a new WebSADL Docker image and someone will need to test it.

kittaakos force-pushed the GH-506--unpin-xtext-version branch 2 times, most recently from 4fe9d77 to 145b3d7 Compare October 26, 2020 18:53

kittaakos changed the base branch from GH-523--project-dep to development October 26, 2020 19:26

kittaakos force-pushed the GH-506--unpin-xtext-version branch 3 times, most recently from ded66f3 to 86955e2 Compare October 27, 2020 11:43

tuxji reviewed Oct 27, 2020

View reviewed changes

kittaakos marked this pull request as ready for review October 27, 2020 16:01

kittaakos mentioned this pull request Oct 29, 2020

Bump up the Xtext version GEGlobalResearch/DARPA-ASKE-TA1#129

Closed

kittaakos pushed a commit to GEGlobalResearch/DARPA-ASKE-TA1 that referenced this pull request Oct 29, 2020

Prepared for the Xtext update.

94af1e8

Made compatible with SemanticApplicationDesignLanguage/sadl#532. Closes #129 Signed-off-by: Akos Kitta <[email protected]>

kittaakos mentioned this pull request Oct 29, 2020

Prepared for the Xtext update. GEGlobalResearch/DARPA-ASKE-TA1#130

Merged

tuxji mentioned this pull request Nov 16, 2020

javax.activation.DataSource still giving errors #551

Closed

Akos Kitta added 7 commits November 30, 2020 16:33

GH-506: Unpinned the Xtext version.

60f38a2

Revers commit of #492. [f4db832] Signed-off-by: Akos Kitta <[email protected]>

Updated Xtext to 2.23.0 in the target platform.

022c670

- Also bumped up MWE to `2.11.3`, - Explicitly depend on Xtext in the SADL feature. Signed-off-by: Akos Kitta <[email protected]>

Reimplemented the semantic highlighting.

db2baee

Signed-off-by: Akos Kitta <[email protected]>

Aligned rename/refactoring API to Xtext 2.23.0.

6b3a2a0

Signed-off-by: Akos Kitta <[email protected]>

Updated to Xtext 2.23.0 for the Maven build.

426dbc8

`bundle-version="2.14.0"` changes were auto-generated in the manifests. Signed-off-by: Akos Kitta <[email protected]>

Can build with Theia 1.4.0. API.

7a6cafc

Signed-off-by: Akos Kitta <[email protected]>

[web]: Restored the semantic highlighting.

1146a45

Signed-off-by: Akos Kitta <[email protected]>

[web]: Added the SADL theme.

d700705

Signed-off-by: Akos Kitta <[email protected]>

tuxji force-pushed the GH-506--unpin-xtext-version branch from 86955e2 to d700705 Compare November 30, 2020 22:04

Don't require java.activation bundle

65819a5

tuxji merged commit e44d8c8 into development Dec 1, 2020

tuxji deleted the GH-506--unpin-xtext-version branch December 1, 2020 18:11

crapo mentioned this pull request Dec 21, 2020

Does SADL work with xtext 2.24 #592

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated to Xtext 2.23.0 #532

Updated to Xtext 2.23.0 #532

kittaakos commented Oct 12, 2020 •

edited

Loading

crapo commented Oct 22, 2020

kittaakos commented Oct 23, 2020

kittaakos commented Oct 27, 2020

tuxji Oct 27, 2020

kittaakos Oct 27, 2020

kittaakos commented Oct 27, 2020

crapo commented Nov 3, 2020 •

edited

Loading

crapo commented Nov 3, 2020 •

edited

Loading

kittaakos commented Nov 5, 2020

crapo commented Nov 5, 2020

kittaakos commented Nov 5, 2020

kittaakos commented Nov 8, 2020

tuxji commented Nov 13, 2020

tuxji commented Dec 1, 2020

Updated to Xtext 2.23.0 #532

Updated to Xtext 2.23.0 #532

Conversation

kittaakos commented Oct 12, 2020 • edited Loading

crapo commented Oct 22, 2020

kittaakos commented Oct 23, 2020

kittaakos commented Oct 27, 2020

tuxji Oct 27, 2020

Choose a reason for hiding this comment

kittaakos Oct 27, 2020

Choose a reason for hiding this comment

kittaakos commented Oct 27, 2020

crapo commented Nov 3, 2020 • edited Loading

crapo commented Nov 3, 2020 • edited Loading

kittaakos commented Nov 5, 2020

crapo commented Nov 5, 2020

kittaakos commented Nov 5, 2020

kittaakos commented Nov 8, 2020

tuxji commented Nov 13, 2020

tuxji commented Dec 1, 2020

kittaakos commented Oct 12, 2020 •

edited

Loading

crapo commented Nov 3, 2020 •

edited

Loading

crapo commented Nov 3, 2020 •

edited

Loading