Commit graph

4514 commits

Author SHA1 Message Date
Stefan Oehme
ea92173b37 Merge pull request #700 from sailingKieler/aa/grammarComparison
Contribution of 'XtextAntlrGeneratorComparisonFragment' + '...Test'
2015-10-21 08:48:35 +02:00
Stefan Oehme
310e88ab8b [generator 2] standardize stub-generating fragments 2015-10-21 08:39:57 +02:00
Moritz Eysholdt
6b88799f19 [serializer] only check parameters when needed
only check the value of parameters when the same context eobject maps to
different constraints. 

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-20 23:49:22 +02:00
Sebastian Zarnekow
e4f2c37d9d Reduce code size of generated sequencer 2015-10-20 21:39:39 +02:00
Moritz Eysholdt
77e153e61a [serializer] check value ranges properly to determine context
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-20 21:34:30 +02:00
Sebastian Zarnekow
24845d80a5 Merge branch 'master' into me/serializer 2015-10-20 19:09:10 +02:00
Stefan Oehme
ce487deaf9 [generator2] pass line separator to file system access 2015-10-20 17:36:20 +02:00
Stefan Oehme
2fa1b6869e Merge pull request #713 from eclipse/so_generator_improvements
[generator2] remove commented imports
2015-10-20 16:45:31 +02:00
Sebastian Zarnekow
8c9115a994 Merge pull request #712 from eclipse/sz/grammarGenFixes
Fixed a few things in the Antlr generators
2015-10-20 16:40:30 +02:00
Sebastian Zarnekow
6249d5121e Double escape unicode escape sequences 2015-10-20 16:38:58 +02:00
Sven Efftinge
54eb9880f9 Merge pull request #709 from eclipse/se/projectConfigAdapter_install
made ProjectConfigAdapter constructor protected and changed all callers to use ProjectConfigAdapter#install
2015-10-20 16:38:43 +02:00
Stefan Oehme
465d8efecf Merge pull request #710 from eclipse/so_generator_improvements
Renamings and API shrinking for new Generator
2015-10-20 16:34:44 +02:00
Stefan Oehme
7b83ef68f1 [generator2] remove commented imports 2015-10-20 15:59:02 +02:00
Sebastian Zarnekow
6cec69e73d Merge branch 'sz/grammarGenFixes' into me/serializer 2015-10-20 15:35:45 +02:00
Sebastian Zarnekow
18d41a890a Fixed a few things in the Antlr generators 2015-10-20 15:33:48 +02:00
Sebastian Zarnekow
93e75d5658 API filters 2015-10-20 15:26:00 +02:00
Stefan Oehme
df288afc65 fix Bug 480196 2015-10-20 14:37:15 +02:00
Stefan Oehme
d4a6249bcf narrow down API of Generator2 to the essentials 2015-10-20 14:28:57 +02:00
Christian Schneider
34576c8da3 [antlr grammar comparison] more refactoring and polishing in the grammar comparison classes
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 14:27:25 +02:00
Sven Efftinge
cad20c26ae made ProjectConfigAdapter constructor protected and changed all callers to use ProjectConfigAdapter#install 2015-10-20 13:59:56 +02:00
Sven Efftinge
bd5a38428d Merge pull request #706 from eclipse/se/ishouldgenerate_uses_projectconfig
[builder] IShouldGenerate uses ProjectConfig
2015-10-20 13:52:37 +02:00
Sven Efftinge
7b45c20a69 [builder] IShouldGenerate uses ProjectConfig 2015-10-20 13:52:13 +02:00
Sebastian Zarnekow
2f14516fad [479400] Fixed broken tests and improved Xtext serializer 2015-10-20 13:48:56 +02:00
Stefan Oehme
16fe7c487d mark MweIssues package private 2015-10-20 13:43:42 +02:00
Stefan Oehme
2451062e0b split SubProjectConfig classes into separate files 2015-10-20 12:10:12 +02:00
Sven Efftinge
c0102a3b3d [480136] generated proposal provider should inherit from TerminalsProposalProvider 2015-10-20 12:06:14 +02:00
Stefan Oehme
498ad15dae move project config to its own package 2015-10-20 12:04:19 +02:00
Stefan Oehme
99c0195998 more consistent naming of Generator2 concepts 2015-10-20 11:49:05 +02:00
Sebastian Zarnekow
36c8bbaa8e Merge branch 'master' into me/serializer 2015-10-20 11:38:12 +02:00
Christian Schneider
9b91477282 [antlr grammar comparator] renamed error handler's method 'handleUnexpectedCharSequence' into 'handleInvalidGrammarFile'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 11:35:46 +02:00
Stefan Oehme
8898f31ae5 Merge pull request #701 from sailingKieler/aa/validatorNaming
[xtext generator] Extracted the composition of the generated validator classes' names
2015-10-20 10:32:37 +02:00
Stefan Oehme
0d01cdead3 add return type on public signatures
Hotfix for failing job at
https://hudson.eclipse.org/xtext/job/xtext-xtend/2846/
2015-10-20 10:31:35 +02:00
Christian Schneider
eb50e1a6c4 [xtext generator] Extracted the composition of the generated validator classes' names from 'ValidatorFragment2' to 'ValidatorNaming', updated 'QuickfixProviderFragment2' correspondingly.
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 10:19:37 +02:00
Christian Schneider
3ce87a3372 [xtext generator] fixed mistakes caused by the merge and in logic of 'AntlrGrammarComparator', comparisonFragment, and 'AntlrGrammarComparatorTest'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-20 10:01:06 +02:00
Sebastian Zarnekow
51bf8f2298 Merge pull request #704 from eclipse/sz/bug480118
[480118] Fixed regression in new grammar access fragment
2015-10-20 09:54:38 +02:00
Stefan Oehme
095ea42b64 [wizard] fix UI tests on mac 2015-10-20 09:23:47 +02:00
Sven Efftinge
fc402980e4 Merge pull request #703 from eclipse/se/removed_workspace_config
removed the concept of a workspace config. A resource set is always built from the scope of a project (module in IDEA)
2015-10-20 09:12:15 +02:00
Moritz Eysholdt
7cfe0838fc Fixed serialization problem of Xtext.xtext grammar
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-20 00:57:58 +02:00
Moritz Eysholdt
ba31590e76 [serializer] several fixes
- pass ParserRule-Parameters to Action-based contexts
- fixed an issue with constraint names that could cause duplicate 
  Java method names in the Semanitc Sequencer
