Commit graph

1617 commits

Author SHA1 Message Date
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
Sebastian Zarnekow
6dc81b6de6 Fixed StackOverflow in CurrentTypeFinder 2015-09-15 16:11:22 +02:00
Sebastian Zarnekow
f1e7edf42c [477321] Added testcase for Strings.countLineBreaks 2015-09-14 20:36:39 +02:00
akosyakov
24e4c2f209 Removed calls to doGetContents from DerivedStateAwareResourceTest 2015-09-14 17:10:19 +02:00
akosyakov
978cf0b184 Set fullyInitialized to false if installDerivedState has been canceled 2015-09-11 17:17:11 +02:00
akosyakov
46c24d63dd [traces] Skip empty locations 2015-09-10 18:41:43 +02:00
Sebastian Zarnekow
53a0d4a09b [263773] Content assist parser for parameterized parser rules 2015-09-09 18:29:33 +02:00
Sebastian Zarnekow
8a1c72d007 [263773] Refactored Antlr generator
It’s now based on a flattened grammar
2015-09-06 12:45:12 +02:00
Stefan Oehme
604cb9c909 remove antlr splitting from API and delete old copy
also remove duplication in static utilities
2015-08-29 09:24:33 +02:00
Stefan Oehme
20cb460d31 Merge pull request #499 from eclipse/standalone_wizard
XtextGenerator improvements and standalone wizard
2015-08-26 00:08:09 +02:00
Stefan Oehme
191beb7fdf Improved xtext.generator2
- Replaced static state and parameters with dependency injection
- Migrated web and idea fragments to new infrastructure
- all file system access through outlets instead of java.io
2015-08-25 10:50:38 +02:00
Dennis Huebner
82df7c12ce [tests] Failing test - changed expectation needs review Bug 475692
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-08-24 11:36:29 +02:00
Sebastian Zarnekow
f92e0d7195 [263773] Converted flattener to Xtend 2015-08-20 15:39:13 +02:00
Sebastian Zarnekow
8dca8a0596 [263773] More work on the grammar flattener 2015-08-20 14:29:59 +02:00
Sebastian Zarnekow
c9692da216 Merge branch 'master' into sz/xtext_grammar_enhancements 2015-08-20 14:13:25 +02:00
Sebastian Zarnekow
9eed650103 Removed ParseTreeConstructorFragment from test langs
Only kept it for the cases where the PTC was tested
explicitly
2015-08-20 10:54:10 +02:00
Sebastian Zarnekow
70ab3b2602 [263773] Further improvements to grammar flattener 2015-08-20 08:55:31 +02:00
Sebastian Zarnekow
8e1ed7da86 [263773] Continued with flattened grammar approach 2015-08-19 16:36:46 +02:00
Sebastian Zarnekow
07e55a6800 [263773] First steps towards flattened grammar 2015-08-18 16:52:08 +02:00
Sebastian Zarnekow
fb519c29fe Merge branch 'sz/bug394436' into sz/xtext_grammar_enhancements 2015-08-17 16:15:32 +02:00
Sebastian Zarnekow
d52b2b2731 [394436] Fixed URIs and added unit test 2015-08-17 16:09:03 +02:00
Sebastian Zarnekow
7fd786feed [263773] Test cases for context provider 2015-08-17 13:56:20 +02:00
Sebastian Zarnekow
602e351922 [263773] Fixed bug related to fragments in OverriddenValueInspector 2015-08-14 16:05:52 +02:00