sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7734 commits 41 branches 98 tags 41 MiB
Commit graph

7734 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian Dietrich
3a2c145e87 [#1655] fixed k=x generation if k is set in parser options 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2021-01-11 07:48:50 +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
c9b7255ac3
Merge pull request #1658 from eclipse/kt_issue1916_gson_upgrade 
[eclipse/xtext#1916] Upgrade GSON to 2.8.6
 2021-01-06 15:59:05 +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
f8d47d647e
Merge pull request #1657 from eclipse/kt_XtextVersionTests_BetaVersion 
Consider Beta release pattern in version string
 2021-01-06 10:54:59 +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
Sebastian Zarnekow
fd88a039df
Merge pull request #1654 from eclipse/ade-formatter2-public-api 
[#1629] Open up org.eclipse.xtext.serializer.tokens
 2020-12-18 17:25:10 +01:00
Arne Deutsch
c2fa8fe3bc [#1629] Open up org.eclipse.xtext.serializer.tokens 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2020-12-18 16:24:30 +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
8e96eca65b
Merge pull request #1646 from eclipse/ade-java-xtext-formatter-fixes 
[#1625] Make test less strict to avoid failing because of bad serialize
 2020-12-18 10:00:27 +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
7c30d2ccf7
Merge pull request #1636 from eclipse/cd_xtext_issue1885 
[eclipse/xtext#1885] use 2021-03 in wizard
 2020-12-16 18:14:47 +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
81e9211d10
Merge pull request #1649 from eclipse/cd_x2jdez 
[eclipse/xtext#1897] converted xtend code 2 java
 2020-12-16 10:57:59 +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
40c5d3d1e3
Merge pull request #1647 from eclipse/cd_regenXtend 
regenerated xtend code with latest xtend
 2020-12-14 10:54:41 +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
Sebastian Zarnekow
610ea8dfa4
Merge pull request #1645 from loradd/loradd/fix-findings-from-conversion-1517 
Fixes eclipse/xtext-core#1517
 2020-12-11 08:54:56 +01:00
Lorenzo Addazi
3078a49d8d Fixes eclipse/xtext-core#1517 
Signed-off-by: Lorenzo Addazi <lorenzo.addazi@mdh.se>
 2020-12-10 22:47:14 +00:00
Christian Dietrich
66580f2508
Merge pull request #1644 from eclipse/cd_serVerUIDWebXtend 
generate serialVersionUID for Xtend based Xtext Servlet too
 2020-12-09 16:42:21 +01:00
Christian Dietrich
3520122008 generate serialVersionUID for Xtend based Xtext Servlet too 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2020-12-09 15:25:53 +01:00
Christian Dietrich
1528b58430
Merge pull request #1637 from eclipse/cd_xtext_issue1882 
[eclipse/xtext#1882][2021-03] Update Orbit
 2020-12-09 10:54:57 +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
Christian Dietrich
fe8e7cd250
Merge pull request #1638 from eclipse/cd_x2j_225 
[eclipse/xtext#1897] converted xtend code 2 java
 2020-12-07 10:38:20 +01:00
Christian Dietrich
259e7fa231
Merge pull request #1640 from eclipse/cd_xtext_issue1652 
[eclipse/xtext#1652] Use https instead of git URL for SCM connection
 2020-12-07 10:03:48 +01:00
Christian Dietrich
9b61f32c53 [eclipse/xtext#1652] Use https instead of git URL for SCM connection 
Harmonized newline at eof in gradle and poms

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2020-12-04 08:42:16 +01:00
miklossy
fecf0e7268 Fixing typos in the javadoc comments. 
Signed-off-by: miklossy <miklossy@itemis.de>
 2020-12-02 20:51:29 +01:00
Christian Dietrich
597d88bd09 [eclipse/xtext#1897] converted xtend code 2 java 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2020-12-02 10:55:44 +01:00
miklossy
98df842c0b Fixing typos in the javadoc comments. 
Signed-off-by: miklossy <miklossy@itemis.de>
 2020-12-02 08:31:21 +01:00
Christian Dietrich
459602b791
Merge pull request #1634 from eclipse/bot_update_xtext_bootstrap_version 
[releng] Bootstrap against 2.24.0
 2020-12-01 06:50:08 +01:00
Christian Dietrich
d453370e33 [releng] Bootstrap against 2.24.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2020-11-30 17:17:45 +00:00
Christian Dietrich
0ba5424e21
Merge pull request #1633 from eclipse/bot_update_xtext_version 
[releng] Update Xtext version to 2.25.0
 2020-11-30 17:05:33 +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
f094e5b685
Merge pull request #1632 from eclipse/ade-java-xtext-formatter-fixes2 
regenerated languages
 2020-11-30 09:26:32 +01: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
7dae1773a9
Merge pull request #1631 from eclipse/ade-java-xtext-formatter-fixes 
[#1625] Added a lot of tests and a few fixes to the formatter.
 2020-11-30 09:10:45 +01:00
Christian Dietrich
0903e4427e
Merge pull request #1630 from eclipse/serServlet 
generate serialVersionUID for Java Servlet
 2020-11-27 17:06:03 +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
1582d885b0 generate serialVersionUID for Java Servlet 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2020-11-27 11:06:57 +01:00
Christian Dietrich
0d74bfc4eb
Merge pull request #1628 from eclipse/bot_update_xtext_bootstrap_version 
[releng] Bootstrap against 2.24.0.M3
 2020-11-25 18:59:09 +01:00
cdietrich
557cc09808 [releng] Bootstrap against 2.24.0.M3 
Signed-off-by: cdietrich <christian.dietrich@itemis.de>
 2020-11-25 17:18:17 +00: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
b6d04adff6
Merge pull request #1616 from eclipse/cd_regenLanguages 
regenerated languages
 2020-11-23 10:02:13 +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
a0fa2b48e3
Merge pull request #1623 from eclipse/bot_update_mwe_version 
[releng] Update MWE to 1.6.0/2.12.0
 2020-11-20 08:12:08 +01:00