sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 16:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5998 commits 41 branches 98 tags 41 MiB
Commit graph

5998 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Christian Dietrich
a6bdd6775c Merge pull request #504 from eclipse/cd_core_issue501 
widened version range for asm to include version 6
 2017-10-13 14:24:44 +02:00
Christian Dietrich
5f2b37de0f widened version range for asm to include version 6 https://github.com/eclipse/xtext-core/issues/501 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-13 10:32:42 +02:00
Miro Spönemann
ca03a63881 Merge pull request #496 from eclipse/msp_lsp4jUpdate 
Updated LSP4J to version 0.3
 2017-10-12 09:51:52 +02:00
Moritz Eysholdt
5c293fb6c4 Made another value converter null-safe 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-12 09:50:46 +02:00
Moritz Eysholdt
309d354e57 [ChangeSerializer] fixed potential NPEs 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-11 20:33:32 +02:00
Moritz Eysholdt
d68ca48a55 Fix an NPE during ValueConversion of xtext.xtext.GrammarID 
java.lang.NullPointerException: null
	at
org.eclipse.xtext.xtext.XtextValueConverters$1.internalToValue(XtextValueConverters.java:44)
	at
org.eclipse.xtext.xtext.XtextValueConverters$1.internalToValue(XtextValueConverters.java:40)
	at
org.eclipse.xtext.conversion.impl.AbstractNullSafeConverter.toValue(AbstractNullSafeConverter.java:31)
	at
org.eclipse.xtext.conversion.impl.AbstractDeclarativeValueConverterService.toValue(AbstractDeclarativeValueConverterService.java:79)
	at
org.eclipse.xtext.ide.serializer.impl.ReferenceUpdater.getQualifiedName(ReferenceUpdater.java:124)
	at
org.eclipse.xtext.ide.serializer.impl.ReferenceUpdater.needsUpdating(ReferenceUpdater.java:146)
	at
org.eclipse.xtext.ide.serializer.impl.ReferenceUpdater.update(ReferenceUpdater.java:172)
	at
org.eclipse.xtext.ide.serializer.impl.RecordingXtextResourceUpdater.applyChange(RecordingXtextResourceUpdater.java:70)
	at
org.eclipse.xtext.ide.serializer.impl.ChangeSerializer.endRecordChanges(ChangeSerializer.java:136)
	at
org.eclipse.xtext.ide.serializer.impl.ChangeSerializer.applyModifications(ChangeSerializer.java:75)
	at
org.eclipse.xtext.ui.editor.quickfix.WorkbenchMarkerResolutionAdapter$1.lambda$1(WorkbenchMarkerResolutionAdapter.java:131)
	at java.util.LinkedHashMap.forEach(LinkedHashMap.java:684)
	at
org.eclipse.xtext.ui.editor.quickfix.WorkbenchMarkerResolutionAdapter$1.execute(WorkbenchMarkerResolutionAdapter.java:139)
	at
org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106)
	at
org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2313)
	at
org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118)
	at
org.eclipse.xtext.ui.editor.quickfix.WorkbenchMarkerResolutionAdapter.run(WorkbenchMarkerResolutionAdapter.java:142)
	at
org.eclipse.xtext.xtext.ui.editor.quickfix.XtextGrammarQuickfixProviderTest.assertAndApplyAllResolutions(XtextGrammarQuickfixProviderTest.java:172)
	at
org.eclipse.xtext.xtext.ui.editor.quickfix.XtextGrammarQuickfixProviderTest.testFixAllEmptyEnumLiteral(XtextGrammarQuickfixProviderTest.java:106)

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-11 19:02:45 +02:00
Moritz Eysholdt
6c671f9aaf [ChangeSerializer] update references with FQNs and semi-FQNs properly 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-11 14:54:40 +02:00
Moritz Eysholdt
85f07a23c0 [textRegionAccess] make accessing EStructuralFeatures easier 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-11 14:54:40 +02:00
Karsten Thoms
5b82812b2b Merge pull request #491 from eclipse/kth_bug525746 
[525746] Lower bound constraint for Xbase / Xtend libraries
 2017-10-11 10:24:07 +02:00
Miro Spönemann
cb7d6b6ac0 Updated LSP4J to version 0.3 2017-10-11 10:22:30 +02:00
Moritz Eysholdt
1f724e515c [ChangeSerializer] added more guards 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-10 15:29:48 +02:00
Moritz Eysholdt
d75041ac7d [ChangeSerilizer] don't NPE on broken ReferenceDescriptions 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-10 15:29:48 +02:00
Karsten Thoms
5b7f5ecf90 [525746] Set Xbase/Xtend lib lower version constraint 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-09 21:39:12 +02:00
Karsten Thoms
0e7772e469 [525746] Extended runtime project config 
- added getXbaseLibVersionLowerBound
- added getXtendLibVersionLowerBound

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-09 12:32:26 +02:00
Karsten Thoms
1ecb623d5f [525746] Set lower bound for org.eclipse.xtext.xbase.lib 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-09 12:29:55 +02:00
Sebastian Zarnekow
dafde22993 Incorporated review feedback 2017-10-06 09:53:25 +02:00
Christian Dietrich
81df41e85b removed unused imports 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-05 08:26:22 +02:00
Karsten Thoms
331984300e Merge pull request #477 from eclipse/kth_regen_testlang 
Regenerated test languages
 2017-10-04 11:52:16 +02:00
Karsten Thoms
3ad85574b6 Regenerated test languages 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-03 13:54:32 +02:00
Jan Koehnlein
08ab8fe119 GH-488 fixed DefaultReferenceDescription test 
We need the fragment path URIs in the renam scenario only

Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-10-02 20:56:19 +02:00
Jan Koehnlein
ded0ce36de GH-487 reverted TypeReference change and fixed usage in RefactorElementNameFragment2 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-10-02 20:56:11 +02:00
Christian Dietrich
60a079fe75 ignored DefaultReferenceDescriptionTes #488 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-02 20:34:33 +02:00
Christian Dietrich
ff889c133f ignored failing tests #487 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-02 20:23:15 +02:00