- improved names of serialization contexts

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-19 23:55:47 +02:00
Sebastian Zarnekow
b870a30ae6 [480118] Fixed regression in new grammar access fragment
Not all valid java identifiers are valid in Antlr
action contexts.
2015-10-19 18:25:30 +02:00
Stefan Oehme
5f28f53828 fix exported packages for content assist parser 2015-10-19 17:18:51 +02:00
Stefan Oehme
1c750ea53e [wizard] fix test expectations 2015-10-19 17:13:13 +02:00
Stefan Oehme
fce22b4f4f [wizard] removed the need for auto-inject in generated workflows 2015-10-19 17:10:06 +02:00
Stefan Oehme
5fdafadfb8 infer grammarUri from language name
This removes the need to repeat the project name and src folder path in
the mwe2 workflow
2015-10-19 17:08:38 +02:00
Stefan Oehme
702cc44d92 [wizard] remove old AntlrUiGeneratorFragment 2015-10-19 16:51:35 +02:00
Stefan Oehme
8e0e6dfe88 only tycho builds need generator dependencies in the exec-plugin 2015-10-19 16:49:18 +02:00
Sven Efftinge
3b0a871218 renamed some more workspaceConfig variables 2015-10-19 16:43:56 +02:00
Sven Efftinge
df6c204eb6 removed the concept of a workspace config. A resource set is always built from the scope of a project (module in IDEA) 2015-10-19 16:43:56 +02:00
Stefan Oehme
5d4ffe26ab [wizard] ecore model is always in model/generated 2015-10-19 16:35:50 +02:00
Christian Schneider
5106898fb2 Merge remote-tracking branch 'origin/master' into genFrag/grammarComparison
Conflicts:
	plugins/org.eclipse.xtend.core/src/org/eclipse/xtend/core/GenerateXtend.mwe2
	plugins/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java

manually fixed
2015-10-19 16:11:54 +02:00