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
4406 commits 41 branches 98 tags 41 MiB
Commit graph

1682 commits

Author SHA1 Message Date
Sebastian Zarnekow
24845d80a5 Merge branch 'master' into me/serializer 2015-10-20 19:09:10 +02:00
Stefan Oehme
df288afc65 fix Bug 480196 2015-10-20 14:37:15 +02:00
Sebastian Zarnekow
2f14516fad [479400] Fixed broken tests and improved Xtext serializer 2015-10-20 13:48:56 +02:00
Stefan Oehme
498ad15dae move project config to its own package 2015-10-20 12:04:19 +02:00
Stefan Oehme
99c0195998 more consistent naming of Generator2 concepts 2015-10-20 11:49:05 +02:00
Sebastian Zarnekow
36c8bbaa8e Merge branch 'master' into me/serializer 2015-10-20 11:38:12 +02:00
Sebastian Zarnekow
51bf8f2298 Merge pull request #704 from eclipse/sz/bug480118 
[480118] Fixed regression in new grammar access fragment
 2015-10-20 09:54:38 +02:00
Stefan Oehme
095ea42b64 [wizard] fix UI tests on mac 2015-10-20 09:23:47 +02:00
Moritz Eysholdt
7cfe0838fc Fixed serialization problem of Xtext.xtext grammar 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-20 00:57:58 +02:00
Moritz Eysholdt
ba31590e76 [serializer] several fixes 
- pass ParserRule-Parameters to Action-based contexts
- fixed an issue with constraint names that could cause duplicate 
  Java method names in the Semanitc Sequencer
- improved names of serialization contexts

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-19 23:55:47 +02:00
Sebastian Zarnekow
b870a30ae6 [480118] Fixed regression in new grammar access fragment 
Not all valid java identifiers are valid in Antlr
action contexts.
 2015-10-19 18:25:30 +02:00
Stefan Oehme
1c750ea53e [wizard] fix test expectations 2015-10-19 17:13:13 +02:00
Stefan Oehme
8e0e6dfe88 only tycho builds need generator dependencies in the exec-plugin 2015-10-19 16:49:18 +02:00
Moritz Eysholdt
b76dcad4c4 Added a test case for a problem when serializing Xtext.xtext 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 18:34:34 +02:00
Moritz Eysholdt
c5f8c186e8 [serializer] improve support for parameterized rule calls 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:30:59 +02:00
Moritz Eysholdt
c3ddd09442 [serializer] removed non-API-methods from ISerializationContext 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
2ee177b976 [Serializer] renamed IContext to ISerializationContext and made it API 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
839ef90393 [JavaFormatting] set max line width to 140 chars 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
d86e9e6442 hooked the FlattenedGrammarAccess before the serializer 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
8e07bfdca6 [serializer] introduce IContext 
Previously, the context was of type EObject which actually was a
ParserRule or assigned Action. 

This refactoring paves the road for more advanced contexts, such
as ParserRules with parameter values.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:53 +02:00
Miro Spönemann
76882898d6 [generator] Implemented adapter for using the new generator in old fragments, 
removed implementation of old serializer fragment

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-10-16 08:19:29 +02:00
Sven Efftinge
1fd8c0bd62 [wizard] fixed broken test expectations 2015-10-15 11:15:13 +02:00
Stefan Oehme
e9d2791194 Merge pull request #687 from eclipse/sz/testProjectNames 
[wizard] Fixed test project names with mvn config
 2015-10-15 10:15:05 +02:00
Sven Efftinge
0b64acd1fa [generator] Simpler language generator configuration for the standard case 2015-10-15 09:19:14 +02:00
Sebastian Zarnekow
16ebeaa4d8 [wizard] Fixed test project names with mvn config 
Also:
- adjusted orion download URI in example
- updated gradle preferences
 2015-10-14 17:17:04 +02:00
