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
4602 commits 41 branches 98 tags 41 MiB
Commit graph

4602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sven Efftinge
68b8a035af [368296] added null check 2015-11-12 11:52:12 +01:00
Sebastian Zarnekow
6a5a409097 Merge pull request #798 from eclipse/sz/xtextTransientValueService 
[grammar][serializer] Terminal fragments don’t allow return types
 2015-11-12 11:18:12 +01:00
Sebastian Zarnekow
6ffb896586 [grammar][serializer] Use the EString from the resource set 2015-11-12 10:10:48 +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
5cd6a1e8b3 Merge pull request #734 from jsebechlebsky/fix_freeze_on_FailedPredicateException 
Fix freeze on FailedPredicateException
 2015-11-12 10:00:44 +01:00
Sebastian Zarnekow
c2dd4765a6 [grammar][serializer] Terminal fragments don’t allow return types 2015-11-12 09:53:02 +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
Sven Efftinge
f26de8d6b7 [481047] generate proper marker type ids 2015-11-11 11:07:18 +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
Dennis Huebner
f178c7c2fe [releng] 2.9.0.rc1 -> 2.9.0-SNAPSHOT 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-11-10 16:04:08 +01:00
Miro Spönemann
939b384d8f Merge pull request #792 from eclipse/msp/generatorFix01 
[generator] Small fixes
 2015-11-10 15:35:01 +01:00
Dennis Huebner
e1ba8938ed [releng] Prepare for RC1 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-11-10 14:32:36 +01:00
Dennis Huebner
43701e9cfc [mvn] Removed runtime scope to make transitive deps available 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-11-10 12:06:20 +01:00
Miro Spönemann
e3d78d77bd [generator] Fixed Java templates for web project, turned content assist generate methods to protected 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-11-10 11:49:41 +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
e79cfc39e5 Merge pull request #791 from eclipse/sz/findActualNodeRegression 
[NodeModel] Wrong result from findActualNode with actions and fragments
 2015-11-09 18:19:32 +01:00
Christian Schneider
f1264f58b5 [xtext generator] tiny bug fix in 'XtextAntlrGeneratorFragment2' (type was not enclosed in guillemets) 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-11-09 18:13:03 +01:00
Sebastian Zarnekow
353474259e [NodeModel] Wrong result from findActualNode with actions and fragments 2015-11-09 17:04:09 +01:00
Dennis Huebner
b5fc9b2ef4 Bug 481720 - [generator] NPE in Junit4Fragment2 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=481720
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-11-09 16:38:11 +01:00
Moritz Eysholdt
9ef380456b Merge pull request #790 from eclipse/me/serializer3 
[serializer/analysis] on exception, log and try to continue
 2015-11-09 15:03:57 +01:00
Sebastian Zarnekow
c5b33352d8 Merge branch 'master' into sz/grammarAccessRegression 2015-11-09 14:11:18 +01:00
Moritz Eysholdt
737f8e35fc [serializer/analysis] on exception, log and try to continue 
If there are exceptions, they're likely to only affect individual parser
rules. Furthermore, partial output makes it much easier to diagnose
errors.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-11-09 13:21:25 +01:00
Sebastian Zarnekow
71533dda55 [xtext][generator] Make StandardLanguage easier to fixup 
Enable a way to disable a fragment in the standard language
by null-ing it.
 2015-11-09 12:20:40 +01:00
Sebastian Zarnekow
3fe4985b13 [xtext][generator] Fixed regression in GrammarAccessFragment 
The serializer got better with regards to keeping escape
sequences which could produce invalid java code.
 2015-11-09 12:12:19 +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
Sven Efftinge
11698179fa Merge pull request #786 from eclipse/me/maven 
[wizard#481478] disable dead maven repos in generated POMs
 2015-11-07 11:02:03 +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
Dennis Huebner
bdcd66d98d [481305] Different Source compatibility level is used for Xtend 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=481305
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-11-06 12:25:50 +01:00
Dennis Huebner
178779881a Moved JavaVersion to xtext.util - Bug 481477 
[newProjectWizard] put more suitable execution environment into
MANIFEST.MF
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-11-06 12:25:50 +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
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