Commit graph

672 commits

Author SHA1 Message Date
Christian Dietrich
16d926c7f3 [eclipse/xtext#1679]ported test code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-05-05 17:26:08 +02:00
Christian Dietrich
ef118b8eed [eclipse/xtext#1738] avoid usage of icu.Transliterator
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-05-05 14:24:10 +02:00
Christian Dietrich
b55bbcce30 [eclipse/xtext#1738] use java.text.SimpleDateFormat instead of com.ibm.icu.SimpleDateFormat
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-05-05 09:14:55 +02:00
Sebastian Zarnekow
b15fd84cfe
[#1467] Made lookAhead independent from encountered hidden tokens (#1469)
Made lookAhead independent from encountered hidden tokens

closes #1467
2020-05-04 17:18:34 +02:00
Sebastian Zarnekow
1647521e63
[#1462] Syntax errors will lead to unexpected calls to value converters (#1463)
Don't call a value converter if nothing was matched. Also don't assign naively true for boolean values without checking if there was a token consumed.

closes #1462
2020-05-04 13:47:16 +02:00
Christian Dietrich
71f17744eb [eclipse/xtext#1679]ported more code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-04-29 11:42:44 +02:00
Christian Dietrich
e7db3d48a8
Merge pull request #1457 from eclipse/cd_asm8
[eclipse/xtext#1649] update to ASM 8.0
2020-04-28 08:42:54 +02:00
Christian Dietrich
4ac89676f9 [eclipse/xtext#1649] update to ASM 8.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-04-28 08:27:41 +02:00
Christian Dietrich
4a29a0bf5d [eclipse/xtext#1679] converted Xtend code to Java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-04-26 13:08:20 +02:00
Tamas Miklossy
f2a452ef39 [https://github.com/eclipse/xtext/issues/1732] Update to Tycho 1.7.0
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2020-04-24 08:16:36 +02:00
Christian Dietrich
dcd234c02a [eclipse/xtext#1679] ported xtend code to java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-04-06 13:26:12 +02:00
Christian Dietrich
d685cf29ea [eclipse/xtext-eclipse#1389] fixed exception handing (revert to old behaviour)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-04-06 10:34:38 +02:00
Sebastian Zarnekow
12a21c9114
[eclipse/xtext#1679] Refactor more Xtend to Java (#1428)
* [eclipse/xtext#1679] Refactor more Xtend to Java
2020-03-26 16:54:05 +01:00
Christian Dietrich
aaaa0b7f3c [eclipse/xtext#1682] update orbit to 2020-06
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-03-20 08:12:48 +01:00
Christian Dietrich
24ab236af1 [eclipse/xtext#1685] use 2020-06 update site
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-03-16 13:25:18 +01:00
Sebastian Zarnekow
8413a4df0e
Merge pull request #1413 from eclipse/sz_bug318482
[bug 318482] Support keywords as terminals in cross references
2020-03-10 12:17:32 +01:00
Sebastian Zarnekow
7425f83b2a [bug 318482] Support keywords as terminals in cross references 2020-03-05 22:19:34 +01:00
Christian Dietrich
1969166a60 fixed getEntryParserRule with actions [eclipse/xtext-xtend#1018]
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-03-05 19:44:12 +01:00
Nico Prediger
7c82447f16 [releng] Update Xtext version to 2.22.0
Signed-off-by: Nico Prediger <mail@nicoprediger.de>
2020-03-03 12:00:56 +00:00
Christian Dietrich
400e93b8a5 fixed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-02-28 10:18:07 +01:00
Christian Dietrich
4ac7a0ef10 [eclipse/xtext#1673] udpate to MWE 2.11.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-02-24 20:12:31 +01:00
Christian Dietrich
ee77317dd2 test with MWE 2.11.2.M3
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-02-17 13:11:48 +01:00
Christian Dietrich
543d37bed1 [#1384] removed xpand/generator(1) dependency from wizard for existing ecore models
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-02-14 10:25:12 +01:00
Hannes Niederhausen
2d4b45fc4f Added exclude configuration for p1.features for ls-pom.xml
Commit missing updated xtend file.

Signed-off-by: Hannes Niederhausen <hniederhausen@itemis.de>
2020-02-11 16:49:59 +01:00
Sven Efftinge
f9b6d1bebe
[eclipse/xtext#1176] Migrate to EPL 2.0
Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
Co-authored-by: Sebastian Zarnekow <Sebastian.Zarnekow@gmail.com>
2020-02-11 12:02:02 +01:00
Sebastian Zarnekow
04aedc416e
Merge pull request #1358 from rablewis/1262
[#1262] Prevent infinite loop with NodeIterator.
2020-02-03 09:35:28 +01:00
Arne Deutsch
5dec13b7b4 [#1303] Throw exception instead of returning null.
Extend JavaDoc.
Adapt unit test.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2020-01-31 08:21:07 +01:00
Robert Lewis
792bfe3b29 [#1262] Prevent infinite loop with NodeIterator.
Throw NullPointerException if null is passed to NodeIterator constructor
to prevent iterator state where hasNext() and hasPrevious() always
return true, but getNext() and getPrevious() always return null.
Similarly, throw NPE for null passed to constructors of NodeIterable,
BasicNodeIterator and BasicNodeIterable. Added unit tests for all four
classes.

Signed-off-by: Robert Lewis <rablewis@algo-pop.com>
2020-01-25 14:51:39 +00:00
Robert Lewis
dc4699fb40 [#1262] Prevent infinite loop with NodeIterator.
Throw NullPointerException if null is passed to NodeIterator constructor
to prevent iterator state where hasNext() and hasPrevious() always
return true, but getNext() and getPrevious() always return null.
Similarly, throw NPE for null passed to constructors of NodeIterable,
BasicNodeIterator and BasicNodeIterable. Added unit tests for all four
classes.

Signed-off-by: Robert Lewis <rablewis@algo-pop.com>
2020-01-24 23:18:58 +00:00
Christian Dietrich
d6a22de8a9 [eclipse/xtext#1643] update to tycho 1.6.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-20 15:54:50 +01:00
Christian Dietrich
ccf274d016 [#1351] match milestone versions in test too
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-13 13:31:53 +01:00
Tamas Miklossy
664fb2e8e8 Convert EMFGeneratorFragment2.trimMultiLineComment to an instance method
- to be able to override that method in derived classes.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2020-01-09 10:15:30 +01:00
Lorenzo Bettini
c8196eeca2
Merge pull request #1336 from eclipse/lb_issue_1335
The generated parent POM should not ignore maven-resources-plugin goals
2020-01-09 09:24:45 +01:00
Tamas Miklossy
889aef2385 [#1345] Improve EMFGeneratorFragment2 fileHeader handling.
- Improve the trimMultiLineComment method to properly handle the /**,
/*******, **/ and ****************/ symbols.
- Implement corresponding EmfGeneratorFragment2Test test cases.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2020-01-09 09:15:11 +01:00
Christian Dietrich
0b201a6bc1 regenerated test langs
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-07 12:46:07 +01:00
Christian Dietrich
72f82d0229
Merge pull request #1339 from eclipse/cd_xtext_issue1605
[eclipse/xtext#1605] update orbit to 2020-03
2020-01-06 19:05:21 +01:00
Christian Dietrich
98fa225dcc use 2020-03 in target platform
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-06 18:52:30 +01:00
Christian Dietrich
36babc7191 [eclipse/xtext#1605] update orbit to 2020-03
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-06 18:34:52 +01:00
Christian Dietrich
83249956d4 [eclipse/xtext#1282] Update to EMF 2.20: change version constraints in MANIFESTs
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:15 +01:00
Christian Dietrich
1f8b21ff15 [eclipse/xtext#1282] Update to EMF 2.20: regenerated languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:14 +01:00
Christian Dietrich
de1a6b9bdb [eclipse/xtext#1282] Update to EMF 2.20: adapted workflows and manually maintained genmodels
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:14 +01:00
Lorenzo Bettini
b3147aebad 1335: updated CliWizardIntegrationTest expectations
Task-Url: https://github.com/eclipse/xtext-core/issues/1335
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2020-01-03 14:42:29 +01:00
Christian Dietrich
771ff6052f [#1328] marked obsolete LineFilterOutputStream as deprecated
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-12-15 10:30:24 +01:00
Christian Dietrich
e3089c28c9 regenerated test lang
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-12-13 09:22:42 +01:00
Christian Dietrich
18e4a6c7ee [#1324] teach partial class extractor about fragment rules
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-12-12 10:24:11 +01:00
Karsten Thoms
325fa1e8d6 [releng] Update Xtext version to 2.21.0
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-12-02 14:06:33 +00:00
Karsten Thoms
e1161dbe03 [#1304] Add test case for regression in getCurrent()
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-11-28 11:57:17 +01:00
Lorenzo Bettini
b7ada2599a Use mwe2version in Tycho-based POMs instead of hard-coding
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2019-11-26 17:27:36 +01:00
Lorenzo Bettini
533b8dd988 Use mwe2version in POMs and target platform, instead of hard-coding
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2019-11-26 16:12:48 +01:00
Christian Dietrich
15c2115a28 fix unwanted build properties changes
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-11-22 18:22:01 +01:00
Christian Dietrich
2b644ab2dc fixed deprecations
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-11-22 11:51:22 +01:00
Christian Dietrich
53f3aa5808 [eclipse/xtext#1609] update to mwe 2.11.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-11-21 17:00:54 +01:00
Sebastian Zarnekow
0db28cc4c2 Add output folders to build.properties 2019-11-18 08:42:38 +01:00
Sebastian Zarnekow
e814a7d8dd Fixed build.properties, fixed a few warnings on the go 2019-11-18 08:42:38 +01:00
Sebastian Zarnekow
bbbdf68391 Added missing build.properties, fixed a couple of warnings 2019-11-18 08:42:38 +01:00
Christian Dietrich
cdfdc90a71
Merge pull request #1288 from eclipse/cd_noOldGen
removed dep to old generator
2019-11-11 12:54:54 +01:00
Christian Dietrich
d4e92def1c removed dep to old generator
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-11-09 19:51:55 +01:00
Christian Dietrich
4db3cfb87c updated jetty to latest release
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-11-08 10:52:42 +01:00
Sebastian Zarnekow
9f8aee979a [eclipse/xtext#1573] Ensure that all plugins do have a ManifestBuilder 2019-11-04 14:34:21 +01:00
Arne Deutsch
51d251b191
Merge pull request #1225 from eclipse/ade-default-java-stubs
#1223 Generate MWE2 workflow in way to generate java code.
2019-11-04 10:04:20 +01:00
Karsten Thoms
58bcb9a891
Merge pull request #1265 from eclipse/kt_issue1568
[eclipse/xtext#1568] Remove Buildship classpath container
2019-10-31 17:10:55 +01:00
Christian Dietrich
025dbc683d
Merge pull request #1264 from eclipse/cd_gradle563
[eclipse/xtext#1563] update to gradle 5.6.3
2019-10-29 17:14:45 +01:00
Christian Dietrich
1dcdbca15a [eclipse/xtext#1566] update to tycho 1.5.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-10-28 17:24:52 +01:00
Karsten Thoms
0768813c3b [eclipse/xtext#1568] Remove Buildship classpath container
These changes were automatically applied to the launch configurations on
a fresh workspace setup.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-10-28 11:27:29 +01:00
Sebastian Zarnekow
b1b444f504 [eclipse/xtext#1567] Upgrade to asm 7.2 2019-10-27 16:24:43 +01:00
Christian Dietrich
17f1432632 [eclipse/xtext#1553] update to tycho 1.5.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-10-18 15:57:19 +02:00
Christian Dietrich
22ca6f1e73 [eclipse/xtext#1563] update to gradle 5.6.3
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-10-18 07:45:03 +02:00
Christian Dietrich
bc96643168 use xtext-gradle-plugin 2.0.8
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-10-14 16:43:32 +02:00
Christian Dietrich
7f78c02aff
Merge pull request #1251 from gallandarakhneorg/files_clean_folder
[util] Fixing the behavior of the cleanFolder function in Files class.
2019-10-14 09:23:56 +02:00
Stéphane Galland
dddfe343ec [util] Fixing the behavior of the cleanFolder function in Files class.
The previous behavior does not remove the parent folder when its has no
file inside and the "deleteParentFolder" argument is true.
The behavior of the function is updated to delete the parent folder as
expected.
Additionally, the recurive algorithm is replaced by an iterative
algorithm in order to make it more robust.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
2019-10-13 14:04:42 +08:00
Christian Dietrich
3b75a71a37
Merge pull request #1242 from eclipse/ade-mergeable-manifest-linebreaks-in-names
#1120 Fix merger in case of line breaks inside identifiers.
2019-10-09 09:57:43 +02:00
Christian Dietrich
81975d3156 added xtext.logging to extra requirements (cleanup)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-10-08 19:53:06 +02:00
Christian Dietrich
cd5430f55d
Merge pull request #1254 from eclipse/cd_orbit2019-12
[eclipse/xtext#1538] use orbit 2019-12
2019-10-08 11:07:43 +02:00
Arne Deutsch
6f205d60f0 #1120 Fix merger in case of line breaks inside identifiers.
Remove superflues cancelation of creation process in case of missing
version.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-09-30 10:15:27 +02:00
Karsten Thoms
a3e52c5f37
Merge pull request #1241 from erogleva/logger-appenders-warning
Remove the "missing appenders for logger" warning when running tests with Tycho
2019-09-30 09:19:37 +02:00
erogleva
2c7db558e9 Move the target platform configuration to the parent pom's pluginManagement
Signed-off-by: erogleva <e.rogleva@mail.bg>
2019-09-30 09:57:23 +03:00
Tamas Miklossy
78254b5b83 [https://github.com/eclipse/xtext/issues/1486]
- Remove unnecessary modeling32.png file and all the references to it.
The modeling32.png file has been replaced by the xtext32.png file.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2019-09-28 15:07:48 +02:00
Christian Dietrich
fb021e21f6 [eclipse/xtext#1538] use orbit 2019-12
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-09-28 12:46:22 +02:00
Christian Dietrich
00897b1b35 [eclipse/xtext#1550] set default compliance level to 8.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-09-23 11:27:08 +02:00
Christian Dietrich
feba65d562 regenerated test languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-09-23 10:53:41 +02:00
Christian Dietrich
9e29eb0c0a [eclipse/xtext#1538] use eclipse 2019-12 in target
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-09-18 14:38:23 +02:00
erogleva
7f98497127 Add org.eclipse.xtext.logging as a dependency to tycho-surefire-plugin
Signed-off-by: erogleva <e.rogleva@mail.bg>
2019-09-10 00:16:27 +02:00
Arne Deutsch
619c028488 #1223 Generate MWE2 workflow in way to generate java code.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-09-09 10:22:48 +02:00
Christian Dietrich
74f4e3d412 [eclipse/xtext#1520] update to gradle 5.6.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-09-04 08:37:03 +02:00
Karsten
365ba15867 [releng] Set version to 2.20.0
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-09-03 15:24:30 +00:00
Sebastian Zarnekow
a9c3d2a21b Regenerated all test languages 2019-08-15 14:14:07 +02:00
Christian Dietrich
1e2242a793 [eclipse/xtext#1279] use orbit simrel alias directly
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-07-22 16:54:44 +02:00
Karsten Thoms
7da206393f
Merge pull request #1198 from eclipse/cd_bmpMaven
bumped maven plugin versions
2019-07-09 12:53:45 +02:00
Christian Dietrich
4fe27c6a0d update to jquery 3.4.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-07-09 10:56:25 +02:00
Christian Dietrich
baf9f53186 bumped maven plugin versions
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-07-09 10:07:17 +02:00
Karsten Thoms
2b14ed55de
Merge pull request #1196 from eclipse/cd_bmpShadow
bumped shadow gradle plugin
2019-07-08 10:12:16 +02:00
Karsten Thoms
adfcae5f08
Merge pull request #1195 from eclipse/cd_xtextGradle207
updated xtext gradle plugin to version 2.0.7
2019-07-08 10:10:06 +02:00
Christian Dietrich
64a4783ebc
Merge pull request #1192 from eclipse/cd_xtext_issue1432
[eclipse/xtext#1432] fixed implementation of TemporaryFolder.createTempFile
2019-07-07 08:27:46 +02:00
Christian Dietrich
c5f33aebbe bumped shadow gradle plugin
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-07-04 23:56:58 +02:00
Christian Dietrich
6ff22f56b6 updated xtext gradle plugin to version 2.0.7
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-07-04 19:36:04 +02:00
Christian Dietrich
c8e44f826f [eclipse/xtext#1432] fixed implementation of TemporaryFolder.createTempFile
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-07-01 10:48:08 +02:00
Christian Dietrich
8324181698 [eclipse/xtext#1489][wizard] update to gradle wrapper 5.5
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-06-29 15:40:26 +02:00
Christian Dietrich
0be9e537e9 [#1190] added test
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-06-27 19:27:08 +02:00
Christian Dietrich
7936218ac8 [#1190] created test lang
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-06-27 19:24:01 +02:00
Christian Dietrich
b45eca3745 fixed encoding issues
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-06-25 17:18:21 +02:00