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

643 commits

Author SHA1 Message Date
Holger Schill
fe96a20cf9 Remove IDEA since the support has been dropped. 
Signed-off-by: Holger Schill <Holger.Schill@itemis.de>
 2019-04-02 08:48:56 +02:00
Christian Dietrich
79f50cb780 [eclipse/xtext#1423] [Wizard] Update Gradle Wrapper to Version 5.3.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-28 17:56:18 +01:00
Christian Dietrich
d4e59eff93
Merge pull request #1096 from pjeanjean/master 
Unit test for #1093
 2019-03-26 23:14:34 +01:00
RhiobeT
1143b119dc Set tests to ignore 
Signed-off-by: Pierre Jeanjean <rhiobet@gmail.com>
 2019-03-26 20:38:59 +01:00
RhiobeT
bdaf4dbcfd Add unit test for eclipse/xtext-core#1093 
Signed-off-by: Pierre Jeanjean <rhiobet@gmail.com>
 2019-03-26 20:28:10 +01:00
Christian Dietrich
f8bc4f5c69 use https in target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-26 19:59:45 +01:00
Lorenzo Bettini
5de819ed4e 1087: updated CliWizardIntegrationTest expectations 
Task-Url: https://github.com/eclipse/xtext-core/issues/1087
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2019-03-22 16:22:52 +01:00
Lorenzo Bettini
0008f203e9 1087: no tycho.testArgLine --add-modules=ALL-SYSTEM in test POM 
It's already handled in the generated parent POM

Task-Url: https://github.com/eclipse/xtext-core/issues/1087
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2019-03-22 16:12:36 +01:00
Christian Dietrich
c37880f199 [eclipse/xtext#1412] build against 2019-06 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-21 12:53:51 +01:00
Christian Dietrich
7b10a1d293 fixed warnings 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-19 09:31:47 +01:00
Christian Dietrich
0e7f803e2b [#1077] update to gson 2.8.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-14 21:36:09 +01:00
Christian Dietrich
cd1137eee3 [#1066] get rid of org.eclipse.xtext.ecore.EcoreSupport again 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-12 20:15:14 +01:00
Christian Dietrich
8e274f3daf
Merge pull request #1037 from eclipse/cd_bug544435 
[544435] fixed issue with serializer and groups in non terminal rules
 2019-03-08 09:01:27 +01:00
Christian Dietrich
d482c3ad8a use orbit 2019-06 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-06 20:35:59 +01:00
Christian Dietrich
48ac48df2b [544435] fixed issue with serializer and groups in non terminal rules 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-06 09:30:06 +01:00
Christian Dietrich
9b38d565e0 [eclipse/xtext-core#1059] updated to lsp4j 0.7.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-05 20:09:10 +01:00
Christian Dietrich
f8708cefd5 [eclipse/xtext#1414] prepared master for version 2.18.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-05 16:47:14 +01:00
Sebastian Zarnekow
6e242384cb
Merge pull request #1052 from eclipse/sz_fixInjectorProvider 
[xtext-xtend#734] Make injection of the CompositeEValidator work
 2019-03-02 14:15:51 +01:00
Christian Dietrich
4982e56d33 [#1053] Wizard: Bump Xtext-Gradle-Plugin to latest (2.0.4) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-02 10:36:47 +01:00
Sebastian Zarnekow
edeb506431 Make injection of the CompositeEValidator work 2019-02-26 18:29:10 +01:00
Eva Poell
673a7ee1d8 [#1034] Added Validation that entry rule is not a fragment 
Signed-off-by: Eva Poell <epoell@itemis.com>
 2019-02-19 09:01:42 +01:00
Arne Deutsch
415beaeb80 [#1038] Filter bad entries when read in MANIFEST. 
Filter all entries from "Require-Bundle", "Export-Package" and
"Import-Package" entries that are empty to fix manifest files that are
invalid in this regard.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-18 12:37:36 +01:00
Christian Dietrich
2e9195b994
Merge pull request #1025 from eclipse/cd_gradle521 
[eclipse/xtext#1393] update to gradle 5.2.1
 2019-02-14 19:18:20 +01:00
Karsten Thoms
7823e915a9
Merge pull request #1028 from eclipse/cd_mwe210wizard 
[eclipse/xtext#1283] switched to MWE 2.10 in wizard
 2019-02-13 15:05:30 +01:00
Arne Deutsch
86f6342354
Merge pull request #1027 from eclipse/ade-mergable-manifest-xtend 
#1018 Maintain existing formatting.
 2019-02-12 09:46:32 +01:00
Karsten Thoms
bf0546ba3b isAssignableFrom: check both args for null & identity 
Added covering test case

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-11 21:08:32 +01:00
Christian Dietrich
1587bcb542 [eclipse/xtext#1283] switched to MWE 2.10 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-11 09:17:58 +01:00
Sebastian Zarnekow
09c3ceac85 Make bin/main also the default output directory to avoid buildship confusion 2019-02-10 14:55:03 +01:00
Christian Dietrich
cef06991c2 [eclipse/xtext#1393][Wizard] update to gradle 5.2.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-09 11:47:11 +01:00
Karsten Thoms
98a17c35da [eclipse/xtext#1274] Updated .classpath by Gradle 
Changes done by Buildship 3.0.1.v20181217-1554

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-07 17:03:45 +01:00
Arne Deutsch
8d34e55e11 #1018 Maintain existing formatting. 
To avoid reformatting we maintain the separators (e.g. line breaks) with
the entries (e.g. inside the required bundles entry).

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-07 12:23:49 +01:00
Sebastian Zarnekow
4ca8b7e08f Updated test expectation 2019-02-05 23:55:07 +01:00
Sebastian Zarnekow
c1c208e971 Regenerate test langs 2019-02-05 14:20:02 +01:00
Karsten Thoms
929b393e75 [#985] Make exception handling for validation code customizable 
Added AbstractDeclarativeValidator#handleExceptionDuringValidation to
allow overriding of the default exception handling behavior. Clients
especially may want to propagate or handle NPEs more decent than just
swallowing it.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-05 10:04:34 +01:00
Christian Dietrich
175d7bc975 set minimal mwe version to the one from oxygen 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-01 10:39:20 +01:00
Christian Dietrich
63e99b9e11 [eclipse/xtext#1283] update to MWE 2.10 M2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-30 07:07:46 +01:00
Karsten Thoms
3017efb3f6 [#1009] Remove managed dependencies from build descriptors 
- removed managed versions of
  - org.eclipse.emf.mwe2.launch
  - xtext-antlr-generator
  - org.junit:junit
  - org.junit.jupiter.api
  - xtext-dev-bom
- updated test expectation
- GradleBuildFile: Use single quoted dependencies for managed
dependencies (where version is null)
- added xtext-antlr-generator as optional dependency to Maven runtime
module. This avoids download of antlr-generator-3.2.0-patch.jar from
itemis server.
- XtextVersion: pin xtext-antlr-version to 2.1.1. Still needed for Tycho
based build for configuration of exec-maven-plugin.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-29 15:33:09 +01:00
Christian Dietrich
e654364f73 [eclipse/xtext#1182] added support for java 11 as target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-22 21:55:07 +01:00
Christian Dietrich
d649ead3c8 fixed guava deprecations 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-20 12:20:42 +01:00
Christian Dietrich
a9ffe46cd6
Merge pull request #987 from eclipse/cd_xtext_issue1372 
[eclipse/xtext#1372] Use 2019-03 in target platforms
 2019-01-18 17:16:26 +01:00
Holger Schill
771eb06607 Update WebFragment, Wizard and tests to use latest versions of web frameworks 2019-01-17 11:03:38 +01:00
Karsten Thoms
501571bd3c [eclipse/xtext-core#991, eclipse/xtext#1249] Update test expectation 
Native usage of Maven BOM
Drop generation of maven-deployment.gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 15:09:18 +01:00
Karsten Thoms
c5687f17bb [eclipse/xtext-core#991] Dropped generation of maven-deployment.gradle 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 13:59:12 +01:00
Christian Dietrich
393b63928a [eclipse/xtext#1372] Use 2019-03 in target platforms 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-13 10:54:04 +01:00
Sebastian Zarnekow
ecc7ae0bc3
[eclipse/xtext#1249] use bom for version management (#988) 2019-01-11 16:41:50 +01:00
Christian Dietrich
f21f2dcf63
Merge pull request #972 from eclipse/cd_gradle50 
[eclipse/xtext#1350] Update to Gradle 5
 2018-12-07 09:23:31 +01:00
Christian Dietrich
daeb98019b [eclipse/xtext#1350][Wizard] update to gradle 5.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-06 15:43:08 +01:00
Christian Dietrich
658fb9683d switched to orbit 2019-03 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-06 15:11:28 +01:00
Christian Dietrich
1b4f6c78a4 change version 2.16.0 -> 2.17.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-05 09:48:47 +01:00
Christian Dietrich
61144af965 switched to tycho 1.3 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-30 12:00:43 +01:00
Christian Dietrich
3aca7cb1fa [#893] switch to lsp4j 0.6.0 final 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-29 11:04:39 +01:00
Dennis Huebner
9a2696a017 Fixed typo 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-11-21 13:21:05 +01:00
Dennis Huebner
e0ab9c11a3 Update copyright 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-11-21 12:14:31 +01:00
Dennis Huebner
28d7c94ed5 [trace] Improved implementation for GeneratorNodeProcessor.Context 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-11-21 11:48:19 +01:00
Arne Deutsch
a911cd76bb
Merge pull request #956 from eclipse/xtext-core-953-mergeable-manifest-regression 
#953: Support setting of entries with attributes.
 2018-11-20 09:10:48 +01:00
Arne Deutsch
66fd1cabbc #953: Support setting of entries with attributes. 
- Added test cases to cover setting of entries that have other
attributes then version alone.
- Fix MergeableManifest to support given test cases.
- Refactor existing test cases a bit to avoid uneccessary
"Collections.singleton"

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-11-19 11:38:29 +01:00
Karsten Thoms
37172c68dd [eclipse/xtext#1168] Minimal target platform Oxygen.3a 
Update lower bound version constraints on platform related bundles with
versions from an Oxygen.3a platform.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-11-14 17:27:50 +01:00
Christian Dietrich
85385aa97a [#893] build against LSP4J 0.6.0-SNAPSHOT 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-10 12:16:05 +01:00
Sebastian Zarnekow
e8850a77ec Cleanup some warnings 2018-11-09 15:59:28 +01:00
Sebastian Zarnekow
4becf88f20 Remove unused import 2018-11-09 11:24:02 +01:00
Sebastian Zarnekow
65371722ba Minor improvements to isHex 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
a52be8be46 New test to illustrate regression 2018-11-09 11:14:31 +01:00
Christian Dietrich
e4f8ff8047 [#946] Fixed broken class splitting with enum rules 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-07 16:32:29 +01:00
Christian Dietrich
7db9244008
Merge pull request #932 from eclipse/cd_issue844 
Performance Fix Cyclic Link Detection
 2018-11-07 15:43:19 +01:00
Christian Dietrich
de22eee3d9
Merge pull request #934 from eclipse/cdTestJava11 
[eclipse/xtext#1182] fixed tests with java 11 agains java 8 target
 2018-11-06 19:41:28 +01:00
Christian Dietrich
5c8901019c [#935] workaround for surefirebug on latest ubuntu/debian/mint 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-06 15:35:22 +01:00
Christian Dietrich
0e88e15442 [eclipse/xtext#1182] fixed tests with java 11 agains java 8 target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-06 13:41:19 +01:00
Sebastian Zarnekow
8a8ce2c8f6 Adjustments to test case 2018-11-05 11:51:53 +01:00
Christian Dietrich
b75cdd0970 [#844] Performance optimization for lazy linking cycle detection 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-05 11:51:53 +01:00
Christian Dietrich
8cb8ec4af2 [eclipse/xtext#1318] fixed broken mvn clean plugin configuration 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-05 11:46:51 +01:00
Christian Dietrich
6984ae7a57
Merge pull request #928 from eclipse/cd_asm7 
[eclipse/xtext#1325] switch to ASM 7
 2018-10-31 15:20:49 +01:00
Christian Dietrich
9515372b39 [eclipse/xtext#1325] switch to ASM 7 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-31 12:51:25 +01:00
Christian Dietrich
fb271c39a0 Updated xtext-gradle-plugin to 2.0.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-30 13:59:29 +01:00
Christian Dietrich
89a71531b8 [eclipse/xtext-core#903] build against 2018-12 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-26 10:21:54 +02:00
Arne Deutsch
b9ae2ea296 #918: Integration MANIFEST.MF from classpath test 
Add a test that scans the classpath and reads/writes all found
MANIFEST.MF files.
Fix line endings in test for linux.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-10-22 09:24:39 +02:00
Arne Deutsch
4c983ade43 #918: Fix MergeableManifest2 and add missing unit tests 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-10-19 14:02:39 +02:00
Arne Deutsch
5e5dc014eb #864: Rewrite MergeableManifest to MergeableManifest2 to avoid refl. 
Adding extensive unit tests to ensure behavior does not change.
Use only MergeableManifest2 internally.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-10-17 16:48:32 +02:00
Christian Dietrich
b5bc979dfc [eclipse/xtext#1280] updated version of shadow jar plugin to prepare move to gradle 5.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-11 19:55:47 +02:00
Christian Dietrich
199c99c20d
Merge pull request #902 from eclipse/cd_orbit_2018-12-M1 
updated to orbit 2018-12-M1
 2018-10-11 13:00:36 +02:00
Karsten Thoms
0b29a6af07
Merge pull request #901 from eclipse/kth_issue1311 
[eclipse/xtext-1311] Perform KeywordHelperTest with ISO encoding
 2018-10-11 11:42:04 +02:00
Christian Dietrich
7b7161e608 updated to orbit 2018-12-M1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-11 11:27:34 +02:00
Karsten Thoms
cb51878c7d [eclipse/xtext-1311] Perform KeywordHelperTest with ISO encoding 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-10-11 09:20:07 +02:00
Karsten Thoms
af457b54dd
Merge pull request #886 from eclipse/bug539677 
[539677] getValue should return null for null arg
 2018-10-10 17:30:19 +02:00
Christian Dietrich
11572cb5a8 [eclipse/xtext#1300][Wizard] Update to Gradle Wrapper 4.10.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-06 17:53:26 +02:00
Karsten Thoms
bb85fe78c5 [539677] getValue should return null for null arg 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-10-01 10:34:24 +02:00
Karsten Thoms
32b9c2d5c9
Merge pull request #877 from eclipse/kth_JavaVersionTest 
Testing more methods from JavaVersion
 2018-09-23 15:16:05 +02:00
Karsten Thoms
2b7e2b4609 [eclipse/xtext#1272] Compile with Xtend 2.15 
Order of static & final modifiers changed
(eclipse/xtext-xtend#554)

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-21 17:45:41 +02:00
Karsten Thoms
3eca192009 Testing more methods from JavaVersion 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-21 06:49:06 +02:00
Sebastian Zarnekow
ac40983dc2 Removed copied code from Strings.java 2018-09-15 21:28:31 +02:00
Christian Dietrich
1648a02a24 [eclipse/xtext#1297] update to gradle 4.10 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-11 11:33:14 +02:00
Christian Dietrich
cc2c4fbc54 restored old state for MergableManifest 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-11 10:27:01 +02:00
Christian Dietrich
93e3e31da5
Merge pull request #855 from eclipse/cd_xtext216 
updated versions to 2.16.0
 2018-09-05 07:03:24 +02:00
Christian Dietrich
2f0f093fb5 updated versions to 2.16.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-03 11:11:51 +02:00
Christian Dietrich
eaa542d6c1 [#793] update to lsp4j 0.5.0 final 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-02 10:30:23 +02:00
Karsten Thoms
f76bebc29d [#849] Make CliProjectsCreator executable 
- Added args4j as CLI framework
- Added CliProjectsCreatorMain and test
- Create WizardConfiguration from options
- Added args4j handlers for enum option
- Manage args4j version

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-08-30 17:33:10 +02:00
Christian Dietrich
7a4c79e2bf
Merge pull request #847 from eclipse/waqasilyas-wi_issue525 
Fix for #525: Detect incomplete escape sequences
 2018-08-29 18:55:57 +02:00
Holger Schill
416db12fe1
Merge pull request #815 from kittaakos/GH-812 
GH-812: Implemented the semantic highlighting for the Xtext LS.
 2018-08-29 17:23:09 +02:00
Sebastian Zarnekow
f4f7607975 Refined solution to better match the other value converter messages 2018-08-29 17:10:59 +02:00
Sebastian Zarnekow
c9f659bf92 Merge branch 'wi_issue525' of git://github.com/waqasilyas/xtext-core into waqasilyas-wi_issue525 2018-08-29 17:06:44 +02:00
Christian Dietrich
1639c0a2b0
Merge pull request #839 from eclipse/cd_issue1266_asm62 
[eclipse/xtext#1266] Update to ASM 6.2
 2018-08-29 14:38:30 +02:00
Christian Dietrich
a2250de55e [eclipse/xtext#1266] Update to ASM 6.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-29 14:37:03 +02:00
Akos Kitta
136e66dd47 GH-812: Implemented the semantic highlighting for the Xtext LS. 
Closes #812.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
 2018-08-29 12:42:06 +02:00
Holger Schill
bd0f23efcc ValidatorFragment2 generates an overridden version of addComboBox for Xbase languages #771 
Signed-off-by: Holger Schill <Holger.Schill@itemis.de>
 2018-08-28 12:24:47 +02:00
Christian Dietrich
c9cdfcc4fb
Merge pull request #830 from eclipse/cd_issue829 
[eclipse/xtext-core#829] Update to Gradle Wrapper 4.9
 2018-08-27 16:12:04 +02:00
Christian Dietrich
523f467e53
Merge pull request #831 from eclipse/cd_issue828 
[eclipse/xtext-core#828] Use the newest version of xtext-gradle-plugin: 2.0.1
 2018-08-24 15:25:20 +02:00
Christian Dietrich
6171ebda4e
Merge pull request #836 from eclipse/cd_regenTestLangs 
[eclipse/xtext#1227] regenerated testlanguages
 2018-08-24 11:04:06 +02:00
Christian Dietrich
cf4065ab27 [eclipse/xtext#1227] regenerated testlanguages 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-24 10:39:56 +02:00
Christian Dietrich
f569a370b4 [#834] Fixed GenerateTestLanguages 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-24 10:34:11 +02:00
Christian Dietrich
78417bcd38
Merge pull request #833 from eclipse/cd_issue824 
[eclipse/xtext-core#824] Don't generate xpand dependency if not needed
 2018-08-24 10:05:54 +02:00
Christian Dietrich
a41d7aee07 [eclipse/xtext-core#824] Don't generate xpand dependency if not needed 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-24 09:49:40 +02:00
Tamas Miklossy
fcf4a71612 Fixing typo: 'corresponsing' -> 'corresponding' 
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2018-08-24 08:39:43 +02:00
Christian Dietrich
543560cfa6 [eclipse/xtext-core#828] Use the newest version of xtext-gradle-plugin: 2.0.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-23 21:49:19 +02:00
Christian Dietrich
38f976c91f [eclipse/xtext-core#829] Update to Gradle Wrapper 4.9 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-23 21:43:50 +02:00
Holger Schill
417b8e6d7f
Merge pull request #826 from eclipse/hs/issue825 
ConfigurableIssueCodesProvider generated #825
 2018-08-23 11:47:56 +02:00
Holger Schill
5045659ddd Fix failing test CliWizardIntegrationTest 2018-08-23 07:08:12 +02:00
Holger Schill
f379c56a25 ConfigurableIssueCodesProvider generated even when no grammar annotations are used #825 2018-08-22 16:39:23 +02:00
Christian Dietrich
5a04ecff5c [eclipse/xtext-core#822] use 2018-09 in target platform 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-21 21:57:11 +02:00
Christian Dietrich
abf92b6776 [#804] Added EOF to keyword escape list 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-07-26 17:49:57 +02:00
Christian Dietrich
a897ee5e54 regenerated against latest xtend 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-07-18 19:30:53 +02:00
Arne Deutsch
d8ab5d2b4c Merge branch 'master' of git@github.com:eclipse/xtext-core.git into xtext-eclipse-677-test-source-folders 2018-06-25 11:52:25 +02:00
Arne Deutsch
99745c0af6 [eclipse/xtext-eclipse#677] Additional source folder support. 
- Support output folders per source fodler
- Support test source folder

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-06-25 11:48:04 +02:00
Christian Dietrich
88f04cf991 updated orbit to photon release 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-06-19 11:50:26 +02:00
Christian Dietrich
3a4cf05981
Merge pull request #761 from arshad1990/Issue#758 
Switched to Tycho 1.2.0 in the wizard project. Fixed test cases.
 2018-06-05 17:57:55 +02:00
Titouan Vervack
a61a7b3a19 Fixed compile errors for #763 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-05 17:54:53 +02:00
Christian Dietrich
a3d6588be6
Merge pull request #763 from tivervac/taskEquals 
Added equals to Task and TaskTag making TaskAssert useless
 2018-06-05 16:20:41 +02:00
Arshad
75835e5295 Switched to Tycho 1.2.0 in the wizard project. Fixed test cases. 
Signed-off-by: Arshad <a.adavani@itemis.com>
 2018-06-05 10:42:54 +02:00
Titouan Vervack
08d59c6e4d Added equals to Task and TaskTag making TaskAssert useless 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-04 18:46:03 +02:00
Karsten Thoms
aaa184f1da [#715] Remove test_getCurrent 
This test case was removed since it failed for non-snapshot versions
within a Gradle build. This is typically the case when doing a release.
It was decided to remove this test case.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-29 09:05:52 +02:00
Karsten Thoms
24ce555b09
Merge pull request #751 from ArneDeutsch/xtext-core-506 
[#506] Removed reflection call.
 2018-05-28 12:56:52 +02:00
Arne Deutsch
8e93dbbda4 [#506] Removed reflection call. 
Do not inherit and modify (by reflection) the original
java.util.jar.Manifest but instead C&P and modify the code. Adapt
ManifestMergerTest by importing the new classes.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-05-28 10:54:21 +02:00
Karsten Thoms
d627e9aad4
Merge pull request #754 from eclipse/develop_2.15.0 
[release] Increment version to 2.15.0
 2018-05-26 10:37:56 +02:00
Titouan Vervack
e91be2aee3 Fixed duplicate key insertion with task tags 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-05-24 18:29:38 +02:00
Karsten Thoms
7dcc65bb2e [release] Increment version to 2.15.0 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-22 23:53:44 +02:00
Karsten Thoms
0d89588412 [#741] Update test expectation 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-18 09:42:21 +02:00
Karsten Thoms
96e1631e6f [#732] Updated test expectation 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-08 23:31:18 +02:00
Christian Dietrich
73dbf094e0 use tycho 1.2.0 in the wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-08 11:36:30 +02:00
Christian Dietrich
aaf4037856 [eclipse/xtext-web#53] updated to a newer jetty version that works better with asm 6.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-04 16:14:54 +02:00
Christian Dietrich
205bafd544 [eclipse/xtext#1177] Switched Target Platform to Photon for Tycho Builds with Java 10 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-04 08:50:42 +02:00
Christian Dietrich
d2134214a6 [#724] fixed compile errors with non xbase languages 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-03 06:49:22 +02:00
Holger Schill
12008dfed5 Finding from CodeReview in https://github.com/eclipse/xtext-core/pull/723 2018-05-02 14:53:32 +02:00
Holger Schill
eb2b0f77b2 Tests for https://github.com/eclipse/xtext-core/issues/722 2018-05-02 14:22:14 +02:00
Christian Dietrich
3dbf100102
Merge pull request #718 from eclipse/cd_issue716 
[#716] [LSP] Problems for a deleted file are shown after deletion
 2018-04-26 16:08:39 +02:00
Christian Dietrich
4e99055a9d [#714] consume lsp4j 0.4.0 final 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-26 08:36:01 +02:00
Christian Dietrich
be7a958127 [#716] [LSP] Problems for a deleted file are shown after deletion 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-25 14:29:38 +02:00
Christian Dietrich
f66c0128af use lsp4j 0.4.0-SNAPSHOT as workaround for #705 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-20 16:18:13 +02:00
Christian Dietrich
b097f9d159 set tycho version to 1.2.0-SNAPSHOT & added mechanism to handle snapshot and non snapshot versions in the wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-18 19:35:40 +02:00
Christian Dietrich
f0ccaed480 updated asm to asm 6.1.1 
updated jdt to Oxygen 3a
adjusted pipelines

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-17 12:27:49 +02:00
Arne Deutsch
ec683f723c [eclipse/xtext#1177] Adapt JavaVersion to support Java 10. 
This allows e.g. the selection of Java 10 in the new xtext project
wizard.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-12 15:13:20 +02:00
Arne Deutsch
179757480d [eclipse/xtext-core#686] Update new project wizard. 
Remove IDEA from the new project wizard. IDE plugins are not well
maintained any more, no need to bother new users with not working stuff.

Set version of xtext-gradle-plugin to 1.0.21.

Update test projects according to removed IDEA support.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-09 15:19:01 +02:00
Alex Tugarev
fa8e8b2b26 fix error in ValidatorFragment2 
Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
 2018-04-04 11:30:45 +02:00
Alex Tugarev
d81b59d636 [validation] fix generation of issue code provider 
use grammar info instead of `MyDsl`.

cf. https://github.com/eclipse/xtext-core/pull/680

Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
 2018-04-03 08:39:14 +02:00
Tamas Miklossy
063dcdcfd4 [NONE] Fix Typo in AbstractGeneratorFragmentTests.xtend file. 
- Avoid double assignment of the globalStateMemento field.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2018-03-30 13:00:21 +02:00
Christian Dietrich
6e23809dee reduced warnings 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-03-29 14:36:26 +02:00
Holger Schill
e75a44c254
Merge pull request #680 from eclipse/hs/ValidationFragment2_configurableIssue 
Hs/validation fragment2 configurable issue
 2018-03-29 13:12:15 +02:00
Holger Schill
2e99cff76d #664 [Grammar] Add Support for more Annotations 
Signed-off-by: Holger Schill <Holger.Schill@itemis.de>
 2018-03-29 11:14:39 +02:00
Christian Dietrich
76053c6136
Merge pull request #678 from miklossy/master 
[479833] Formatter2Fragment2 stub improvements.
 2018-03-28 19:01:43 +02:00
Holger Schill
c2ccc54ca3 Add Tests for ValidationFragment2 and @Deprecate annotation 2018-03-28 18:10:22 +02:00
Holger Schill
026df8e630 Make multiple annotations on enum rule possible 
Add validations to see if Annotation works on the rule in the grammar
Add configurable issue for @Deprecate Annotation
 2018-03-28 18:03:29 +02:00
Titouan Vervack
127fa42d17 Removed redundant modifiers 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-28 17:41:41 +02:00
Tamas Miklossy
ac7215e80c [479833] Formatter2Fragment2 stub improvements. 
- Make the generated Formatter.xtend stub more concise by eliminating
unnecessary semicolons, by eliminating explicit type before the for loop
variable and by using the EReference feature name (instead of its getter
accessor name) in the for loop collection.
- Refactor the Formatter2Fragment2 class to make it more testable.
- Modify the AbstractGeneratorFragmentTests to set the resourceSet into
the used StandardLanguage (needed by the Formatter2Fragment2).
- Implement corresponding Formatter2Fragment2 test cases.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2018-03-28 13:05:17 +02:00
Christian Dietrich
f6d1727f98 Removed unused imports 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-03-26 19:39:20 +02:00
Holger Schill
3c4601363e Make use of JavaFileAccess to get better results to compare. 2018-03-26 18:25:04 +02:00
Holger Schill
5e9889ce92 Register XMLTypePackage explicitly in setup 2018-03-26 17:23:41 +02:00
Holger Schill
8ab08f8792 Make use of GlobalStateMemento 2018-03-26 17:07:15 +02:00
Holger Schill
6a0c83ed40 Remove XMLNamespacePackage from org.eclipse.xtext.xtext.generator.AbstractGeneratorFragmentTests.FakeEMFGeneratorFragment2.getReferencedEPackages(List<EPackage>) 2018-03-26 16:50:52 +02:00
Holger Schill
0e93f81c2d Work with GenModel without pollution the environment with globals 2018-03-26 16:31:17 +02:00
Holger Schill
47effb3ff1 Allow multiple annotations on Terminal but restrict it to a well defined set. 2018-03-26 16:15:53 +02:00
Holger Schill
d6f4ecc4c1 Enable ecore only for FragmentTests 2018-03-26 15:39:48 +02:00
Holger Schill
59b8642d93 Use exists instead of Java 8 syntax in Fragments. 
Reenable Fragment tests -> Last build ran green without those tests.
Try with approach to not load XMLPackage Class
 2018-03-26 15:24:49 +02:00
Holger Schill
cb1b9ef32c Adjust @since tag 
Disable GeneratorFragmentTests again since an NPE happens on the CI and we want to find out if this is the cause for the other tests to fail.
 2018-03-26 15:12:34 +02:00
Holger Schill
893a6ed207 Make tests run again 2018-03-26 14:45:59 +02:00
Holger Schill
9641e3b52c Bypass resolution of all crossRefs for FragmentTests. 
Reenable all Fragmenttests
 2018-03-26 13:34:06 +02:00
Holger Schill
66c27998e8 Ignore Fragment-tests to see if the server behaves different for CI now. 
This is a temporally state
 2018-03-26 13:24:32 +02:00
Holger Schill
70886d54a5 Make ResourceDesecriptionStrategyFragment and ValidationFragment more configurable 2018-03-26 12:40:19 +02:00
Holger Schill
d377312850 Merge branch 'master' into hs/664_grammarannotations 2018-03-26 11:19:49 +02:00
Holger Schill
047b035d55 Apply changes from review comments from 23.3 2018-03-26 10:46:20 +02:00
Florian Stolte
73677dccb3 Fixed a test that did not work on windows due to line ending issues 
Signed-off-by: Florian Stolte <fstolte@gmx.de>
 2018-03-23 11:21:06 +01:00
Holger Schill
8893b09e57 GrammarAnnotations: @Deprecated Annotation and corresponding tests 2018-03-22 14:40:23 +01:00
Holger Schill
fafdce378e Merge branch 'master' into grammarannotations 2018-03-22 11:17:31 +01:00
Holger Schill
f995ce41ec Refactor names of generated Classes of ResourceDescriptionStrategyFragment 2018-03-22 11:12:43 +01:00
Holger Schill
a25e761971 Grammarannotations - Exported annotation and corresponding Fragment incl. tests 2018-03-22 09:02:27 +01:00
Sebastian Zarnekow
7da28520af
Merge pull request #663 from eclipse/sz/bug361216 
[361216] Improved logic that registers scope wrappers
 2018-03-21 18:48:14 +01:00
Sebastian Zarnekow
a46f701920 Incorporated review feedback 2018-03-21 17:23:28 +01:00
Sebastian Zarnekow
9adf2d94ed [361216] Improved logic that registeres scope wrappers 2018-03-21 17:13:06 +01:00
Arne Deutsch
e90230f1b1 [#476] Support EMF's ResourceLocators in XtextResourceSet. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-03-21 15:40:22 +01:00
Holger Schill
04e0375fec Introduce Final Annotation on ParserRules and corresponding test 2018-03-20 16:57:28 +01:00
Christian Dietrich
2d8c00c5cc Updated to Gradle Wrapper Version 4.6 
https://github.com/eclipse/xtext/issues/1177

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-03-09 17:31:43 +01:00
Karsten Thoms
4fea27469a
Merge pull request #651 from eclipse/kth_qn_startwith_null 
startsWith: return false for null argument
 2018-03-05 14:36:29 +01:00
Karsten Thoms
2e534b5246 startsWith: check that prefix is not null 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-03-05 11:41:44 +01:00
Moritz Eysholdt
43b7d1df8c Handle comments and whitespace properly in rewrite scenarios 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-03-04 19:41:46 +01:00
Christian Dietrich
58113d0f41 Regenerated against lastest xbase-lib 
https://github.com/eclipse/xtext/issues/1174

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-02-26 15:07:09 +01:00
Karsten Thoms
d1ee1b9857
Merge pull request #601 from eclipse/cd_issue596 
[#596] updated tycho version to 1.1.0 to support java 9 in tycho builds as well
 2018-02-02 23:39:07 +01:00
Karsten Thoms
6ede291fbf
Merge pull request #628 from eclipse/kth_issue627 
[#627] Compute Xtext version from Bundle-Version
 2018-02-02 14:11:55 +01:00
Karsten Thoms
266c673d87 [#627] Compute Xtext version from Bundle-Version 
Reads the version from the 'Maven-Version'
attribute from org.eclipse.xtext.util manifest. It has a static value
of 'unspecified' and gets replaced in a Gradle build.
In devmode the value is not replaced, but the right version can be
computed from the Bundle-Version attribute.

Change-Id: I5b5028ca35c04e4708a07b0c0544dce20810d273
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-02-02 09:16:51 +01:00
Christian Dietrich
f66e355058 [#596] updated tycho version to 1.1.0 to support java 9 in tycho builds as well 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-30 16:13:54 +01:00
Karsten Thoms
22c2c4c98f [#623] Update wizard expectations 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-30 12:07:17 +01:00
Karsten Thoms
809377cd27 [420984] Compiler optimization: Suppress creation of unused exception variable 
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-16 14:54:22 +01:00
Karsten Thoms
8d0268e386
Merge pull request #619 from eclipse/kth_issue1160 
[eclipse/xtext#1160] Update copyright date range
 2018-01-16 11:00:31 +01:00
Lorenzo Bettini
1514fd8f43
Merge pull request #612 from eclipse/lb/generated-maven-pom 
Lb/generated maven pom
 2018-01-16 09:52:00 +01:00
Karsten Thoms
a61200a0cd [eclipse/xtext#1160] Fixed test expectation 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-16 09:15:34 +01:00