Commit graph

6071 commits

Author SHA1 Message Date
Christian Dietrich
94a43ed825 moved 'copy java problems' configurable issue code to xtext core https://github.com/eclipse/xtext-core/issues/544
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-30 10:07:19 +01:00
Karsten Thoms
ee52c11194
Merge pull request #562 from eclipse/refactor_qnconverter
Refactoring & additional tests
2017-11-29 21:46:04 +01:00
Karsten Thoms
f3d2655cab Refactoring & additional tests
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-11-29 16:35:30 +01:00
Karsten Thoms
faec295260
Merge pull request #561 from FStolte/issue463
[eclipse/xtext-eclipse#463] Fix for issue
2017-11-29 10:09:32 +01:00
Karsten Thoms
e3baf9ede5 [refactoring] formatting
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-11-29 08:57:38 +01:00
Christian Dietrich
b6cbf6dc17 avoid name clash with java 9
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-28 15:01:37 +01:00
Christian Dietrich
7e1cf4b5a4 added missing types to CodeGenUtil2.getJavaDefaultTypes() #509
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-28 15:01:37 +01:00
Florian Stolte
94eba69a6b [eclipse/xtext-eclipse#463] Fix for issue.
- Created EditorFragment2 to generate language-specific sub-classes of
XtextEditor

- Added new fragment to StandardLanguage

- Configured the language-specific editor in XbaseGeneratorFragment2

- Added methods to XtextGeneratorNaming for XtextEditor, XbaseEditor and
language-specific editors

- Added binding for language-specific editors in ImplicitFragment

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-11-28 10:39:51 +01:00
Christian Dietrich
629c9db4bd Fixed Test Problem on Windows #557
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-28 09:57:19 +01:00
Christian Dietrich
d6b1825a38 added support for Java 9 # 500
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-24 12:59:57 +01:00
Karsten Thoms
98dd193d8b
Merge pull request #556 from FStolte/issue555
Fix for issue [#555]
2017-11-22 16:58:59 +01:00
Florian Stolte
c322f3e73a [#556] Added test for TextRegionsToString::quote
Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-11-22 16:55:51 +01:00
Florian Stolte
22820aac32 [#555] Fix for issue.
Since windows line endings are replaced by unix line endings - i.e. the
"\r" character is removed -, the result string can be shorter than the
input string.
Since the loop iterating over the characters of the input string is
limited to "maxLength + 1" iterations, the check "result.size() >
maxLength" did not give the desired result in the presence of windows
line endings.

Now, the number of iterations is incremented when a character is deleted
from the string.


Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-11-22 14:04:02 +01:00
Karsten Thoms
07b182918c
Merge pull request #529 from eclipse/me/newline_fix
Fixed #460: Test failure on Windows due to CarriageReturn char
2017-11-22 12:17:49 +01:00
Christian Dietrich
8f51de3cc4 use newer gradle plugin
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-22 08:48:26 +01:00
Christian Dietrich
3ba9c9fa57 More Cleanup
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Christian Dietrich
c043e300e1 Cleanup the code a bit
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Christian Dietrich
402e245a88 some minor cleanups
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Christian Dietrich
5bef8e69c8 correctly decode vs code uris on windows #528
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Karsten Thoms
215c650c26
Merge pull request #551 from eclipse/xtext_issue1149
[eclipse/xtext#1149] Suppress Maven download messages
2017-11-16 11:34:52 +01:00
Karsten Thoms
8f4213bbbc [eclipse/xtext#1149] Suppress Maven download messages
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-11-16 09:31:59 +01:00
Karsten Thoms
c22e0bb047
Merge pull request #549 from FStolte/refactoring
Refactoring: Cleaning up warnings
2017-11-15 17:32:25 +01:00
Florian Stolte
2a503da006 Refactoring: Cleaning up warnings.
Removed four unused imports and one unused local variable declaration.

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-11-15 15:54:57 +01:00
Karsten Thoms
c06158846c
Merge pull request #547 from brodo/bugfix-542-v2
Add contentTypeBinding to content[Merge]Viewers, refs #542 (v2)
2017-11-15 13:01:41 +01:00
Julian Dax
a7bf8945b2
Add contentTypeBinding to content[Merge]Viewers
Fixes #542

Signed-off-by: Julian Dax <jdax@itemis.com>
2017-11-15 13:00:05 +01:00
Karsten Thoms
7c5fcff60b
Merge pull request #546 from brodo/regenerated-xtext-language
Regenerated xtext language
2017-11-15 12:03:36 +01:00
Julian Dax
600dd0c862
Regenerated xtext language
I ran ./gradlew generateXtextLanguage and these changes happend

Signed-off-by: Julian Dax <jdax@itemis.com>
2017-11-15 11:53:50 +01:00
fstolte
88fdbc819f [#537] Added null guards.
Added null guards to all relevant public methods of the Serializer
class.

Signed-off-by: fstolte <fstolte@itemis.de>
2017-11-15 11:33:50 +01:00
Christian Dietrich
827be6cc3a export all packages as interal to ease subclassing #540
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-10 13:58:48 +01:00
Christian Dietrich
dfa56bfc2e fixed formatting of annotations (e.g. @Override) in Xtext Grammars #534
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-08 22:29:43 +01:00
Christian Dietrich
84533e40f1 fixed formatting of annotations (e.g. @Override) in Xtext Grammars #534
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-08 22:16:22 +01:00
Christian Dietrich
9b28ee1960 dont exclude required xtextbin and tokens files from fat jars #533
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-08 22:11:50 +01:00
Christian Dietrich
016bf16d3b reuse calculated genclasses/genpackages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-08 09:59:59 +01:00
Christian Dietrich
6d74b81bec
Merge pull request #531 from eclipse/cd_issue530
Fixed Issue with TypeReference and Custom Pre/Suffixes in EMF
2017-11-08 09:02:58 +01:00
Moritz Eysholdt
f41d82c540 Fixed #460: Test failure on Windows due to CarriageReturn char 2017-11-08 08:48:31 +01:00
Christian Dietrich
def098c3a7 Fixed Issue with TypeReference and Custom Pre/Suffixes in EMF #530
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-07 19:53:57 +01:00
Christian Dietrich
b43934a0ef added test for #520
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-10-28 13:52:33 +02:00
Christian Dietrich
6fe69f8ac0 Merge pull request #508 from eclipse/kth_issue1129
[eclipse/xtext#1129] Automatic changes by Buildship
2017-10-27 12:52:29 +02:00
Christian Dietrich
3437f1763e Merge pull request #519 from eclipse/cd_go214
set version to 2.14
2017-10-27 10:59:33 +02:00
Christian Dietrich
4960af9c0a set version to 2.14
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-10-27 09:03:34 +02:00
Karsten Thoms
c75beddf73 Merge pull request #518 from eclipse/kthoms-patch-1
Update build.gradle
2017-10-26 19:11:52 +02:00
Karsten Thoms
651211c496 Update build.gradle 2017-10-26 19:11:00 +02:00
Karsten Thoms
fe29fda4b4 Merge pull request #514 from eclipse/issue512
[#512] Maven AppAssembler - Reduce length of classpath
2017-10-19 15:08:05 +02:00
Karsten Thoms
c7b439923d [#512] Maven AppAssembler - Reduce length of classpath
On windows the generated classpath in start scripts might become too
long. This can be avoided by additional configuration of the
appassembler-maven-plugin plugin:
- added option repositoryLayout=flat
- added option useWildcardClassPath=true

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-19 14:31:17 +02:00
Moritz Eysholdt
ee2d61b332 [textRegionAccess] grammar elements may be TerminalRules
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-10-18 19:54:34 +02:00
Moritz Eysholdt
72f6e48cb1 [ChangeSerializer] fixed spelling mistake
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-10-17 08:37:34 +02:00
Moritz Eysholdt
6bb2edcad3 [ChangeSerializer] added progress monitor, added documentation
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-10-17 08:26:33 +02:00
Moritz Eysholdt
3b7e58e39f me_removed_orphan
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-10-17 08:26:33 +02:00
Karsten Thoms
c387b6ff59 [eclipse/xtext#1129] Automatic changes by Buildship
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-16 23:03:06 +02:00
Jan Koehnlein
3ffea25e43 [releng] export new packages
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
2017-10-13 16:24:30 +02:00