Commit graph

6467 commits

Author SHA1 Message Date
Christian Dietrich
1f18cfc2bb
Merge pull request #729 from eclipse/cd_web_issue53
[eclipse/xtext-web#53] updated to a newer jetty version that works better with asm 6.1
2018-05-07 09:56:37 +02:00
Christian Dietrich
ec706ceb8c
Merge pull request #730 from eclipse/cd_unusedImports
removed unused imports
2018-05-06 17:57:58 +02:00
Christian Dietrich
b051e84aed removed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-06 10:07:59 +02:00
Christian Dietrich
aaf4037856 [eclipse/xtext-web#53] updated to a newer jetty version that works better with asm 6.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 16:14:54 +02:00
Christian Dietrich
3977f82b61
Merge pull request #726 from eclipse/cd_photonTarget
[eclipse/xtext#1177] Switched Target Platform to Photon for Tycho Builds with Java 10
2018-05-04 14:01:00 +02:00
Holger Schill
bd263193f5
Merge pull request #728 from eclipse/cd_xdepr
[#664] fixed generation of val prefs/issue codes when deprecation disabled
2018-05-04 10:47:29 +02:00
Christian Dietrich
f2a738ae3e [#664] fixed generation of val prefs/issue codes when deprecation disabled
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 10:16:46 +02:00
Christian Dietrich
205bafd544 [eclipse/xtext#1177] Switched Target Platform to Photon for Tycho Builds with Java 10
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 08:50:42 +02:00
Christian Dietrich
5c1f19b4c6
Merge pull request #725 from eclipse/cd_issue724
[#724] fixed compile errors with non xbase languages
2018-05-03 07:12:58 +02:00
Christian Dietrich
d2134214a6 [#724] fixed compile errors with non xbase languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-03 06:49:22 +02:00
Holger Schill
bba7a1c248
Merge pull request #723 from eclipse/issue/722_validation2Fragment
Issue/722 validation2 fragment
2018-05-02 15:24:55 +02:00
Holger Schill
12008dfed5 Finding from CodeReview in https://github.com/eclipse/xtext-core/pull/723 2018-05-02 14:53:32 +02:00
Holger Schill
eb2b0f77b2 Tests for https://github.com/eclipse/xtext-core/issues/722 2018-05-02 14:22:14 +02:00
Holger Schill
dbca734a58 Fix for https://github.com/eclipse/xtext-core/issues/722 2018-05-02 13:40:54 +02:00
Christian Dietrich
3dbf100102
Merge pull request #718 from eclipse/cd_issue716
[#716] [LSP] Problems for a deleted file are shown after deletion
2018-04-26 16:08:39 +02:00
Christian Dietrich
64be133f9d
Merge pull request #719 from eclipse/cd_issue714
[#714] consume lsp4j 0.4.0 final
2018-04-26 09:52:38 +02:00
Christian Dietrich
4e99055a9d [#714] consume lsp4j 0.4.0 final
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-26 08:36:01 +02:00
Christian Dietrich
be7a958127 [#716] [LSP] Problems for a deleted file are shown after deletion
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-25 14:29:38 +02:00
Karsten Thoms
4978547f59
Merge pull request #633 from eclipse/kth_refactor_Files
[refactoring] Deprecate methods with correspondence in Guava
2018-04-23 16:49:43 +02:00
Jan Koehnlein
8809e2f8fd
Merge pull request #713 from eclipse/jk/gh712
GH-712 adapt to breaking changes in lsp4j
2018-04-23 16:32:21 +02:00
Karsten Thoms
e1ff4dc910 [refactoring] Deprecate methods with correspondence in Guava
Also refactored methods to use Guava

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-23 14:52:31 +02:00
Jan Koehnlein
3c2bb77e89 GH-712 adapt to breaking changes in lsp4j 2018-04-23 14:47:08 +02:00
Karsten Thoms
5e7c2a0902
Merge pull request #711 from eclipse/cd_xtext_issue1190
[eclipse/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0)
2018-04-23 14:34:20 +02:00
Christian Dietrich
de25d13970 [eclipse/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-23 13:01:11 +02:00
Christian Dietrich
497b70425c added missing since
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-20 18:52:22 +02:00
Christian Dietrich
ef9817b9a8
Merge pull request #696 from ArneDeutsch/xtext-eclipse-599
[eclipse/xtext-eclipse#599] Support waiting operation.
2018-04-20 18:49:24 +02:00
Christian Dietrich
5f8a5465d1
Merge pull request #707 from eclipse/cd_lsp4j_wizard_workaround
use lsp4j 0.4.0-SNAPSHOT as workaround for #705
2018-04-20 16:34:43 +02:00
Christian Dietrich
f66c0128af use lsp4j 0.4.0-SNAPSHOT as workaround for #705
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-20 16:18:13 +02:00
Christian Dietrich
2d69f5c34e
Merge pull request #682 from tivervac/nullSafeReadOnlyAndModify2
Added null- and exception-safe variants of (priority)readOnly and modify
2018-04-20 15:55:16 +02:00
Christian Dietrich
85f3a05f3d
Merge pull request #703 from eclipse/java-10-integration
Java 10 integration
2018-04-20 11:33:24 +02:00
Christian Dietrich
dfc8861cd7 readjusted pipelines
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-20 09:56:53 +02:00
Christian Dietrich
c39b272c09
Merge pull request #701 from eclipse/msp_issue694
Updated to LSP4J 0.4.0
2018-04-20 09:29:38 +02:00
Miro Spönemann
bf6a61a7e2 #694: Updated to LSP4J 0.4.0 (snapshot)
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2018-04-19 15:32:40 +02:00
Christian Dietrich
b097f9d159 set tycho version to 1.2.0-SNAPSHOT & added mechanism to handle snapshot and non snapshot versions in the wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-18 19:35:40 +02:00
Karsten Thoms
17616407db
Merge pull request #670 from eclipse/kth_issue666_junit5
[#666] JUnit 5 support
2018-04-17 17:05:31 +02:00
Karsten Thoms
9007644a30 [eclipse/xtext#1177] Merge branch arnedeutsch/java-10-support
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 17:03:38 +02:00
Karsten Thoms
f71678b2bd [#666] JUnit 5 Support
Refactored common code of XtextRunnerTest and InjectionExtensionTest
into an abstract base class.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 16:26:56 +02:00
Karsten Thoms
875e62c901 [#666] JUnit 5 Support
- implemented review comments
- adding JUnitVersion.DEFAULT
- added missing copyright headers for JUnitFragment and Junit4Fragment2
- changed lower bound for org.junit.jupiter.api.extension to 5.1.0

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 12:49:57 +02:00
Christian Dietrich
f0ccaed480 updated asm to asm 6.1.1
updated jdt to Oxygen 3a
adjusted pipelines

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-17 12:27:49 +02:00
Karsten Thoms
07d8819429 [eclipse/xtext#1177] Merge arnedeutsch/java-10-support
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 09:18:54 +02:00
Arne Deutsch
693c7e420c [eclipse/xtext#1177] Update ASM to 6.1.1 and JDT Core to 3.13.102.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-17 07:37:44 +02:00
Christian Dietrich
746582a1a7 updated asm to asm 6.1.1
updated jdt to Oxygen 3a
adjusted pipelines

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-16 20:06:46 +02:00
Karsten Thoms
3999e54b89 [#666] Extend Xtext Generator for JUnit 5
- Added enum JUnitVersion
- Create JUnitFragment from Junit4Fragment2
  - provide setter for JUnit version
  - Deprecated Junit4Fragment2 and extend from JUnitFragment
  - changed StandardLanguage#junitSupport type to JUnitFragment
- Extended JUnitFragment to produce JUnit version specific code
- Added junitVersion property to WizardConfiguration
- generate JUnit 5 specific configuration to workflow when JUnit 5 is
configured
- TestProjectDescriptor: Configure JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-16 13:27:43 +02:00
Titouan Vervack
b8c37767d5 Added wildcard extends
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-04-16 11:05:31 +02:00
Karsten Thoms
e10de81431 [#666] JUnit 5 support
- provide new InjectionExtension as replacement for XtextRunner
- added unit test for InjectionExtension
- added JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-15 10:40:47 +02:00
Christian Dietrich
f8ce0075be
Merge pull request #699 from ArneDeutsch/java-10-support
[eclipse/xtext#1177] Adapt JavaVersion to support Java 10.
2018-04-12 19:36:39 +02:00
Arne Deutsch
ec683f723c [eclipse/xtext#1177] Adapt JavaVersion to support Java 10.
This allows e.g. the selection of Java 10 in the new xtext project
wizard.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-12 15:13:20 +02:00
Moritz Eysholdt
c6a3bd20cb [ChangeSerializer] fixed potential NPEs
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2018-04-11 17:30:09 +02:00
Arne Deutsch
f826570410 [eclipse/xtext-eclipse#599] Support waiting operation.
ActiveAnnotationProcessors might run in parallel. Read operations should
wait until all write operations are ready to avoid race conditions.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-11 13:39:59 +02:00
Christian Dietrich
a68ee345df
Merge pull request #695 from ArneDeutsch/xtext-eclipse-599
[eclipse/xtext-eclipse#599] Fix review findings.
2018-04-11 11:23:10 +02:00