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

1639 commits

Author SHA1 Message Date
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
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
Stefan Oehme
3883c3bf86 [wizard] add m2e lifecycle mappings for tycho and buildhelper 2015-10-06 15:12:37 +02:00
Stefan Oehme
609e2c7107 [generator2] directory cleaner that understands XtextProjectConfig 2015-10-06 15:01:34 +02:00
Stefan Oehme
1dbec35330 [wizard] add generator dependencies for plain maven projects 
IDE integration for plain maven is not aware of dependencies that are
only listed in the <plugin> section. So to make the projects usable, we
add the dependencies to the compile classpath. We mark them optional so
they don't get pulled at runtime.
 2015-10-06 10:50:00 +02:00
Stefan Oehme
150e743f00 [wizard] add group and description to jettyRun 2015-10-06 10:24:46 +02:00
Stefan Oehme
0a4f4c60a9 [wizard] use latest xtext-idea-plugin 2015-10-06 10:23:24 +02:00
Moritz Eysholdt
5ce4f91a62 Merge pull request #652 from eclipse/me/move_FlattenedGrammarAccess_to_xtext.xtext 
Me/move flattened grammar access to xtext.xtext
 2015-10-05 16:09:25 +02:00
Moritz Eysholdt
4825c50e78 Merge pull request #651 from eclipse/me/move_RuleName_to_xtext.xtext 
Move class 'RuleNames' to o.e.xtext.xtext
 2015-10-05 15:05:49 +02:00
Stefan Oehme
5c92b49d98 Merge pull request #649 from eclipse/so_maven_clean_task 
[wizard][maven] clean test-src-gen folders
 2015-10-05 14:40:59 +02:00
Stefan Oehme
dc40b98081 Merge pull request #648 from eclipse/so_m2e_buildship_integration 
[wizard] generate m2e/buildship integration
 2015-10-05 14:40:54 +02:00
Moritz Eysholdt
23a90dc931 moved 'FlattenedGrammarAccess' to o.e.xtext.xtext 
This makes it accessible for the serializer

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-05 14:22:35 +02:00
Moritz Eysholdt
71c030d1f9 Move class 'RuleNames' to o.e.xtext.xtext 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-05 14:04:55 +02:00
Stefan Oehme
0befbf41f1 [wizard][maven] clean test-src-gen folders 2015-10-05 11:47:53 +02:00
Stefan Oehme
42e4881ef4 [wizard] fixed test expectations 2015-10-05 11:28:08 +02:00
Moritz Eysholdt
fb3e180f8a added support for grammar fragments and refactored pda providers 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-05 10:53:49 +02:00
Moritz Eysholdt
2b95508568 Make XtextInjectorProvider accessible for all test projects 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-05 09:36:23 +02:00
Stefan Oehme
6752b2a579 fixed test expectation 2015-10-02 17:26:34 +02:00
Stefan Oehme
9c99083366 [wizard] fixed test expectations 2015-10-02 15:03:31 +02:00
Stefan Oehme
354f9404b6 [wizard/generator] expose project names in XtextProjectConfig 2015-10-01 14:41:21 +02:00
Stefan Oehme
f3244b7f26 [wizard] fixed test expectations 2015-10-01 12:05:46 +02:00
Stefan Oehme
8a5681c61a [wizard] make sure noone accidently adds old asm dependency 2015-09-30 11:16:17 +02:00
Stefan Oehme
5e6dae5c5c [wizard] add maven/idea upload tasks 
this way, users only need to insert their repository URLs to upload
their language artifacts to a Maven repository
 2015-09-30 11:16:14 +02:00
Stefan Oehme
f6f513de79 [wizard] let generated projects use latest idea eap 2015-09-29 17:57:41 +02:00
Stefan Oehme
0455b188ff make intellij recognize the ideaProvided dependencies 2015-09-29 14:51:18 +02:00
Dennis Huebner
eb2fac4f97 Bug 478040 - [api] We need a way to obtain the current versions we use 
to generate build files

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-09-28 15:15:48 +02:00
Dennis Huebner
45e8153cee [wizard] Plugin repository entry in generated pom. Fixed test 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-09-28 09:49:57 +02:00
Sebastian Zarnekow
64e08e5d0a Merge pull request #625 from eclipse/sz/xtext_grammar_enhancement 
Fixed validation of actions in fragments
 2015-09-24 10:52:25 +02:00
Stefan Oehme
d2669e2e03 include xbase.web dependency by default 
This way, users can upgrade to using Xbase without touching their
buildscripts. Users who are very build performance aware can easily
remove it.
 2015-09-23 21:47:47 +02:00
Sebastian Zarnekow
954a4867cd Fixed validation of actions in fragments 
Added test
 2015-09-23 14:01:54 +02:00
Sebastian Zarnekow
1172ee9b63 Improved syntactic predicates 
Allow nesting of ‘normal’ and ‘first-set’ predicates
to fine tune the lookahead, e.g.

=>(name=ID ->child=SomeComplexRule)

allows to define a predicate that will only look
two tokens ahead: the ID token followed by one of
the elements of the first-set of SomeComplexRule
 2015-09-22 18:26:52 +02:00
Sebastian Zarnekow
fd6e3a9465 Allow fragments to be used in predicates 2015-09-22 18:24:57 +02:00
Sebastian Zarnekow
1979cd93c9 Disallow actions in parser rule fragments 2015-09-22 18:24:55 +02:00
Sven Efftinge
072db655a5 Merge pull request #613 from eclipse/se/bug477683 
[477683] Xtext/IDEA - only report syntax errors and broken links to rules and grammars
 2015-09-22 09:04:45 +02:00
Stefan Oehme
5b3d0c0f3d Merge pull request #509 from eclipse/so_remove_splitting_from_api 
Deduplicate code between new and old generator
 2015-09-21 11:39:43 -04:00
Sven Efftinge
c2f1c09313 [477683] Xtext/IDEA - only report syntax errors and broken links to rules and grammars 2015-09-21 17:15:23 +02:00
Dennis Huebner
5905bd3491 [misc] Eclipse Modeling Project -> Eclipse Xtext 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-09-21 11:25:16 +02:00
Stefan Oehme
0b58d550e7 [wizard] integration test for project generation 
This test generates the five most important wizard configurations. It
makes sure that the output is exactly as expected.

Once we have a Beta release, we can build these examples as part of our
tests and make sure they work.
 2015-09-18 22:53:56 +02:00
Stefan Oehme
95e110932d Merge remote-tracking branch 'origin/master' into 
so_remove_splitting_from_api

Conflicts:
	plugins/org.eclipse.xtext.generator/META-INF/MANIFEST.MF
	plugins/org.eclipse.xtext.generator/plugin.xml_gen
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/AntlrOptions.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/splitting/AntlrLexerSplitter.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/splitting/internal/LexerSpecialStateTransitionSplitter.java
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.xtend
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.xtend
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java
	plugins/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.java
	plugins/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.java
	tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
 2015-09-18 20:42:08 +02:00
Stefan Oehme
f859022dc3 [wizard] use Java 6 source/target level 2015-09-18 19:29:58 +02:00
Stefan Oehme
fb35f7caaf [wizard] use ui harness for ui plugin tests, don't fail on missing tests 2015-09-18 19:29:55 +02:00
Sebastian Zarnekow
ffba673dcc Regenerated test languages 2015-09-18 15:01:46 +02:00
Stefan Oehme
f027d7dafa fixed formatting 2015-09-18 04:21:24 +02:00
Stefan Oehme
dd866a21a3 [wizard] tests for the WizardConfiguration 2015-09-18 04:14:49 +02:00