Commit graph

1737 commits

Author SHA1 Message Date
Moritz Eysholdt
8d293ae59b [formatter#480737] improve FormatterFragment.
This incorporates two changes:
- for the generate-once stub, the formatter will only generate 
  methods for the first two EClasses. Generating more will most
  likely create code that breaks the next time the grammar is changed.
- have a generic _format(EObject) method in AbstractFormatter2 that 
  does nothing but invoke the formatter-dispatch-method for all
  direct children of the EObject.
  
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=480737

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-06 09:45:32 +01:00
Dennis Huebner
c5cad0b011 [wiz-cli] Fixed tests expectation
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-05 10:59:38 +01:00
Dennis Huebner
f3794061b0 [wizard] Added info message for Idea Project + No build system
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-02 16:08:43 +01:00
Moritz Eysholdt
d966f49af8 [serializer] fixed an NPE
An immutable StackItem (implemented as linked list) that falls back to
an Iterator (which is mutable) really was a bug waiting to happen.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=479400#c5

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-29 16:55:53 +01:00
Dennis Huebner
805bc4cf9b [mvn] Fixed Xtext-maven-plugin tests failure
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-29 15:19:13 +01:00
Stefan Oehme
4ed1dd7851 [478873] don't delete source folders on mvn clean 2015-10-29 14:21:07 +01:00
Stefan Oehme
7818a7a88b updated xtend-gradle version 2015-10-29 14:21:05 +01:00
Dennis Huebner
1ef5f24cac [wizard] Fixed test expectation
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-29 14:05:59 +01:00
Christian Schneider
cd118f791f [build config] integrated '...testlanguages.ide' into tycho build, added it to '...xtext.tests.feature'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-28 13:40:39 +01:00
Christian Schneider
9d6714ddaa [xtext.testlanguages] review of all out-dated, moved, and newly generated classes in the runtime project, switched consistently to generation of java instead of Xtend code except for the formatter(2) stub
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-28 11:19:46 +01:00
Christian Schneider
1ca571c362 [xtext.testlanguages] movement of antlr content assist stuff from .ui to .ide project 2015-10-28 11:19:44 +01:00
Christian Schneider
3df4e63644 [xtext.testlanguages] movement of the (generated) ecore+genmodels 2015-10-28 11:19:33 +01:00
Christian Schneider
b00eafb18c [xtext.testlanguages] reviewed changes after re-generation of implementations with new generator infrastructure
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-28 11:18:25 +01:00
Christian Schneider
6eb85696f3 [xtext.testlanguages] introduced required '...testlanguages.ide' project, added gradle build configuration, updated '...xtext.testlanguages.idea's build config
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-28 11:18:22 +01:00
Christian Schneider
e117f70ace [xtext.testlanguages] migrated 'GenerateTestLanguages.mwe2' and
referenced '[...]BeeLangTest....mwe2' + 'NoJdtTestLanguage.mwe2' language definitions, configured request of Java stubs, deactivated grammar separation for IDEA in 'PsiGrammarNaming'; removed dependency to '...xtext.generator' (moved it to build.properties' additional.bundles declaration)

Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-28 11:18:15 +01:00
Dennis Huebner
f167ed5da5 Adjusted test expectation
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-27 16:23:04 +01:00
Dennis Huebner
e6f3149799 [wizard] Add a possibility to materialize gradle-wrapper
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-27 16:03:57 +01:00
Dennis Huebner
cd76972135 [mvn] Workaround for "Tycho treats optional dependencies as required"
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-27 11:42:52 +01:00
Christian Schneider
cd49fc92b9 removed version constraints from dependencies to '...idea.generator', added on missing 'optional' flag 2015-10-27 10:31:36 +01:00
Christian Schneider
b3bee86d2e re-added optional dependencies to '...idea.generator' to plug-ins referencing the old idea generator fragment in mwe2 workflows 2015-10-27 09:09:21 +01:00
Sebastian Zarnekow
2e9914e70b [480614] Fixed NPE in Xtext grammar editor 2015-10-26 17:24:40 +01:00
Stefan Oehme
5ffd70f822 add mwe2.launch to projects created by the wizard 2015-10-26 15:56:07 +01:00
Sebastian Zarnekow
0d918b5a65 Merge pull request #749 from eclipse/sz/webAPI
Fix: Deserialized issue from marker was broken
2015-10-26 12:00:20 +01:00
Dennis Huebner
2cb0b5f041 [releng] Removed references to deleted idea.generator project
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-26 10:30:26 +01:00
Sebastian Zarnekow
384eef8296 Fix: Deserialized issue from marker was broken 2015-10-26 09:48:05 +01:00
Moritz Eysholdt
66fee19452 Merge pull request #744 from eclipse/me/serializer
[serializer] fixed a bug in PDA construction
2015-10-25 18:36:13 +01:00
Moritz Eysholdt
791584041b [serializer] fixed a problem with the GrammarPDAProvider
make sure that AbstractElements which have been duplicated in the 
FlattenedGrammarAccess are properly merged back together in the 
GrammarPDAProvider

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-25 17:21:28 +01:00
Moritz Eysholdt
cba64e4082 [serializer] fixed a bug in PDA construction
when two unassigned rules calls followed one another, the second 
one was not properly considered

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-25 17:21:28 +01:00
Sebastian Zarnekow
64668e2483 Updated wizard expectations 2015-10-25 16:19:22 +01:00
Sebastian Zarnekow
804f968c56 [web] Include the column number in the validation results 2015-10-24 17:58:39 +02:00
Sven Efftinge
3970ccefea Get rid of some warnings 2015-10-24 12:51:08 +02:00
Stefan Oehme
69093080fc introduce AbstractGenerator and IGeneratorContext 2015-10-23 10:26:37 +02:00
Sven Efftinge
d7285f5ec6 [wizard] added missing dependencies and improved toString for EclipseProjectConfig 2015-10-22 22:43:22 +02:00
Sebastian Zarnekow
4a2a2525e0 [480445] Added TypeReference#guessTypeRef
Improved backwards compatibility.
2015-10-22 19:02:54 +02:00
Sebastian Zarnekow
25c3978d98 [480436] Fixed bug in GrammarFlattener 2015-10-22 18:14:19 +02:00
Stefan Oehme
b542ba8e06 Merge pull request #723 from eclipse/so_generator2
IGenerator2 improvements
2015-10-22 17:57:21 +02:00
Stefan Oehme
a7c983cb21 Merge pull request #722 from eclipse/so_generator_maven_dependencies
[generator2][wizard] only depend on new generator in new projects
2015-10-22 17:57:13 +02:00
Stefan Oehme
d55b5a4bde fix wizard integration test 2015-10-22 16:44:28 +02:00
Stefan Oehme
75e304e304 [generator2][wizard] only depend on new generator in new projects 2015-10-22 16:05:34 +02:00
Stefan Oehme
07cdb06281 [wizard] add a utility to update test expectations 2015-10-22 15:55:22 +02:00
Stefan Oehme
7dfaaf17d8 Bug 477068 generator2 should expose a CancelIndicator 2015-10-22 14:10:02 +02:00
Sven Efftinge
4a43c1aaa9 updated test expectations 2015-10-22 12:40:54 +02:00
Stefan Oehme
37218795e8 remove brittle nested class detection magic from TypeReference 2015-10-21 16:17:53 +02:00
Stefan Oehme
21dd488f2c Merge pull request #716 from sailingKieler/cs/codeConfigEncodingLineDelim
[xtext generator] added default value of 'encoding' and 'lineDelimiter' in CodeConfig
2015-10-21 14:49:04 +02:00
Dennis Huebner
ea1ad3a21b [wiz] Updated generated TP to mars sr1 + mwe2 2.8,1
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-21 14:36:26 +02:00
Dennis Huebner
e3898c1477 Bug 480097 - [generator] Xtext 2.9 Maven build failed (edit)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-21 14:03:36 +02:00
Christian Schneider
3b6fbab23b [xtext generator] added default value of 'encoding' and 'lineDelimiter' in CodeConfig, removed pre-setting from workflow template in RuntimeProjectDescriptor
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-21 11:48:07 +02:00
Sebastian Zarnekow
7667467a0c Merge branch 'master' into me/serializer 2015-10-21 10:37:59 +02:00
Stefan Oehme
ea92173b37 Merge pull request #700 from sailingKieler/aa/grammarComparison
Contribution of 'XtextAntlrGeneratorComparisonFragment' + '...Test'
2015-10-21 08:48:35 +02:00
Sebastian Zarnekow
24845d80a5 Merge branch 'master' into me/serializer 2015-10-20 19:09:10 +02:00