Commit graph

694 commits

Author SHA1 Message Date
Christian Dietrich
5534248b7f [eclipse/xtext-core#1093] workaround for missing return keywords in serialization
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-04 12:04:26 +01:00
Nico Prediger
adc50299ef [releng] Update Xtext version to 2.25.0
Signed-off-by: Nico Prediger <mail@nicoprediger.de>
2020-11-30 15:53:15 +00:00
Christian Dietrich
e5c7bca5ce regenerated test languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-30 09:14:51 +01:00
Arne Deutsch
2c2d5b987e [#1625] Added a lot of tests and a few fixes to the formatter.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2020-11-27 15:48:44 +01:00
Christian Dietrich
29a18f763c ported formatter to new java api
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-23 14:46:47 +01:00
Christian Dietrich
b316f230af regenerated languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-23 09:31:28 +01:00
Christian Dietrich
721593207b
Merge pull request #1624 from eclipse/ade-java-xtext-formatter
[#1489] Several formatter fixes.
2020-11-23 09:30:51 +01:00
Arne Deutsch
294a43c4ff [#1489] Several formatter fixes.
Added unit tests as well.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2020-11-20 15:54:15 +01:00
Karsten Thoms
cb0b63da30 [releng] Update MWE to 1.6.0/2.12.0
Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
2020-11-20 06:58:15 +00:00
Christian Dietrich
5745b5fad1 [eclipse/xtext#1837] converted xtend 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-18 22:03:24 +01:00
Christian Dietrich
616bc7dc3d security fix for jetty in wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-17 20:45:34 +01:00
Christian Dietrich
2efdaac08e ported more xtend formatters to java
code cleanup Xtext Java Formatter

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-17 16:04:09 +01:00
Arne Deutsch
ad62f83604 [eclipse/xtext#1697] Abstract super class for java based formatters.
[#1489] Java based Xtext formatter (formatter2 API).

Remove API restrictions.
Testing java based formatter.
Formatter2 Java Fragment.
2020-11-16 09:32:34 +01:00
Christian Dietrich
ee21c89474 [eclipse/xtext#1837] converted xtend 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-08 09:54:48 +01:00
Christian Dietrich
7f8843fa1f fixed test on win
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-04 13:56:23 +01:00
Christian Dietrich
e19af51c9d
Merge pull request #1603 from eclipse/cd_convertMoreXtend2Java
[eclipse/xtext#1837] converted xtend 2 java
2020-11-02 10:28:30 +01:00
Christian Dietrich
4cfca5c0ba [eclipse/xtext#1837] converted xtend 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-11-02 10:22:18 +01:00
Christian Dietrich
1545e4a0e3 [eclipse/xtext#1866] update to MWE(2) 1.6.0/2.12.0 M2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-30 08:39:09 +01:00
Christian Dietrich
f69e59c154
Merge pull request #1600 from eclipse/cd_cleanup
cleanup x2j
2020-10-28 11:38:45 +01:00
Christian Dietrich
246b86e304 [eclipse/xtext#1855] update to junit 5.7
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-28 08:36:04 +01:00
Christian Dietrich
e283b69ab6 cleanup x2j
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-26 15:09:34 +01:00
Christian Dietrich
e368f9f427 [eclipse/xtext#1863] respect java version in generated launch config
Fixed eclipse/xtext#1863

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-26 09:33:10 +01:00
Christian Dietrich
3e42628d54 Shorted test project names
Fixes: #1186

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-23 13:05:43 +02:00
Christian Dietrich
0a72c07d61 [eclipse/xtext#1837] converted xtend 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-23 09:28:49 +02:00
Christian Dietrich
f9d2f340bc
Merge pull request #1593 from eclipse/cd_J11_gedoens
fixed platform targetplatform badness with Java 11 in wizard
2020-10-19 11:31:14 +02:00
Christian Dietrich
877efdb25e fix temp folder security flaw
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-19 10:05:41 +02:00
Christian Dietrich
12e396a62a fixed platform targetplatform badness with Java 11 in wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-19 09:21:54 +02:00
Christian Dietrich
70607b6081 fixed some bugs
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-16 13:39:45 +02:00
Christian Dietrich
d78563ecf0
Merge pull request #1581 from eclipse/cd_X2J224
[eclipse/xtext#1837] ported xtend code 2 java
2020-10-16 09:02:49 +02:00
Christian Dietrich
8997e0c803 update to latest jetty
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-11 09:42:14 +02:00
Christian Dietrich
0d7ada7615 [eclipse/xtext-web#262] update to jquery 3.5.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-09 09:58:11 +02:00
Christian Dietrich
76b2337b9e
Merge pull request #1584 from eclipse/cd_asm9
[eclipse/xtext#1852] Update to ASM 9
2020-10-06 10:03:40 +02:00
Christian Dietrich
e9bba8f355 [eclipse/xtext#1852] Update to ASM 9
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-06 09:07:47 +02:00
Christian Dietrich
8c89020086
Merge pull request #1583 from eclipse/cd_issue1582
made tests order independent. fixes #1582
2020-10-05 17:40:30 +02:00
Christian Dietrich
91c518ea7c made tests order independent. fixes #1582
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-10-05 14:41:10 +02:00
Christian Dietrich
e9faad369b [eclipse/xtext#1837] ported xtend code 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-09-28 17:27:54 +02:00
Christian Dietrich
56de6162c0 [eclipse/xtext-eclipse#1547] enhance ecore2xtext generator & xtext2ecore transformer for reserved keywords in enums
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-09-28 11:35:33 +02:00
Sebastian Zarnekow
5d251e5af2 [eclipse/xtext#1850] Fix resource leaks 2020-09-18 21:07:17 +02:00
Arne Deutsch
5c43b18fb4
Merge pull request #1567 from eclipse/ade-eobject-comment-offset0
[#1521] Return root on parse success and no other element found.
2020-09-18 09:06:08 +02:00
Karsten Thoms
8a6605a018
Merge pull request #1572 from eclipse/cd_xtext_issuue1831b
[eclipse/xtext#1831] update to download.eclipse.org/releases/2020-12
2020-09-15 10:37:09 +02:00
Christian Dietrich
d959d8dde1 [eclipse/xtext#1831] update to download.eclipse.org/releases/2020-12
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-09-15 08:43:43 +02:00
Christian Dietrich
05500a92f1 [eclipse/xtext#1828] update orbit to 2020-12
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-09-14 20:50:05 +02:00
Arne Deutsch
1c0ec04ab0 [#1521] Return root on parse success and no other element found.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2020-09-04 08:59:13 +02:00
Christian Dietrich
ee7cf5f196
Merge pull request #1556 from eclipse/cd_fixJava11Warnings
fixed warnings when compiling against Java 11
2020-09-01 08:05:28 +02:00
kthoms
599b17be0a [releng] Update Xtext version to 2.24.0
Signed-off-by: kthoms <karsten.thoms@karakun.com>
2020-08-31 21:37:37 +00:00
Titouan Vervack
c15d749416
Fixed spaces after ML comments in format(#1543)
When customizing the formatter to consider indentation + spaces, ML comments are prepended with a space. This patch fixes that.
2020-08-26 11:07:23 +02:00
Christian Dietrich
57d599543a fixed warnings when compiling against Java 11
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-08-17 14:55:32 +02:00
Christian Dietrich
7297fd4786 [eclipse/xtext#1777] ported xtend code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-08-09 21:13:06 +02:00
Sebastian Zarnekow
108ea555d7
Improved validation against imported ecore meta model (#1552)
closes #1551 

Signed-off-by: Sebastian Zarnekow <sebastian.zarnekow@gmail.com>
2020-08-07 14:56:30 +02:00
Sebastian Zarnekow
6d7097ef24 Improved grammar validation in the context of unassigned rule calls
Subsequent unassigned actions are not allowed if there was already a
current instance present.

Signed-off-by: Sebastian Zarnekow <sebastian.zarnekow@gmail.com>
2020-08-07 14:32:57 +02:00