Commit graph

4871 commits

Author SHA1 Message Date
Moritz Eysholdt
337cd2ed54 [wizard#481478] disable dead maven repos in generated POMs
this
- upgrades the maven-exec-plugin from 1.2.1 to 1.4.0
- sets cleanupDaemonThreads=false for the maven-exec-plugin
- registers http://nexus.codehaus.org/snapshots/ as disabled

see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478
https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-06 11:11:39 +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
Miro Spönemann
3695f9cdf1 [generator] Introduced GeneratorOption and BooleanGeneratorOption for clear detection of explicitly set options and handling of default values
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-11-05 14:58:23 +01:00
Christian Schneider
389523c0c1 Merge pull request #772 from eclipse/cs/activatorNameHandling
[xtext generator] changed bundle activator naming computation to be grammar independent
2015-11-05 14:49:34 +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
Christian Schneider
9f0beadec2 [xtext generator] some cosmetics in 'ResourceFactoryFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-04 20:44:09 +01:00
Christian Schneider
e97290b73a [xtext generator] changed bundle activator naming computation to be grammar independent
moved activator name computation to 'XtextGeneratorNaming',
fixed basically two bugs in 'XtextGenerator' concerning the setting of the bundle activator,
added dedicated getter & setter in 'MergableManifest',
updated usage of the eclipse plugin activator in 'JUnit4Fragment2'

Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-04 19:42:17 +01:00
Moritz Eysholdt
0b40381dd6 [generator] StandaloneSetup{loadedResource=""} --> referencedResource=""
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-04 16:31:33 +01:00
Sven Efftinge
33be915988 Merge pull request #778 from eclipse/cs/JavaVsXtendStubs
[xtext generator] fragment-wise selection of Java vs. Xtend stubs beyond 'preferXtendStubs'
2015-11-04 06:31:38 +01:00
Dennis Huebner
b90b128fd7 [wizard] New Idea version for the wizard
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-03 16:06:24 +01:00
Christian Schneider
05cc472668 [xtext generator] updated the new code generator fragments to rely on 'AbstractStubGeneratingFragment.isGenerateXtendStub()' instead of 'preferXtendStubs'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-03 12:19:28 +01:00
Christian Schneider
ad7ec9868f [xtext generator] added 'generateXtendStub' field and corresponding getter to 'AbstractStubGeneratingFragment' enabling to force the stub generation in Xtend or Java beyond CodeConfig's 'preferXtendStubs'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-03 12:18:21 +01:00
Christian Schneider
014dca7c11 [xtext generator] added getter 'isGenerateXtendStubs' to 'IXtextGeneratorLanguage' and a corresponding field in 'XtextLanguageConfig', updated templates in 'XtextGeneratorTemplates'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-03 12:11:24 +01:00
akosyakov
137c1dfb98 Merge remote-tracking branch 'origin/master' into
ak/prevent_awt_thread_blocking
2015-11-03 11:04:14 +01:00
akosyakov
5d7049c3ed [idea] Mark AST nodes associated with semantic elements 2015-11-03 08:08:22 +01:00
Sven Efftinge
a260226f5a [481241] made it a real constant :-| 2015-11-03 07:38:55 +01:00
Sven Efftinge
94d511cc61 [generator] fixed regression in generated proposal provider 2015-11-02 18:12:33 +01:00
Sven Efftinge
4fb6bfd44e [GrammarUtil] getAllPredicatedElements - also consider firstSetPredicates 2015-11-02 17:52:15 +01:00
Sven Efftinge
162c6a8cee Merge pull request #775 from eclipse/se/bug481241
[481241] import uri validation - add constant issue code
2015-11-02 17:51:43 +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
Sven Efftinge
a21ba3bb19 [481241] import uri validation - add constant issue code 2015-11-02 16:04:51 +01:00
akosyakov
15ec963388 Merge remote-tracking branch 'origin/master' into
ak/prevent_awt_thread_blocking

Conflicts:
	intellij/org.eclipse.xtend.idea/src-gen/org/eclipse/xtend/core/idea/parser/antlr/internal/PsiInternalXtendParser.java
	intellij/org.eclipse.xtext.testlanguages.idea/src-gen/org/eclipse/xtext/testlanguages/backtracking/idea/lang/parser/BeeLangTestLanguageParserDefinition.java
	intellij/org.eclipse.xtext.testlanguages.idea/src-gen/org/eclipse/xtext/testlanguages/backtracking/idea/lang/parser/ExBeeLangTestLanguageParserDefinition.java
	intellij/org.eclipse.xtext.testlanguages.idea/src-gen/org/eclipse/xtext/testlanguages/backtracking/idea/lang/parser/SimpleBeeLangTestLanguageParserDefinition.java
	tests/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java
2015-11-02 13:35:01 +01:00
akosyakov
d3f6e17acd [idea] Mark AST nodes associated with semantic elements 2015-11-02 08:11:49 +01:00
Stefan Oehme
9e8c499e7c fixed inconsistent equinox.common - use signed version everywhere 2015-11-01 12:28:25 +01:00
Stefan Oehme
cc9629737e simplified eclipse-plugin-project.gradle 2015-10-31 15:50:49 +01:00
Sven Efftinge
0258f07c59 Merge pull request #770 from eclipse/cs/xtendLibDependency
[xtext generator] fine-tuning of '...xtend.lib' dependency addition in 'ImplicitFragment'
2015-10-30 22:49:36 +01:00
Sven Efftinge
b165c4fe17 Merge pull request #769 from eclipse/me/reintroduce_deleted_constructor
[serializer] reintroduce a deleted constructor as deprecated
2015-10-30 22:42:03 +01:00
Christian Schneider
db62ecd39a [xtext generator] fine-tuning of '...xtend.lib' dependency addition in 'ImplicitFragment'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-30 14:00:36 +01:00
Dennis Huebner
ddf131ab8d [fb] Fixed potential NPE
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-30 13:21:01 +01:00
Sven Efftinge
e28d28553e Merge pull request #760 from eclipse/se/idea_navigation_jars
[idea] fixed navigation to traced sources in archives
2015-10-30 11:55:47 +01:00
Dennis Huebner
a0612c1e8d [mvn] Added staging profile
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-30 11:53:41 +01:00
Moritz Eysholdt
1d9be37fe3 [serializer] reintroduce a deleted constructor as deprecated
this avoids potential compile errors when users upgrade to Xtext 2.9.0

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-30 10:21:19 +01:00
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