Commit graph

1760 commits

Author SHA1 Message Date
Christian Schneider
4dc072dee7 [grammar comparison] enhanced grammar comparator to ignore single & multi line comments, added corresponding tests, moved test helper methods & classes into new helper class
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-19 13:08:18 +01:00
Christian Schneider
053f9a8d87 [xtext tests] registered source folder 'src-gen2' in build.properties
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-18 16:09:17 +01:00
Christian Schneider
c3274abb11 [xtext tests] re-generated BacktrackingLexerTestLanguage with new generator
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 22:13:37 +01:00
Christian Schneider
85db706fa2 [xtext tests] activated test generation of BacktrackingLexerTestLanguage in 'GenerateAllTestLanguages2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 22:03:32 +01:00
Christian Schneider
5e8262a66e [xtext tests] re-generation of Super- & SubTestLanguage with new generator
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 22:03:03 +01:00
Sven Efftinge
db160aa5a6 [generator] fixed some issues in lexer generator 2015-11-16 21:46:29 +01:00
Christian Schneider
076807b17b [xtext tests] introduced 'src-gen2' source folder, introduced dedicated 'TestProjectConfig', activated class-splitting in 'TestLanguage', updated 'GenerateAllTestLanguages2' workflow; added documentation in 'StandardProjectConfig'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 21:46:07 +01:00
Sven Efftinge
5901b857e5 [generator] various minor fixes, first work on generating runtime test languages with new generator
- support isGenerateXtend in IdeaPluginGenerator
 - allow setting overWriteSrc (useful for testing)
 - allow disabling outlets via empty string (mwe2)
2015-11-16 21:41:23 +01:00
Sebastian Zarnekow
730eb96464 Allow to set the class loader for the grammar provider. 2015-11-15 23:44:55 +01:00
Sebastian Zarnekow
97ff5915af [generator][old] Consider encoding when loading the grammar 2015-11-15 18:34:02 +01:00
Sebastian Zarnekow
5fe8fab3c9 Added test for grammar access fragments 2015-11-15 18:14:47 +01:00
Sven Efftinge
55e3d815b9 Merge pull request #796 from eclipse/se/bug368296
[368296] set file header as copyright in genmodel
2015-11-12 10:08:31 +01:00
Sven Efftinge
a9d2da2331 [generator] changed the disabling of the new case splitting. Enabled download of antlr generator without asking 2015-11-12 05:50:13 +01:00
Sven Efftinge
014e623b6b Merge pull request #675 from jsebechlebsky/split_special_state_transition_switch
Conditionaly split switch in specialStateTransition method
2015-11-12 05:25:26 +01:00
Sven Efftinge
5a56c896df [368296] set file header as copyright in genmodel 2015-11-12 05:21:30 +01:00
Dennis Huebner
b9665965d1 [generator] Better version matching for the milestone (stable) builds
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-10 16:27:08 +01:00
Jan Sebechlebsky
6bd52aa67e Turn off lexer special state switching by default
and provide option to turn it explicitly on

Signed-off-by: Jan Sebechlebsky <jan.sebechlebsky@cz.ibm.com>
2015-11-09 18:56:18 +01:00
Sebastian Zarnekow
353474259e [NodeModel] Wrong result from findActualNode with actions and fragments 2015-11-09 17:04:09 +01:00
Dennis Huebner
6f8735715d Merge pull request #787 from eclipse/dh/jreSettings
[481305] Different Source compatibility level is used for Xtend
2015-11-09 10:56:04 +01:00
Sven Efftinge
7dc776ffe7 [481478] updated test expectations 2015-11-07 11:05:05 +01:00
Dennis Huebner
0b3b738e8e [wizard] Added Test for javaversion, removed unused method.
@Sebastian Thanks for the hints
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-06 16:18:20 +01:00
Stefan Oehme
30e771b5f6 [wizard] make it easier to change to a handwritten ecore model 2015-11-06 12:15:35 +01:00
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