Commit graph

379 commits

Author SHA1 Message Date
Christian Dietrich
c3dc3d2d4a [eclipse/xtext#1452] add common JavaRuntimeVersion utility to avoid code duplication between modules
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-26 10:49:46 +02:00
Christian Dietrich
a055bbd5aa [#1744] ignore test on Java 16 and later
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-25 10:01:24 +02:00
Christian Dietrich
b7a4664156 more xtend 2 java conversions
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-16 18:58:19 +02:00
Christian Dietrich
668cf101af converted test code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-09 14:41:44 +02:00
Christian Dietrich
15915a2558 clear caches on updateInternalState
Fixes eclipse/xtext-eclipse#1697
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-09 09:42:47 +02:00
Christian Dietrich
65305be6da remove unnec. restriction for non xbase grammars
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-07-23 14:52:21 +02:00
Christian Dietrich
ecab469ae2 filter hidden nodes for value conversion of enums. Fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=574721
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-07-08 13:40:33 +02:00
Christian Dietrich
322a6d2aa7 [eclipse/xtext#1952] converting test code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-04-16 14:55:05 +02:00
Christian Dietrich
7ad2bc1387 [eclipse/xtext#1952] converting test code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-04-12 15:24:47 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Christian Dietrich
8fbb799ddd removed unused import
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-07-15 17:31:41 +02:00
Christian Dietrich
b4c4be04fa [eclipse/xtext#1777] ported xtend code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-07-14 14:32:36 +02:00