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
6438 commits 41 branches 98 tags 41 MiB
Commit graph

6438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian Dietrich
85f3a05f3d
Merge pull request #703 from eclipse/java-10-integration 
Java 10 integration
 2018-04-20 11:33:24 +02:00
Christian Dietrich
dfc8861cd7 readjusted pipelines 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-20 09:56:53 +02:00
Christian Dietrich
c39b272c09
Merge pull request #701 from eclipse/msp_issue694 
Updated to LSP4J 0.4.0
 2018-04-20 09:29:38 +02:00
Miro Spönemann
bf6a61a7e2 #694: Updated to LSP4J 0.4.0 (snapshot) 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2018-04-19 15:32:40 +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
Karsten Thoms
17616407db
Merge pull request #670 from eclipse/kth_issue666_junit5 
[#666] JUnit 5 support
 2018-04-17 17:05:31 +02:00
Karsten Thoms
9007644a30 [eclipse/xtext#1177] Merge branch arnedeutsch/java-10-support 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-04-17 17:03:38 +02:00
Karsten Thoms
f71678b2bd [#666] JUnit 5 Support 
Refactored common code of XtextRunnerTest and InjectionExtensionTest
into an abstract base class.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-04-17 16:26:56 +02:00
Karsten Thoms
875e62c901 [#666] JUnit 5 Support 
- implemented review comments
- adding JUnitVersion.DEFAULT
- added missing copyright headers for JUnitFragment and Junit4Fragment2
- changed lower bound for org.junit.jupiter.api.extension to 5.1.0

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-04-17 12:49:57 +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
Karsten Thoms
07d8819429 [eclipse/xtext#1177] Merge arnedeutsch/java-10-support 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-04-17 09:18:54 +02:00
Arne Deutsch
693c7e420c [eclipse/xtext#1177] Update ASM to 6.1.1 and JDT Core to 3.13.102. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-17 07:37:44 +02:00
Christian Dietrich
746582a1a7 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-16 20:06:46 +02:00
Karsten Thoms
3999e54b89 [#666] Extend Xtext Generator for JUnit 5 
- Added enum JUnitVersion
- Create JUnitFragment from Junit4Fragment2
  - provide setter for JUnit version
  - Deprecated Junit4Fragment2 and extend from JUnitFragment
  - changed StandardLanguage#junitSupport type to JUnitFragment
- Extended JUnitFragment to produce JUnit version specific code
- Added junitVersion property to WizardConfiguration
- generate JUnit 5 specific configuration to workflow when JUnit 5 is
configured
- TestProjectDescriptor: Configure JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-04-16 13:27:43 +02:00
Titouan Vervack
b8c37767d5 Added wildcard extends 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-04-16 11:05:31 +02:00
Karsten Thoms
e10de81431 [#666] JUnit 5 support 
- provide new InjectionExtension as replacement for XtextRunner
- added unit test for InjectionExtension
- added JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-04-15 10:40:47 +02:00
Christian Dietrich
f8ce0075be
Merge pull request #699 from ArneDeutsch/java-10-support 
[eclipse/xtext#1177] Adapt JavaVersion to support Java 10.
 2018-04-12 19:36:39 +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
Moritz Eysholdt
c6a3bd20cb [ChangeSerializer] fixed potential NPEs 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-04-11 17:30:09 +02:00
Arne Deutsch
f826570410 [eclipse/xtext-eclipse#599] Support waiting operation. 
ActiveAnnotationProcessors might run in parallel. Read operations should
wait until all write operations are ready to avoid race conditions.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-11 13:39:59 +02:00
Christian Dietrich
a68ee345df
Merge pull request #695 from ArneDeutsch/xtext-eclipse-599 
[eclipse/xtext-eclipse#599] Fix review findings.
 2018-04-11 11:23:10 +02:00
Arne Deutsch
c98df4f7bc [eclipse/xtext-eclipse#599] Fix review findings. 
Change field names to 'projectWizard' and 'fileWizard'.

Document MWE entities.

Deprecate SimpleProjectWizardFragment2.

Add @Beta annotations.

Update copyright comments.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-11 10:17:36 +02:00
Christian Dietrich
0937007ba9
Merge pull request #691 from ArneDeutsch/xtext-eclipse-599 
Xtext eclipse 599
 2018-04-10 09:10:43 +02:00
Christian Dietrich
fbd3d85a55
Merge pull request #693 from ArneDeutsch/xtext-core-686 
[eclipse/xtext-core#686] Update new project wizard.
 2018-04-09 15:33:40 +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
Moritz Eysholdt
5804e8b6bc Fix eclipse/xtext-xtend#408: Allow mismatching node model 
Because quick fixes change the model and can cause any kind of mismatch

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-04-05 17:10:21 +02:00
Arne Deutsch
503e1c7843 Merge branch 'master' of git@github.com:eclipse/xtext-core.git into xtext-eclipse-599 2018-04-04 14:20:34 +02:00
Arne Deutsch
b92affb486 [eclipse/xtext-eclipse#599] Adding fragment for new file wizard. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-04 14:16:36 +02:00
Christian Dietrich
6d9b64646e
Merge pull request #690 from AlexTugarev/at/fix-ValidatorFragment2 
[validation] fix error in ValidatorFragment2
 2018-04-04 11:51:10 +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
Holger Schill
1f17d49554
Merge pull request #688 from AlexTugarev/at/fix-issue-code-provider 
[validation] fix generation of issue code provider
Thanks Alex
 2018-04-03 10:06:43 +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
Christian Dietrich
20d549f870
Merge pull request #684 from miklossy/master 
[NONE] Fix Typo in AbstractGeneratorFragmentTests.xtend file.
 2018-03-30 13:13:22 +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
e2abd056e8
Merge pull request #683 from tivervac/guava_throwables_throw_kw 
Added throw keyword to Throwables.propagate
 2018-03-30 12:33:05 +02:00
Titouan Vervack
4f702ddc7a Added throw keyword to Throwables.propagate 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-30 11:58:41 +02:00
Christian Dietrich
879016d8cb
Merge pull request #681 from tivervac/warnings 
Fixed warnings
 2018-03-29 18:27:38 +02:00
Titouan Vervack
57af220521 Fixed guava compatibility issue 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-29 18:26:41 +02:00
Titouan Vervack
0ea85189c8 Fixed warnings 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-29 18:18:18 +02:00
Titouan Vervack
b76f97ad24 Added null- and exception-safe variants of (priority)readOnly and modify 
Also added I[Read|Write]Access where applicable

Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-29 17:58: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
Christian Dietrich
14fd588a2d
Merge pull request #679 from tivervac/redundant_modifier 
Removed redundant modifiers
 2018-03-28 18:57:08 +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
1f61d373c9
Merge pull request #674 from eclipse/cd_core_issue_517 
[eclipse/xtext-core#517] Moved Class File Constant Calculation to JavaVersion Enum
 2018-03-28 06:28:29 +02:00