Commit graph

4639 commits

Author SHA1 Message Date
Dennis Huebner
66180ed133 [releng] Prepare for Beta6
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-30 08:47:00 +01:00
Sebastian Zarnekow
f3c103bc47 Merge pull request #768 from eclipse/me/bug479400
[serializer] fixed an NPE
2015-10-30 08:36:07 +01:00
Christian Schneider
514316f945 [xtext generator] minor improvement of stub templates in 'ValidatorFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-29 17:28:53 +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
Stefan Oehme
d2a494cbfa Merge pull request #766 from eclipse/so_should_generate
fixed IShouldGenerate.OnlyWithoutErrors
2015-10-29 15:43:45 +01:00
Stefan Oehme
ccdeecc2bd fixed IShouldGenerate.OnlyOnError 2015-10-29 15:42:07 +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
Sven Efftinge
a6142c6dfc [idea] fixed navigation to traced sources in archives 2015-10-29 14:47:31 +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
Stefan Oehme
f45533960f Merge pull request #763 from eclipse/so_beta_version_target_platform
[wizard] fix tycho target platform for beta versions
2015-10-29 14:13:46 +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
Stefan Oehme
ca0301817e [wizard] fix tycho target platform for beta versions 2015-10-29 13:57:30 +01:00
Dennis Huebner
87965b12ee [480971] Build failed because of 2.8.2 vs 2.9.0-SNAPSHOT mwe2 version
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-29 12:08:47 +01:00
Stefan Oehme
600525f1ab Merge pull request #761 from eclipse/so_maven_wizard
Fixes for the wizard with Maven integration
2015-10-29 11:55:07 +01:00
Stefan Oehme
2e2ceb512c scan all jars on the classpath
org.webjars only works for Gradle, because it "accidently" matches the
gradle repository folder structure. It won't work with maven.
2015-10-29 11:17:08 +01:00
Dennis Huebner
95db7007c3 [releng] Forgot to add eclipse.inf to source target
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-29 09:56:06 +01:00
Dennis Huebner
e26b6bd055 [releng] Having problems to verify signing in the source bundle
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-29 08:55:23 +01:00
Christian Schneider
9b14baa6ba [xtext generator] fixed recently introduced copy-paste bug in 'QuickfixProviderFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-28 15:32:58 +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
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