Commit graph

7364 commits

Author SHA1 Message Date
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
Arne Deutsch
44aafdae13 [eclipse/xtext#1455] Resolve windows test failure in DocumentTest.
Also fixes SemanticHighlightingTest.

Document#getLineContent returns the '\r' of '\r\n' on windows. This
leads to a failing test. But the line content should explicitly NOT
return the newline marker. Hence fixing the implementation to fix the
test.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-12-16 12:25:41 +01:00
Christian Dietrich
705ce6ee0d
Merge pull request #1331 from eclipse/cd_issue1328
[#1328] marked obsolete LineFilterOutputStream as deprecated
2019-12-15 18:31:23 +01:00
Christian Dietrich
771ff6052f [#1328] marked obsolete LineFilterOutputStream as deprecated
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-12-15 10:30:24 +01:00
Tamas Miklossy
b4cc111f25 [#1272] Add missing '@Override' to the descriptionLabelProvider methods.
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2019-12-14 18:45:16 +01:00
Tamas Miklossy
00c6be4d34 [#1272] Add missing 'See' prefix to the url in javadoc comments.
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2019-12-14 18:45:16 +01:00
mmews-n4
4b37a9e4f5 [#1316| Add end line and end column positions to Issue
[#1316] Add end line and end column positions to Issue. Also initialise lines and columns with 0. 

Previously, end line and end column information was not part of Issue, IssueImpl, IssueLocation, AbstractDiagnostic, and ExceptionDiagnostic. It is helpful to have this information in these classes, because otherwise (i.e. now in LanguageServerImpl#toDiagnostic(Issue)) this information has to be computed by loading the Document again.

closes #1316 

Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-13 09:54:04 +01:00
Christian Dietrich
e3089c28c9 regenerated test lang
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-12-13 09:22:42 +01:00
Sebastian Zarnekow
f8c791989c
Merge pull request #1322 from mmews-n4/requestManger_logging
Log Exceptions thrown in futures created by the RequestManger
2019-12-12 17:28:25 +01:00
Arne Deutsch
1cd12a8644
Merge pull request #1326 from eclipse/ade-project-wizard-avoid-image-override
[#1321] Do not override icons when regenerate.
2019-12-12 16:02:32 +01:00
Arne Deutsch
9d9137ef66 [#1321] Do not override icons when regenerate.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-12-12 13:51:30 +01:00
Christian Dietrich
762886ff6d
Merge pull request #1325 from eclipse/cd_issue1324
[#1324] teach partial class extractor about fragment rules
2019-12-12 12:12:59 +01:00
Christian Dietrich
18e4a6c7ee [#1324] teach partial class extractor about fragment rules
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-12-12 10:24:11 +01:00
mmews
f8fbc38a0b fix synchronization error (maybe)
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-12 00:19:51 +01:00
Sebastian Zarnekow
35c544fa81
Merge pull request #1323 from mmews-n4/use_indexOnly
Make use of already implemented flag indexOnly and set it in IProjectConfig
2019-12-11 18:26:06 +01:00
mmews
df3b967105 add tests for runRead, etc.
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-11 14:16:53 +01:00
mmews
85e1620ab4 incorporate review feedback
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-11 11:18:47 +01:00
mmews
3102556c4e add CancellationException to OCM#getPlatformOperationCanceledException
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-10 22:51:31 +01:00
mmews
f360e6b1a0 add annotation @since
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-10 22:46:27 +01:00
mmews
8e3550e61b add test for IProjectConfig#isIndexOnly
Signed-off-by: mmews <marcus.mews@numberfour.eu>
2019-12-10 22:35:04 +01:00