Commit graph

6874 commits

Author SHA1 Message Date
Christian Dietrich
ebf4d92f91
Merge pull request #1064 from eclipse/cd_fixWarnings217
marked abstract classes as abstract
2019-03-06 21:41:24 +01:00
Christian Dietrich
308580fe59
Merge pull request #1063 from eclipse/cd_orbit201906
use orbit 2019-06
2019-03-06 21:25:54 +01:00
Christian Dietrich
2d5a808729 marked abstract classes as abstract
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-03-06 20:52:55 +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
1aea0c1928
Merge pull request #1060 from eclipse/cd_core_issue1059
[eclipse/xtext-core#1059] updated to lsp4j 0.7.0
2019-03-06 16:26:23 +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
3d661c855d
Merge pull request #1062 from eclipse/cd_xtext_issue1405
[eclipse/xtext#1405] bootstrap against 2.17.0
2019-03-05 22:24:15 +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
50f41ef3a3 [eclipse/xtext#1405] bootstrap against 2.17.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-03-05 19:52:58 +01:00
Christian Dietrich
1de011e416
Merge pull request #1061 from eclipse/cd_version218
[eclipse/xtext#1414] prepared master for version 2.18.0
2019-03-05 18:14:26 +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
3b4562c5e0
Merge pull request #1058 from eclipse/cd_xtext_issue1404
[eclipse/xtext#1404] Bump Xtext-Gradle-Plugin to latest (2.0.4)
2019-03-02 14:12:14 +01:00
Christian Dietrich
b51e39582b
Merge pull request #1057 from eclipse/cd_issue1053
[#1053] Wizard: Bump Xtext-Gradle-Plugin to latest (2.0.4)
2019-03-02 14:11:57 +01:00
Christian Dietrich
fed0168b23 [eclipse/xtext#1404] Bump Xtext-Gradle-Plugin to latest (2.0.4)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-03-02 10:45:26 +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
Christian Dietrich
48ab13a19a
Merge pull request #1055 from eclipse/cd_issue1054
[#1054] fixed broken target platform for junit 5
2019-02-27 19:07:52 +00:00
Christian Dietrich
09b17ee033 [#1054] fixed broken target platform for junit 5
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-27 19:24:03 +01:00
Sebastian Zarnekow
92a3fc77b0 Added x-friend to xtext.xtext.ui.tests 2019-02-26 18:49:08 +01:00
Sebastian Zarnekow
edeb506431 Make injection of the CompositeEValidator work 2019-02-26 18:29:10 +01:00
Karsten Thoms
b2cf16320c
Merge pull request #1049 from eclipse/cd_issue1048
Added missing generated code + Fix for failing test due missing cleanup
2019-02-25 10:04:20 +01:00
Christian Dietrich
ae41f9c34e [#1048] fixed cleanup of workspace in test
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-25 09:44:50 +01:00
Christian Dietrich
ea07eb5cc5 added changed generated code for 'Actually delete LSP test folder after test' change
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-25 09:43:02 +01:00
Sebastian Zarnekow
e0abeca703
Merge pull request #1046 from eclipse/tv_delete_lsp_test_folder
Actually delete LSP test folder after test
2019-02-22 13:40:42 +01:00
Titouan Vervack
33534239c5 Actually delete LSP test folder after test
Delete on exit doesn't work if the folder is not empty. Since we don't
remove the individual files the folder doesn't get deleted.

Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2019-02-21 18:31:53 +01:00
Sebastian Zarnekow
4f2f3f7022
Merge pull request #1008 from jschuhmacher/inheriting-resourcedescriptionstrategy
Make ResourceDescriptionStrategyFragment aware of super grammars
2019-02-21 13:19:25 +01:00
Dennis Huebner
e807fecdbe [ide] Bogus serialization when reassign container #1043
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2019-02-21 09:03:07 +01:00
Sebastian Zarnekow
787ef1d8bd
Merge pull request #1033 from epoell/ep_issue1021
Replaced ThreadLocal state.set(null) with state.remove() in AbstractDeclarativeValidator
2019-02-20 10:58:22 +01:00
Sebastian Zarnekow
79c99fd5d2
Merge pull request #1041 from epoell/ep_issue1034
[#1034] Added Validation that entry rule is not a fragment
2019-02-19 18:52:05 +01:00
Eva Poell
a5bcb66f26 [#1034] corrected code formatting
Signed-off-by: Eva Poell <epoell@itemis.com>
2019-02-19 16:12:46 +01:00
Sebastian Zarnekow
9d3f244372
Merge pull request #1042 from eclipse/kt_issue1283
[eclipse/xtext#1283] Remove mavenCentral again
2019-02-19 14:39:24 +01:00
Karsten Thoms
adae9148ae [eclipse/xtext#1283] Remove mavenCentral again
MWE is now available on JCenter

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-02-19 10:21:05 +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
4af6f5fe16
Merge pull request #1040 from eclipse/ade-manifest-merger-filter-empty-entries
[#1038] Filter bad entries when read in MANIFEST.
2019-02-18 13:53:39 +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
Karsten Thoms
3e939fdf9f
Merge pull request #1036 from eclipse/cd_jcenter_workaround
workaround for jcenter maven central sync is too slow
2019-02-17 15:21:06 +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
Christian Dietrich
0e56ed5715 workaround for jcenter maven central sync is too slow
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-14 18:42:32 +01:00
Eva Poell
084ac859fd Solve Issue 1021
Replaced ThreadLocal state.set(null) with state.remove(). And tried to decrement the calls of state.get() by keeping it in a variable if possible.
Might need a closer look, if this works.

Signed-off-by: Eva Poell <epoell@itemis.com>
2019-02-14 09:42:10 +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
Sebastian Zarnekow
53756198b2
Merge pull request #1030 from eclipse/kt_findInstantiableCompatible
[performance] Improve isInstantiatableSubType
2019-02-11 22:25:04 +01:00
Sebastian Zarnekow
5912d71a34
Merge pull request #1031 from eclipse/kt_EcoreUtil2_isAssignableFrom
isAssignableFrom: check both args for null & identity
2019-02-11 22:21:04 +01:00
Karsten Thoms
e00313cff2 [performance] Short cut findInstantiableCompatible
Avoid calling isInstantiatableSubType to reduce number of conditions to
check until identity is checked.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-02-11 21:12:34 +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
56be27b066 [eclipse/xtext#1283] update to MWE 2.10
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-11 09:17:58 +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
e34bcf8a71
Merge pull request #1024 from eclipse/sz_classpath
Make bin/main also the default output directory to avoid buildship confusion
2019-02-11 08:49:30 +01:00
Christian Dietrich
f2961f8a67
Merge pull request #1026 from eclipse/cd_fixJavaDocX
fixed some javadocs
2019-02-11 07:47:04 +01:00
Christian Dietrich
dfe72b83c0 fixed some javadocs
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-10 22:25:11 +01:00