Commit graph

709 commits

Author SHA1 Message Date
Arne Deutsch
8ab3672c97 [#1626] Use node model to generate comments with original format.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2021-02-12 11:01:11 +01:00
Christian Dietrich
8ff246abc1 updated versions in wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-02-04 15:35:08 +01:00
Christian Dietrich
913d814ff6 [eclipse/xtext#1925] update to MWE 2.12.1.M2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-02-01 14:37:27 +01:00
Christian Dietrich
5aba2e29ed [eclipse/xtext-core#1666] added testcase for special ML_COMMENT
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-01-25 11:26:51 +01:00
Christian Dietrich
3ca79899a8
Merge pull request #1651 from eclipse/cd_issue1648
[#1648] fixed regression in InjectionExtension
2021-01-06 16:28:50 +01:00
Karsten Thoms
3288037b7e [eclipse/xtext#1916] Upgrade GSON to 2.8.6
Following platform upgrade of GSON from Bug#569966.

Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
2021-01-06 12:24:56 +01:00
Karsten Thoms
8260ca2e61 Consider Beta release pattern in version string
The release-prepare-branches can also create a Beta release for testing
purpose. The version string is then 'x.x.x.Beta'. This was not
considered properly by the test.

Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
2021-01-06 10:29:10 +01:00
Christian Dietrich
c6daeb75a5 [#1648] fixed regression in InjectionExtension
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-18 10:36:54 +01:00
Arne Deutsch
24976d2421 [#1625] Make test less strict to avoid failing because of bad serialize
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2020-12-18 09:31:40 +01:00
Christian Dietrich
4436852b98 [eclipse/xtext#1885] use 2021-03 in wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-16 11:30:29 +01:00
Christian Dietrich
11d67266b0 [eclipse/xtext#1897] converted xtend code 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-15 19:44:09 +01:00
Christian Dietrich
3f2b46ce98 regenerated xtend code with latest xtend
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-14 09:45:43 +01:00
Arne Deutsch
267e96cac9
Merge pull request #1643 from eclipse/ade-java-xtext-formatter-fixes-b
Regenerated Languages
2020-12-11 09:56:16 +01:00
Christian Dietrich
d16c16c916 Regenerated Languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-11 09:47:18 +01:00
Arne Deutsch
96d44d87a9 [#1625] More formatter fixes and tests.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2020-12-11 09:37:24 +01:00
Christian Dietrich
e104c4331f [eclipse/xtext#1882][2021-03] Update Orbit
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-12-07 11:21:11 +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