Commit graph

7433 commits

Author SHA1 Message Date
Christian Dietrich
ef65b96ec0 fixed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-23 13:10:54 +01:00
Karsten Thoms
3682b57be1
Merge pull request #1361 from eclipse/kt/issue1595_escape_branchname
[eclipse/xtext#1595] Escape branch name for k8s label
2020-01-23 09:43:53 +01:00
Karsten Thoms
235c42b3ef
Merge pull request #1362 from eclipse/kt_issue1569_1
[eclipse/xtext#1569] Refactor Xtend to Java
2020-01-21 15:57:48 +01:00
Karsten Thoms
5083d86efa [eclipse/xtext#1569] Refactor Xtend to Java
The usage of Xtend in the Xtext code base should be reduced where the
usage of Xtend is not super beneficial. Replaced Xtend classes by the
compiled code and refactored the code to more readable Java.

This change extracts classes formerly defined in
AbstractLanguageServerTests.xtend to own files.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2020-01-21 15:35:04 +01:00
Christian Dietrich
12c5a2215e
Merge pull request #1360 from eclipse/cd_tycho160final
[eclipse/xtext#1643] update to tycho 1.6.0
2020-01-20 17:12:27 +01:00
Christian Dietrich
d6a22de8a9 [eclipse/xtext#1643] update to tycho 1.6.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-20 15:54:50 +01:00
Karsten Thoms
582ea14f9d [eclipse/xtext#1595] Escape branch name for k8s label
The k8s agent label becomes invalid when the branch name contains '/'.
ERROR: Labels must follow required specs -
https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set

This change escapes the slash character by underscore.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2020-01-20 15:41:16 +01:00
Christian Dietrich
c6718b9499
Merge pull request #1350 from eclipse/cd_xtext_issue1644
[eclipse/xtext#1644] use java platform
2020-01-20 15:15:21 +01:00
Christian Dietrich
df71148106 [eclipse/xtext#1644] use java platform
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-20 15:03:55 +01:00
Christian Dietrich
bda917bab3
Merge pull request #1359 from eclipse/cd_issue1651
[eclipse/xtext#1651] made error handling in StorageAwareResource null-safe
2020-01-20 13:47:45 +01:00
Christian Dietrich
6b552f0659 [eclipse/xtext#1651] made error handling in StorageAwareResource null-safe
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-20 12:52:13 +01:00
Robert Lewis
da46e06388 [#1262] Prevent infinite loop with NodeIterator.
Throw NullPointerException if null is passed to NodeIterator constructor
to prevent iterator state where hasNext() and hasPrevious() always
return true, but getNext() and getPrevious() always return null.

Signed-off-by: Robert Lewis <rablewis@algo-pop.com>
2020-01-19 15:10:26 +00:00
Christian Dietrich
9d419220eb
Merge pull request #1352 from eclipse/cd_issue1351
[#1351] match milestone versions in test too
2020-01-18 08:43:12 +01:00
Christian Dietrich
f8d52a593f
Merge pull request #1355 from mmews-n4/hashCode_for_ReplaceRegion
Add hashCode() and equals() to ReplaceRegion
2020-01-17 10:01:07 +01:00
Christian Dietrich
e57cb3bfee
Merge pull request #1357 from eclipse/cd_grgit401
update grgit to 4.0.1
2020-01-17 08:26:30 +01:00
Christian Dietrich
0083da3f89 update grgit to 4.0.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-17 07:50:47 +01:00
mmews
4353ade62b performance improvements, add check for class
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2020-01-16 10:46:24 +01:00
mmews
198a74e270 add hashCode() and equals() to ReplaceRegion
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2020-01-15 14:33:58 +01:00
Christian Dietrich
0b7156d54f
Merge pull request #1354 from eclipse/bot_update_xtext_bootstrap_version
[releng] Bootstrap against 2.21.0.M1
2020-01-14 08:51:08 +01:00
Nico Prediger
9eb48f4879 [releng] Bootstrap against 2.21.0.M1
Signed-off-by: Nico Prediger <mail@nicoprediger.de>
2020-01-14 07:23:16 +00:00
Christian Dietrich
ccf274d016 [#1351] match milestone versions in test too
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-13 13:31:53 +01:00
Christian Dietrich
a928fbe711
Merge pull request #1348 from eclipse/cd_xtext_issue1642regen
[eclipse/xtext#1642] regenerated xtend code with latest xtend
2020-01-10 12:19:22 +01:00
Christian Dietrich
cb2d00c8a9
Merge pull request #1349 from eclipse/cd_enhanceDeprecations
Enhance Dreprecations (get fewer warnings)
2020-01-10 09:15:13 +01:00
Christian Dietrich
0f87a7343c enhance deprecation of fragments
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-10 07:54:24 +01:00
Christian Dietrich
828d11d33b enhance deprecation of coloring service
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-10 07:52:19 +01:00
Christian Dietrich
79e1ebcfed [eclipse/xtext#1642] regenerated xtend code with latest xtend
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-09 13:57:00 +01:00
Tamas Miklossy
664fb2e8e8 Convert EMFGeneratorFragment2.trimMultiLineComment to an instance method
- to be able to override that method in derived classes.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2020-01-09 10:15:30 +01:00
Lorenzo Bettini
c8196eeca2
Merge pull request #1336 from eclipse/lb_issue_1335
The generated parent POM should not ignore maven-resources-plugin goals
2020-01-09 09:24:45 +01:00
Tamas Miklossy
889aef2385 [#1345] Improve EMFGeneratorFragment2 fileHeader handling.
- Improve the trimMultiLineComment method to properly handle the /**,
/*******, **/ and ****************/ symbols.
- Implement corresponding EmfGeneratorFragment2Test test cases.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2020-01-09 09:15:11 +01:00
Tamas Miklossy
3641ec9a97 [#1343] Fix invalid link in javadoc.
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2020-01-07 20:53:00 +01:00
Christian Dietrich
c241b743d8
Merge pull request #1342 from eclipse/cd_regen
regenerated test langs
2020-01-07 13:08:02 +01:00
Christian Dietrich
0b201a6bc1 regenerated test langs
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-07 12:46:07 +01:00
Christian Dietrich
72f82d0229
Merge pull request #1339 from eclipse/cd_xtext_issue1605
[eclipse/xtext#1605] update orbit to 2020-03
2020-01-06 19:05:21 +01:00
Christian Dietrich
c49d1179d7
Merge pull request #1340 from eclipse/cd_bmp202003
use 2020-03 in target platform
2020-01-06 19:04:50 +01:00
Christian Dietrich
98fa225dcc use 2020-03 in target platform
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-06 18:52:30 +01:00
Christian Dietrich
36babc7191 [eclipse/xtext#1605] update orbit to 2020-03
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-06 18:34:52 +01:00
Christian Dietrich
76712445ce
Merge pull request #1337 from eclipse/emf220Update
[eclipse/xtext#1282] update to EMF 2.20
2020-01-06 09:38:23 +01:00
Sebastian Zarnekow
9913e888dd [eclipse/xtext#1282] Update to EMF 2.20: Set GenRuntimeVersion to 2.20 by default 2020-01-04 08:37:28 +01:00
Christian Dietrich
a358326650 [eclipse/xtext#1282] Update to EMF 2.20: fix tycho build
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:15 +01:00
Christian Dietrich
83249956d4 [eclipse/xtext#1282] Update to EMF 2.20: change version constraints in MANIFESTs
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:15 +01:00
Christian Dietrich
1f8b21ff15 [eclipse/xtext#1282] Update to EMF 2.20: regenerated languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:14 +01:00
Christian Dietrich
de1a6b9bdb [eclipse/xtext#1282] Update to EMF 2.20: adapted workflows and manually maintained genmodels
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2020-01-03 16:38:14 +01:00
Lorenzo Bettini
b3147aebad 1335: updated CliWizardIntegrationTest expectations
Task-Url: https://github.com/eclipse/xtext-core/issues/1335
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2020-01-03 14:42:29 +01:00
Lorenzo Bettini
06c411c83b 1335: Don't ignore maven-resources goals in the generated parent POM
Task-Url: https://github.com/eclipse/xtext-core/issues/1335
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2020-01-03 14:40:46 +01:00
Arne Deutsch
d7ca0a4e72 Update forgotton copyright comments.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-12-18 10:22:59 +01:00
Tamas Miklossy
abddf5efc3 [#1108] Update the year in the copyright headers.
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2019-12-16 18:57:01 +01:00
Sebastian Zarnekow
f45a3c4aaa
[eclipse/xtext#1629] Migrate server.concurrent from Xtend to Java (#1327)
Migrate server.concurrent from Xtend to Java

see eclipse/xtext#1629
2019-12-16 18:11:09 +01:00
Arne Deutsch
01c74550c4
Merge pull request #1333 from eclipse/ade-fix-tests-on-windows
[eclipse/xtext#1455] Resolve test failure in DocumentTest.
2019-12-16 15:14:38 +01:00
Arne Deutsch
1fff3d2648 [eclipse/xtext#1455] Dedicated DocumentTest case for \r\n.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-12-16 13:19:47 +01:00
Arne Deutsch
b18bb8ed7c [eclipse/xtext#1455] Fixing CompletionTest.
The tests work with concrete offsets and hence can only work with '\n'
because '\r\n' will always lead to broken expectations. Test case in
CompletionTest is only broken because TestLanguageProposalCreator, a
class used only for testing, adds 1 to the offset but "2" would be
needed for input with '\r\n'. In other places it is already ensured that
'\n' is used (e.g. AbstractLanguageServerTest#assertEquals). Hence just
align the input text to the rest of the implementation and using '\n'.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-12-16 13:09:29 +01:00