Christian Schneider
af8d206769 [xtext generator] Migration of 'ResourceFactoryFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-14 13:41:57 +02:00
Moritz Eysholdt
9356d40776 [serializer] fix 479397#c10: Problem with Grammar Fragment Invocations 
A Grammar fragment invocation does only instantiate the current object
if the current object has not yet been instantiated.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-13 14:26:10 +02:00
Christian Schneider
65408ebc10 [xtext generator] Migration of 'CodetemplateGeneratorFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-13 10:30:44 +02:00
Christian Schneider
f899d90da2 [xtext generator] Migration of 'RefactorElementNameFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-10 12:58:29 +02:00
Stefan Oehme
809efcec75 Merge pull request #661 from eclipse/so_structured_project_config 
[generator2] make XtextProjectConfig more structured
 2015-10-09 18:02:42 +02:00
Moritz Eysholdt
42cbaa0c25 Merge pull request #666 from eclipse/me/bug479397 
[serializer] fixed 479397: compute types of wildcard fragments properly
 2015-10-09 16:04:49 +02:00
Sven Efftinge
b97c52ef39 Merge pull request #665 from eclipse/se/bug476854 
[476854] incremental builder - keep track of outputconfig names per generated file and respect the cleanDerivedResources as well as the overrideExistingResources flag.
 2015-10-09 15:30:04 +02:00
Stefan Oehme
86d26f3d02 Merge remote-tracking branch 'origin/master' into so_structured_project_config 2015-10-09 15:06:18 +02:00
Moritz Eysholdt
02ccb30a82 [serializer] fixed 479397: compute types of wildcard fragments properly 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-09 14:10:38 +02:00
Sven Efftinge
b7d7e05c50 [476854] incremental builder - keep track of outputconfig names per generated file and respect the cleanDerivedResources as well as the overrideExistingResources flag. 2015-10-09 14:06:15 +02:00
Christian Schneider
9e7a88c7c3 [xtext generator] migrated 'CompareFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-09 11:53:22 +02:00
Stefan Oehme
b7004aced8 Merge remote-tracking branch 'origin/master' into so_structured_project_config 
Conflicts:
	plugins/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java
 2015-10-09 10:25:32 +02:00
Stefan Oehme
d817d347dd Merge remote-tracking branch 'origin/master' into so_structured_project_config 2015-10-09 10:06:51 +02:00
Christian Schneider
ce66736691 [xtext generator] Migration of LabelProviderFragment 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-09 09:28:20 +02:00
Stefan Oehme
0237660913 Merge pull request #653 from sailingKieler/aa/quickfixProvider 
[xtext generator] Migration of 'QuickfixProviderFragment'
 2015-10-09 08:31:55 +02:00
Stefan Oehme
11b4324836 Merge pull request #662 from sailingKieler/aa/contentAssistProvider 
[xtend generator] Migration of 'ContentAssistFragment'/'JavaBasedContentAssistFragment'
 2015-10-09 08:30:59 +02:00
Moritz Eysholdt
ce58e99eaa [serializer] re-implemented grammar constraint provider 
It's now based on the NFAs from SemanticSequencerNFAProvider.
Therefore, it will now benefit from all NFA/PDA processing
that's happening up the chain.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-08 20:43:58 +02:00
Christian Schneider
98861a3e65 [xtend generator] Migration of 'ContentAssistFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-08 14:09:09 +02:00
Stefan Oehme
9c561c2bd3 Merge remote-tracking branch 'origin/master' into so_structured_project_config 2015-10-08 13:40:05 +02:00
Stefan Oehme
7df92e3ff4 [generator2] make XtextProjectConfig more structured 2015-10-08 12:29:18 +02:00
Stefan Oehme
513f1462ca Merge pull request #643 from sailingKieler/aa/quickOutlineFragment 
[xtext generator] Migration of the 'QuickOutlineFragment'
 2015-10-08 11:08:09 +02:00
Sebastian Zarnekow
1ad499f4db [479161]: Don’t allow fragments in assignments 2015-10-07 20:50:01 +02:00
Sebastian Zarnekow
319163fb7c Fixed NodeModelUtils wrt to parser rule fragments 2015-10-07 20:48:35 +02:00
Stefan Oehme
8764c05e56 [generator2] provide a simpler alternative to StandaloneSetup 2015-10-07 15:17:14 +02:00
Christian Schneider
76b07340b4 [xtext tests] updated expected 'GenerateMyDsl.mwe2' files checked by 'CliWizardIntegrationTest' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-07 10:18:05 +02:00