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

4265 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stefan Oehme
0d2e953795 [generator2] move implicit runtime/ui code to own class 2015-10-07 11:47:15 +02:00
Stefan Oehme
da891708b0 [generator2] remove idea specific code from generic antlr generator 2015-10-07 11:00:17 +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
Christian Schneider
d2decd2c84 Re-added lost 'auto-inject' in the project wizard's workflow template to call of 'OutlineTreeProviderFragment2' (related to #641, c064033e22973955dfae969680cbdec5efe1d808) 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-07 10:11:22 +02:00
Christian Schneider
c2e0ad7397 [xtext generator] migrated 'QuickOutlineFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-07 10:11:20 +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
Stefan Oehme
7594456e64 Merge pull request #656 from eclipse/so_fix_xbase_generator 
set rootpath and basename in GenerateXbase
 2015-10-06 09:11:24 +02:00
Stefan Oehme
66cde8ea28 set rootpath and basename in GenerateXbase 
also add a validation so that this doesn't go unnoticed again
 2015-10-06 08:47:58 +02:00
Stefan Oehme
d21cbe1da1 Merge pull request #655 from eclipse/so_fix_generator_bundlename 
[generator 2] fix manifest bundle name
 2015-10-05 18:00:43 +02:00
Stefan Oehme
7bc3cccf1b [generator 2]fix manifest bundle name 2015-10-05 16:53:26 +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
Stefan Oehme
5a64d76ee0 Merge pull request #647 from eclipse/so_fix_container_jar_pattern 
make container_jar_pattern more restrictive
 2015-10-05 14:40:37 +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
Stefan Oehme
eb00888154 make container_jar_pattern more restrictive 2015-10-05 11:19:36 +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
Stefan Oehme
31bdc4f9a4 [wizard] generate m2e/buildship integration 2015-10-05 10:20:36 +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
4d064aa885 Merge pull request #644 from eclipse/so_remove_naming_setters 
[generator2] remove package setters from naming
 2015-10-03 23:35:32 +02:00
Sven Efftinge
c62b28a5f3 Merge pull request #641 from sailingKieler/cs/generatorFragments/OutlineTreeProvider 
[xtext generator] Migration of the 'OutlineTreeProviderFragment'
 2015-10-02 22:20:46 +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
ef5b19b6a3 [generator2] remove package setters from naming 2015-10-02 14:39:47 +02:00
Dennis Huebner
cddb1b10de [web] Fixed typos 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-10-02 13:52:18 +02:00
Stefan Oehme
e58e4b4fb6 Merge pull request #640 from eclipse/so_improve_xtextprojectconfig 
[wizard/generator] expose project names in XtextProjectConfig
 2015-10-02 13:34:17 +02:00
Stefan Oehme
fa6e2f0c58 Merge remote-tracking branch 'origin/master' into so_improve_xtextprojectconfig 
Conflicts:
	plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
	plugins/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
 2015-10-02 13:10:53 +02:00
Stefan Oehme
73bff184ff Back to snapshot development 2015-10-02 11:29:58 +02:00
Stefan Oehme
d0c24c3f1c Merge pull request #638 from eclipse/so_wizard_improvements 
Fix jar/war contents for plain Maven/Gradle build
 2015-10-02 11:28:11 +02:00
Christian Schneider
2ae64ef6ec [xtext generator] migrated OutlineTreeProviderFragment 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-02 10:32:13 +02:00
Dennis Huebner
c209e3c590 [releng] Prepare beta5 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-10-02 08:23:11 +02:00
Stefan Oehme
cccde266c9 Merge branch 'master' into so_wizard_improvements 
Conflicts:
	plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
	plugins/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
 2015-10-01 15:35:45 +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
Sven Efftinge
297ca7a0c5 [wizard] reverted to old EMFFragment 2015-10-01 11:44:21 +02:00
Stefan Oehme
0c79111b47 [maven] remove unused icu4j dependency (10mb!) 
Icu4j is only used in the Generator and UI. But up until now it was
pulled in by xtext runtime.
 2015-10-01 11:02:38 +02:00