Commit graph

4514 commits

Author SHA1 Message Date
Christian Schneider
7bcf17f188 [xtext generator] added missing dependency addition in 'CompareFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-13 10:45:55 +02:00
Christian Schneider
33a403f811 [xtext generator] Improved 'CodetemplatesGeneratorFragment' as suggested in review.
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-13 10:41:40 +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
Sebastian Zarnekow
d24b726190 Merge branch 'master' into sz/contentAssistParserFix 2015-10-13 10:25:20 +02:00
Christian Schneider
01d79495b7 [xtext generator] upgraded 'GeneratedJavaFileAccess' to expect the 'typeComment' as a 'StringConcatenationClient' and process imports of referenced classes. The generated Java files affected by this change are amended.
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-13 10:10:56 +02:00
Stefan Oehme
a08900580a add convenience overloads for suppresWarnings/normalizeLineDelimiters 2015-10-13 10:10:34 +02:00
Stefan Oehme
c0beee80a8 [generator2] add option to generate a debug grammar 2015-10-13 09:55:12 +02:00
Stefan Oehme
866357397b Merge pull request #671 from sailingKieler/aa/duplicateImports
[xtext generator] added removal of duplicate imports in 'JavaFileAccess', …
2015-10-12 17:45:09 +02:00
Christian Schneider
ff36f75788 [xtext generator] added removal of duplicate imports in 'JavaFileAccess', resolved code clone in 'GeneratedJavaFileAccess'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-12 16:03:35 +02:00
Stefan Oehme
b531f7e682 Merge pull request #670 from sailingKieler/aa/refactorElementName
[xtext generator] Migration of 'RefactorElementNameFragment'
2015-10-12 15:56:26 +02:00
Christian Schneider
77599af0cc [xtext generator] switched to 'fileAccessFactory.createGeneratedJavaFile' at generation of 'Abstract...ProposalProvider', refactored template correspondingly, removed unwelcome comments
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-12 15:35:58 +02:00
Christian Schneider
a4ddde5c10 [xtext generator] Minor improvement in 'ContentAssistFragement2' (replaced a usage of hashSet by arrayList to avoid ordering changes in generated code)
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-12 14:52:01 +02:00
Stefan Oehme
ba81f62983 Merge branch 'master' into so_antrl_generator_fragment 2015-10-12 11:34:44 +02:00
Stefan Oehme
8dc3fbdf50 fix NPE on wizard subproject configuration 2015-10-12 11:27:25 +02:00
Sven Efftinge
1c23640e39 Merge pull request #667 from eclipse/se/LexerBasedConverterJustWarns
The AbstractLexerBasedConverter might have been used with parser rules in the past. We need to be more forgiving with those cases.
2015-10-12 08:18:13 +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
Sebastian Zarnekow
88485b1a18 Avoid announcing EOF if it wasn’t EOF so far.
This bug was detected in a complex project and thus far
I couldn’t reduce it to a minimal example. That’s why
this fix lacks a test right now.
2015-10-09 22:50:32 +02:00
Stefan Oehme
417a45e5b9 Merge branch 'master' into so_antrl_generator_fragment
Conflicts:
	plugins/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java
	plugins/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXbaseUiModule.java
	plugins/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXtypeUiModule.java
2015-10-09 18:30:46 +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
Sven Efftinge
56e0e7e375 The AbstractLexerBasedConverter might have been used with parser rules in the past. We need to be more forgiving with those cases. 2015-10-09 16:25:53 +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
812392ff89 update compare fragment to new API 2015-10-09 15:08:35 +02:00
Stefan Oehme
86d26f3d02 Merge remote-tracking branch 'origin/master' into so_structured_project_config 2015-10-09 15:06:18 +02:00
Stefan Oehme
0ddcec41c9 add missing @since tags 2015-10-09 14:38:59 +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
0b0566a38a make *Access classes customizable 2015-10-09 11:24:57 +02:00
Stefan Oehme
9a195a4ca8 adjust fragments to changes in projectConfig API 2015-10-09 10:29:09 +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
Stefan Oehme
17bf232597 Merge remote-tracking branch 'origin/master' into so_antrl_generator_fragment
Conflicts:
	plugins/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
2015-10-09 10:04:32 +02:00
Stefan Oehme
2d3edf27ee translate XtextAntlrGeneratorFragment 2015-10-09 09:33:01 +02:00
Christian Schneider
ec73ec8ae4 [xtext generator] improved 'LabelProviderFragment2' as suggested in review
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-09 09:28:20 +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
e4f8bf4a97 [xtend generator] improvement of the 'ContentAssistFragment2' as suggested in review
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-08 16:15:54 +02:00
Christian Schneider
8f52d3adf6 [xtext generator] improved 'QuickfixProviderFragment2' as suggested in review
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-08 15:20:01 +02:00
Stefan Oehme
dab34de485 renamed files to match type names 2015-10-08 14:48:12 +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
016b3567fd adapt quickoutline fragment to new project config 2015-10-08 13:41:13 +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
Christian Schneider
779f30fac9 [xtext generator] fixed nasty mistake in class name composition in new QuickfixProviderFragment2
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-08 08:55:36 +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