sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 16:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4514 commits 41 branches 98 tags 41 MiB
Commit graph

4514 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
7f699c85c8 [xtext generator] renamed new 'CompositeGeneratorFragment' to 'CompositeGeneratorFragment2' in order to avoid simple name conflicts 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-28 11:44:59 +01:00
Christian Schneider
4edc5130bb Merge pull request #747 from sailingKieler/cs/testLanguagesMigration 
migration of the 'org.eclipse.xtext.testlanguages' test languages
 2015-10-28 11:22:46 +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
Sebastian Zarnekow
d343d2272b Merge pull request #753 from eclipse/sz/bugfixes 
[480686] Fixed regression in NodeModelBuilder
 2015-10-28 11:13:14 +01:00
Christian Schneider
50d4953568 [xtext generator] updated java stub template in GeneratorFragment2 (context parameter was missing) 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-28 10:10:59 +01:00
Dennis Huebner
13ea7f0ce3 Merge pull request #754 from eclipse/dh/gradle-wrapper 
[wizard] Add a possibility to materialize gradle-wrapper
 2015-10-28 09:07:27 +01:00
Dennis Huebner
9e299f9b66 Some improvements after a code re-view 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-10-28 08:05:05 +01:00
Christian Schneider
01f9bb8db4 Merge pull request #752 from eclipse/cs/generator/fixes2 
Follow-up on #746 (generator fixes)
 2015-10-27 16:44:54 +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
Sebastian Zarnekow
895ff52a8f [480686] Fixed regression in NodeModelBuilder 2015-10-27 16:00:58 +01:00
Christian Schneider
d3576904fa [xtext generator] changed check in 'ImportNamespacesScopingFragment2.getDelegateScopeProvider()' from 'usesXImportSection' to 'inheritsXbase' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-27 14:58:38 +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
d4f10db7d4 [xtext generator] added generation of surrogate '...QuickfixProvider' classes into src-gen in case stub generation is switch off 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-27 11:00:05 +01:00
Christian Schneider
14f1d21fcf [xtext generator] fixed naming of generated [Abstract]...ProposalProvider in 'ContentAssistFragment2' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-27 11:00:02 +01:00
Christian Schneider
1ce296463c [xtext generator] fixed naming of generated [Abstract]...Validator in 'ValidatorFragment2' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-27 11:00:00 +01:00
Christian Schneider
ed7ed58f21 [xtext generator] fixed naming of generated [Abstract]ScopeProvider in 'ImportedNamespacesScopingFragment2' as suggested in review 2015-10-27 10:59:58 +01:00
Christian Schneider
9578112d55 [antlr content assist grammar generator] removed line of code in handling of unordered groups in the content assist grammar template dedicated to separated grammars in old generator, updated new generator respectively. 
We cannot prove by means of the history that this line was wrong, but it looked like and the UnorderedGroups content assist tests were satisfied for separated grammars, as well.
Updated old generator template  as the grammar comparison wouldn't work otherwise.

Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-27 10:59:56 +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
d5d167d974 Merge pull request #746 from sailingKieler/cs/generator/fixes 
generator fixes & improvements performed while migrating the test languages in '...xtext.testlanguages'
 2015-10-27 09:44:23 +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
a132e0a197 Merge pull request #750 from eclipse/sz/webAPI 
Removed unnecessary comment
 2015-10-26 13:34:36 +01:00
Sebastian Zarnekow
703b083159 Removed unnecessary comment 2015-10-26 13:34:06 +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
Dennis Huebner
a5839b5d20 [mvn] mwe2 Launcher 2.8.2 should provide dependencies 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-10-26 10:03:05 +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
2e656a3023 Fixed conversion code that obtains location 2015-10-24 19:55:45 +02:00
Sebastian Zarnekow
99df905733 Some Javadoc 2015-10-24 18:35:30 +02:00
Sebastian Zarnekow
036b43e45e [web] Added missing @since tag 2015-10-24 18:35:22 +02: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
Christian Schneider
932762ab44 [xtext generator] changed 'ImportNamespacesScopingFragment2' to always generate the 'Abstract...ScopeProvider' in src-gen allowing to let it be referenced by "sub languages" regardless of the presence of a concrete '...ScopeProvider' (stub) in src 2015-10-23 23:16:54 +02:00
Christian Schneider
3afa6dbc71 [xtext generator] added choice of Java vs. Xtend classes/templates of generator stubs in 'GeneratorFragment2', minor improvement in contained plugin.xml template 2015-10-23 23:08:13 +02:00
Christian Schneider
4e525a011e [xtext generator] added choice of Java vs. Xtend templates for module stubs and setups, added missing '.typeRef' in template of eclipse plug-ins' activators 2015-10-23 23:03:14 +02:00
Christian Schneider
0e719d4c5f [idea plugin generator] avoided warning of superfluous imports & some cosmetics to reduce differences too older artifacts in 'IdeaPluginGenerator' 2015-10-23 22:33:40 +02:00
Christian Schneider
1c91d39ebb [xtext generator] added missing opening angle bracket in plugin.xml contributions of ImplicitFragment 2015-10-23 22:26:30 +02:00
Christian Schneider
a132f00ed1 [xtext generator] some cosmetics in ContentAssistFragment2 2015-10-23 22:22:28 +02:00