Commit graph

373 commits

Author SHA1 Message Date
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