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
79a012e574
Some null guards
2015-09-18 16:43:16 +02:00
Sebastian Zarnekow
ffba673dcc
Regenerated test languages
2015-09-18 15:01:46 +02:00
Sven Efftinge
675c77f4f1
[xbase] regenerated with latest generator changes
2015-09-18 14:04:58 +02:00
akosyakov
d1ccbe3609
Use OperationCanceledManager to check a cancelIndicator
2015-09-18 13:48:28 +02:00
Sven Efftinge
9203da64b0
Merge pull request #602 from eclipse/sz/grammar_gen_options
...
Several changes in Antlr generator and generator2
2015-09-18 11:35:46 +02:00
Dennis Huebner
c62586427d
[idea] Fixed NPE. Facet may be missing at this point
...
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-18 11:31:16 +02:00
Sebastian Zarnekow
2559c0319d
Write valid manifest files
2015-09-18 11:12:03 +02:00
Sebastian Zarnekow
099803452a
Don’t write empty plugin.xml_gen, use proper encoding in plugin.xml
2015-09-18 10:33:48 +02:00
Sebastian Zarnekow
f256e58ce7
Obtain PluginXmlAccess and ManifestAccess from injector
2015-09-18 10:33:25 +02:00
Sebastian Zarnekow
4ed3cb5429
Make sure written manifest is valid and consistent
2015-09-18 10:23:33 +02:00
Sebastian Zarnekow
d9db109f22
Eliminate redundant code and thereby reduce size of generated parser
2015-09-18 10:23:11 +02:00
Sven Efftinge
7b94dee4e9
[generator] fixed wrong escaping
2015-09-18 08:18:59 +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
Stefan Oehme
1779e412c4
[wizard] handle inlined test projects with Gradle
2015-09-17 17:24:21 +02:00
Miro Spönemann
0116d37f84
[generator][web] Added check for existing files (the webApp outlet is configured as overwriting)
...
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-17 16:21:37 +02:00
Miro Spönemann
bae240981b
[web] Added special handling of keywords that are not found by the word boundary matcher \b
...
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-17 15:17:49 +02:00
Miro Spönemann
51fd8f3e5b
[web] Fixed content assist for Orion:
...
having an 'int' property in a JSON object means the default value is zero
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-17 10:49:41 +02:00
Miro Spönemann
9c24316ae9
[generator] Added escape characters for Jar pattern
...
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-17 09:33:38 +02:00
Stefan Oehme
5661bc52d6
[generator] fix test code location for maven layout
2015-09-17 08:01:08 +02:00
Stefan Oehme
91b597e45b
[wizard] fix idea.assembleSandbox for maven layout
2015-09-16 20:50:04 +02:00
Stefan Oehme
3ca9a3e845
don't overwrite the main project's file when inlining a test project
2015-09-16 20:42:44 +02:00
Stefan Oehme
ca99acbdfe
[wizard] correctly include source folders when using Maven layout
2015-09-16 20:37:54 +02:00
Stefan Oehme
1c9848a57f
[wizard] stable order for dependencies
2015-09-16 19:05:39 +02:00
Stefan Oehme
c3ea2ee4d0
add missing dependencies to xtext.junit4 pom.xml
2015-09-16 19:03:04 +02:00
Stefan Oehme
ed4741f606
[wizard] exclude plugin projects from gradle classpath generation
2015-09-16 19:01:26 +02:00
Stefan Oehme
8b7419fc96
fix web project deployment to tomcat
...
- an overly generous container_jar_pattern can lead to exceptions when
scanning certain classpath entries
- we want to have log4j packaged in the war of the web project, so it
runs without futher configuration on a standard servlet container like
tomcat
2015-09-16 18:57:12 +02:00
Stefan Oehme
c79815ab21
Merge pull request #578 from eclipse/so_maven_eclipse_layout
...
[wizard] allow combination of plain Maven and Eclipse source layout
2015-09-16 11:33:45 -04:00
Sebastian Zarnekow
dda55ea555
Added option to discard unused rules
2015-09-16 17:20:25 +02:00
Sven Efftinge
53f29913b4
Merge pull request #589 from eclipse/se/bug477433
...
[477433] register IContentAssistParser in idea module
2015-09-16 16:22:02 +02:00
Sven Efftinge
abf3f8a4b9
[477433] register IContentAssistParser in idea module
2015-09-16 16:14:33 +02:00
Miro Spönemann
8fe4a5468d
[web] Added an option to generate a web.xml so the examples can be run on older servlet containers
...
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-16 16:10:55 +02:00
Jan Köhnlein
5627f8cb20
Merge pull request #585 from eclipse/jk/xtend_generator
...
Jk/xtend generator
2015-09-16 15:31:37 +02:00
Sven Efftinge
08724f610e
[477559] fixed bug 477559
2015-09-16 14:43:31 +02:00
Jan Koehnlein
eb5606a324
[idea][generator] re-added documentation provider
2015-09-16 13:34:28 +02:00
Sven Efftinge
5f22f7c7cb
[generator] removed WebServletAnnotation
2015-09-16 11:06:13 +02:00
Stefan Oehme
eaf0e4eb6e
[generator] fix Junit4Fragment2
2015-09-16 10:31:23 +02:00
Sven Efftinge
6826d977a3
[generator] some introduced GeneratedJavaFileAccess, to simplify the generated-once cases. Added overloaded methods for creating files.
2015-09-16 09:46:49 +02:00
Sven Efftinge
a859546836
[generator] fixed merge conflict
2015-09-16 08:01:20 +02:00
Sven Efftinge
6bee3b7fcf
[generator] generate xtend source to src/ (part one)
...
With this change the generated-once modules and setups will be in Xtend.
2015-09-16 07:49:30 +02:00
Stefan Oehme
7af4d0ceb1
[wizard] allow combination of plain Maven and Eclipse source layout
2015-09-15 22:00:55 +02:00
Stefan Oehme
22e68db123
Merge pull request #577 from eclipse/so_generator_improvements
...
More generator improvements
2015-09-15 15:55:15 -04:00
Stefan Oehme
5eada786f4
fix locations for injectorprovider and example test
2015-09-15 21:46:27 +02:00
Stefan Oehme
21b2d5981b
[wizard] don't create tycho build when Eclipse build was selected
2015-09-15 19:13:10 +02:00
Stefan Oehme
fe6a572928
Bug 477473 - don't overwrite IDEA plugin.xml
2015-09-15 19:11:54 +02:00
Stefan Oehme
c3f7b03057
[wizard][generator] split test projects
2015-09-15 19:11:08 +02:00
