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

6335 commits

This branch
This branch
All branches
Author SHA1 Message Date
Knut Wannheden
26821df8f3 #721: Non-roots in NodeModelBuilder#replaceAndTransferLookAhead() 
Allows to use NodeModelBuilder#replaceAndTransferLookAhead() to replace
nodes other than the root node.

TODO: Add tests.

Signed-off-by: Knut Wannheden <knut.wannheden@paranor.ch>
 2018-06-28 06:12:43 +02:00
Arne Deutsch
d3099cbede
Merge pull request #774 from eclipse/personal-data-to-build-files 
Add contact data in parent pom and gradle files.
 2018-06-27 09:32:25 +02:00
Arne Deutsch
c2b20283fb
Merge pull request #775 from eclipse/xtext-eclipse-677-test-source-folders 
[eclipse/xtext-eclipse#677] Additional source folder support.
 2018-06-27 09:09: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
Arne Deutsch
c708bc89a2 Add contact data in parent pom and gradle files. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-06-25 10:59:38 +02:00
Christian Dietrich
7351821315
Merge pull request #770 from eclipse/cd_orbit-update 
updated orbit to photon release
 2018-06-25 08:57:20 +02:00
Lorenzo Bettini
955090ef36
Merge pull request #772 from eclipse/lb_mydata 
Just updated my email and organization in developers.gradle
 2018-06-22 11:38:59 +02:00
Lorenzo Bettini
8ba7a45b5a Just updated my email and organization in developers.gradle 
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2018-06-22 11:25:21 +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
54ec08b19e added missing since annotations 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-06-15 19:15:40 +02:00
Christian Dietrich
4023a25c84
Merge pull request #768 from tivervac/dontPrintSourceCodeOnError 
Allow to not print source code in LSP
 2018-06-15 19:12:22 +02:00
Titouan Vervack
f103de5392 Allow to not print source code in LSP 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-15 11:27:38 +02:00
Christian Dietrich
1cb6bb09ac
Merge pull request #767 from tivervac/defaultDocumentHighlightServiceTypos 
Fixed typos in DefaultDocumentHighlightService
 2018-06-13 16:02:37 +02:00
Titouan Vervack
69a7473245 Fixed typos in DefaultDocumentHighlightService 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-13 13:47:31 +02:00
Christian Dietrich
5cf1e02e2b
Merge pull request #766 from tivervac/readOnlyApiCall 
Added an extra api call that omits the default result
 2018-06-12 07:59:44 +02:00
Titouan Vervack
528de63088 Added an extra api call that omits the default result 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-11 11:08:40 +02:00
Christian Dietrich
69e9f07aca removed unused imports 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-06-08 09:47:35 +02:00
Christian Dietrich
19aab86a2c
Merge pull request #765 from tivervac/potentialNullPointerAccessError 
Reduced "potential null pointer access" errors
 2018-06-08 09:15:34 +02:00
Titouan Vervack
63c4439ad4 Reduced "potential null pointer access" errors 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-05 18:11:37 +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
Christian Dietrich
567b5a7b81
Merge pull request #764 from tivervac/taskCompileErrors 
Fixed compile errors for #763
 2018-06-05 17:56:35 +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
Karsten Thoms
0c0cdb4a2b
Merge pull request #762 from eclipse/kth_issue715 
[#715] Remove test_getCurrent
 2018-06-05 11:04:46 +02:00
Christian Dietrich
68eb09dbae
Merge pull request #760 from eclipse/cd_xtext_issue1225 
[eclipse/xtext#1225] Update to Tycho 1.2.0
 2018-06-05 10:45:50 +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
Christian Dietrich
e21455c1a9 [eclipse/xtext#1225] Update to Tycho 1.2.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-06-05 09:38:29 +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
Christian Dietrich
daec1c4d0b fixed bootstrap version 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-27 16:54:59 +02:00
Karsten Thoms
7d9c791352
Merge pull request #755 from eclipse/cd_xtext_issue1178 
[eclipse/xtext#1178]  bootstrap against 2.14
 2018-05-26 15:04:24 +02:00
Christian Dietrich
bfe26052dd [eclipse/xtext#1178] bootstrap against 2.14 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-26 13:36:19 +02:00
Christian Dietrich
2ebb77e48c fixed p2 build 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-26 10:58:51 +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
Christian Dietrich
adc0f04377 rev. Jenkinsfile changes 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-05-25 14:33:26 +02:00
Christian Dietrich
7b55d9b0d0
Merge pull request #752 from tivervac/taskTagsDuplicateKeys 
Fixed duplicate key insertion with task tags
 2018-05-24 21:25:50 +02:00
Christian Dietrich
5a33c955fc
Merge pull request #753 from tivervac/EObjectDiagnosticImplTypo 
Fixed typo in EObjectDiagnosticImpl
 2018-05-24 21:20:38 +02:00
Titouan Vervack
b3717cc478 Fixed typo in EObjectDiagnosticImpl 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-05-24 18:41:15 +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
9bc7e9b54e Set upstreamBranch 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-24 11:32:47 +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
bd2d5e5a00
Merge pull request #743 from eclipse/kth_issue741 
Manage tycho-surefire-plugin in parent pom
 2018-05-22 18:24:21 +02:00
Jan Koehnlein
8a3a7a89b8
Merge pull request #747 from eclipse/jk/serializer 
[serializer] relax API
 2018-05-22 15:08:26 +02:00
Jan Koehnlein
42dda5e9d3 [serializer] relax API 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2018-05-22 14:45:09 +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
1b8d74a8a7
Merge pull request #744 from eclipse/kth_issue743 
[#743] Relax lower bound for JUnit 5 bundles to 5.0.0
 2018-05-17 22:24:04 +02:00
Karsten Thoms
c8d00ded18 [#743] Relax lower bound for JUnit 5 bundles to 5.0.0 
Makes bundles work on Oxygen.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-17 22:19:38 +02:00