Commit graph

6784 commits

Author SHA1 Message Date
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
bcce55907d
Merge pull request #927 from eclipse/cd_newGradlePlugin
Updated xtext-gradle-plugin to 2.0.2
2018-10-30 19:36:52 +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
d6bb09efc3
Merge pull request #926 from eclipse/cd_xtext_issue1315
[eclipse/xtext#1315] removed p2gen
2018-10-30 13:06:36 +01:00
Christian Dietrich
b4d7afc688 [eclipse/xtext#1315] removed p2gen
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-30 10:45:42 +01:00
Christian Dietrich
28addc1f30
Merge pull request #925 from kittaakos/GH-924
GH-924: Disabled the semantic highlighting with the default bindings.
2018-10-29 14:49:45 +01:00
Akos Kitta
c539bc5501 GH-924: Disabled the semantic highlighting with the default bindings.
Closes: #924.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
2018-10-29 14:21:16 +01:00
Christian Dietrich
6c918d6fed
Merge pull request #921 from eclipse/cd_issue903
[eclipse/xtext-core#903] build against 2018-12 in wizard
2018-10-26 10:44:31 +02: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
8dbc988cb1
Merge pull request #920 from eclipse/xtext-core-918-mergeablemanifest2-exception
#918: Integration MANIFEST.MF from classpath test
2018-10-22 14:56:28 +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
7096a28d2b
Merge pull request #919 from eclipse/xtext-core-918-mergeablemanifest2-exception
#918: Fix MergeableManifest2 and add missing unit tests
2018-10-19 14:56:44 +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
b128ae5dcb
Merge pull request #913 from eclipse/xtext-core-864-mergable-manifest-replacement
#864: Rewrite MergeableManifest to MergeableManifest2 to avoid reflection
2018-10-19 07:59:58 +02:00
Christian Dietrich
95ea8090ee
Merge pull request #896 from eclipse/cd_issue885
[#885] make LSP server exit behaviour configurable
2018-10-18 15:13:17 +02:00
Christian Dietrich
4f53fd0588 [#885] make LSP server exit behaviour configurable
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-18 14:41:23 +02:00
Christian Dietrich
ee0768ea07
Merge pull request #915 from eclipse/cd_xtext_issue1321
[eclipse/xtext#1321] bootstrap against 2.16.0.M1
2018-10-17 18:42:26 +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
Titouan Vervack
5237e2eb68
Merge pull request #914 from eclipse/gradleDevelopers
Added self to gradle developers
2018-10-17 16:23:48 +02:00
Titouan Vervack
4ef105d696 Added self to gradle developers
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-10-17 14:45:42 +02:00
Christian Dietrich
d431f308d8 [eclipse/xtext#1321] bootstrap against 2.16.0.M1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-17 13:46:15 +02:00
Christian Dietrich
003c2771a7
Merge pull request #911 from ckulla/cku_issue906
ConcurrentModificationException in AllRulesCache.findInEmfObject() (#906)
2018-10-15 19:19:56 +02:00
Kulla Christoph
c7e3deacd9 Fix race condition when getting the grammar (fixes #906)
Signed-off-by: Kulla Christoph <christoph.kulla@de.bosch.com>
2018-10-15 13:55:10 +02:00
Christian Dietrich
796e2e8aef
Merge pull request #908 from eclipse/cd_fixJavaDoc
fixed javadoc
2018-10-13 17:15:42 +02:00
Karsten Thoms
59ce53d10f
Merge pull request #909 from eclipse/kth_umbrella65
[eclipse/xtext-umbrella#65] Adjust upstream branch
2018-10-13 13:40:50 +02:00
Christian Dietrich
242a271406
Merge pull request #904 from eclipse/cd_xtext_issue1280_shadow
[eclipse/xtext#1280] updated version of shadow jar plugin
2018-10-13 09:33:00 +02:00
Christian Dietrich
ac598a676d fixed javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-12 21:44:12 +02:00
Christian Dietrich
5aa53f8301
Merge pull request #907 from eclipse/cd_xtext_issue1222
[eclipse/xtext#1222] fixed branch detection on Jenkins
2018-10-12 14:42:23 +02:00
Christian Dietrich
fc9f0b1d2f [eclipse/xtext#1222] fixed branch detection on Jenkins
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-12 14:12:26 +02:00
Karsten Thoms
d589229da1 [eclipse/xtext-umbrella#65] Adjust upstream branch
Added property ‚upstreamBranch‘ which is considered by adjustPipelines.sh script

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-12 03:49:53 +02:00
Sebastian Zarnekow
ba3d9e7404
Merge pull request #905 from eclipse/sz_regenerate
regenerated with newer xtend
2018-10-11 20:54:33 +02:00
Sebastian Zarnekow
c119af10c4 regenerated with newer xtend 2018-10-11 20:51: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
460d0d2369
Merge pull request #881 from eclipse/kth_issue1222
[eclipse/xtext#1222] Auto-detect upstream repository URLs
2018-10-11 10:09:37 +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
Christian Dietrich
2c94a07f91
Merge pull request #900 from eclipse/cd_xtext_issue1280
[eclipse/xtext#1280] made genManifest / genSourcesManifest gradle 5 ready
2018-10-10 18:27:06 +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
cd340b79a3
Merge pull request #892 from eclipse/cd_xtext_issue1300_wiz
[eclipse/xtext#1300][Wizard] Update to Gradle Wrapper 4.10.2
2018-10-10 17:05:01 +02:00
Christian Dietrich
2527ae2e25
Merge pull request #891 from eclipse/cd_xtext_issue1300
[eclipse/xtext#1300] Update to Gradle Wrapper 4.10.2
2018-10-10 17:04:45 +02:00
Karsten Thoms
073e2dda00 [eclipse/xtext#1222] Auto-detect upstream repository URLs
Using plugin org.ajoberstar.grgit to be able to determine the
repository's current branch name.

When using jenkinsPipelineRepo Jenkins is contacted to check the
existence of jobs, starting with the current branch name and falling
back to 'master'. This is done for each upstream repository.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-10 14:37:33 +02:00
Christian Dietrich
11bfa28edd [eclipse/xtext#1280] made genManifest / genSourcesManifest gradle 5 ready
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-10 06:37:12 +02:00
Dennis Huebner
ceca3728be
Merge pull request #895 from eclipse/dh-ignoreChangeWatchedFiles
Ignore didChangeWatchedFiles for open documents
2018-10-09 13:12:27 +02:00
Dennis Huebner
07941dbdf0 Additional test for "delete than close" case #895
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-09 10:04:07 +02:00
Dennis Huebner
a92e9b1dfb
Merge pull request #894 from eclipse/dh-server-initialize
Initial Diagnostics can never arrive to the client
2018-10-08 16:42:17 +02:00
Dennis Huebner
b25320cd3b [LSP] Ignore didChangeWatchedFiles for open documents #888
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-08 16:40:11 +02:00
Dennis Huebner
f28fafb8ca Removed runWrite call #800
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-08 16:27:29 +02:00