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

4452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Moritz Eysholdt
839ef90393 [JavaFormatting] set max line width to 140 chars 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
d86e9e6442 hooked the FlattenedGrammarAccess before the serializer 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
4a27b82568 Added support for IContext to SerializerFragment2 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
cc3936bcf5 Migrate SerializerFragment2 to changes in serializer.analysis 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
8e07bfdca6 [serializer] introduce IContext 
Previously, the context was of type EObject which actually was a
ParserRule or assigned Action. 

This refactoring paves the road for more advanced contexts, such
as ParserRules with parameter values.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:53 +02:00
Stefan Oehme
68ccd1da1a migrate Xtend to new content assist generator 2015-10-16 16:51:25 +02:00
Stefan Oehme
42d984cc35 fixed merge issues 2015-10-16 16:30:56 +02:00
Stefan Oehme
6147a7b1ab Merge remote-tracking branch 'origin/master' into so_ex_grammar_option 
Conflicts:
	plugins/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
 2015-10-16 16:28:39 +02:00
akosyakov
d0900cbb24 Merge remote-tracking branch 'origin/master' into sz/idea_tests 
Conflicts:
	intellij/org.eclipse.xtext.idea/src/org/eclipse/xtext/idea/resource/VirtualFileURIUtil.xtend
	intellij/org.eclipse.xtext.idea/xtend-gen/org/eclipse/xtext/idea/resource/VirtualFileURIUtil.java
 2015-10-16 15:51:15 +02:00
Stefan Oehme
2175b863b5 remove "extended" subclasses, replace with marker on the grammar 2015-10-16 15:33:42 +02:00
akosyakov
ce55ed43d0 [idea] Create an anonymous PSI class per an element type (a 
grammar element)
 2015-10-16 13:49:21 +02:00
Sven Efftinge
b4cc5f2242 [scoping fragment2] scope providers extends DelegatingScope, generate scope provider stub also for Xbase languages. 2015-10-16 12:25:09 +02:00
Stefan Oehme
3c84723c46 [generator2] content assist parser fragment 2015-10-16 11:57:31 +02:00
Miro Spönemann
76882898d6 [generator] Implemented adapter for using the new generator in old fragments, 
removed implementation of old serializer fragment

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-10-16 08:19:29 +02:00
Sebastian Zarnekow
1aa1a3165f Merge pull request #692 from eclipse/sz/bug479885 
[479885] Fixed regression with clean builds
 2015-10-16 01:57:55 +02:00
Sebastian Zarnekow
a2c98d98e9 [479885] Fixed regression with clean builds 2015-10-15 20:27:15 +02:00
Sven Efftinge
d72710b1e1 added log4j dependency to eclipse 2015-10-15 11:47:30 +02:00
Sven Efftinge
309b600a63 [generator] introduced overridable method for adding the standard fragments 2015-10-15 11:15:13 +02:00
Sven Efftinge
1fd8c0bd62 [wizard] fixed broken test expectations 2015-10-15 11:15:13 +02:00
Stefan Oehme
d43f5bdfe9 fixed a regression in the idea parser generator 2015-10-15 11:02:58 +02:00
Stefan Oehme
cb6ae099c5 [generator2] extended grammar option 2015-10-15 10:36:04 +02:00
Stefan Oehme
e9d2791194 Merge pull request #687 from eclipse/sz/testProjectNames 
[wizard] Fixed test project names with mvn config
 2015-10-15 10:15:05 +02:00
Sven Efftinge
0b64acd1fa [generator] Simpler language generator configuration for the standard case 2015-10-15 09:19:14 +02:00
Miro Spönemann
80bad080a0 [web] Updated versions of JS libs, fixed validation annotations for CodeMirror 2015-10-14 17:33:29 +02:00
Sebastian Zarnekow
16ebeaa4d8 [wizard] Fixed test project names with mvn config 
Also:
- adjusted orion download URI in example
- updated gradle preferences
 2015-10-14 17:17:04 +02:00
Miro Spönemann
a237b9d8df [generator] Improved handling of folders for EMF fragment 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-10-14 14:38:12 +02:00
Christian Schneider
af8d206769 [xtext generator] Migration of 'ResourceFactoryFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-14 13:41:57 +02:00
Miro Spönemann
1dcf54f216 [generator] Applied new serializer fragment to Xbase, Xtend, Statemachine 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-10-14 08:47:38 +02:00
Miro Spönemann
d966fe477f [generator] Implemented new serializer fragment 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-10-14 08:47:38 +02:00
Sven Efftinge
d881bd2063 Merge pull request #680 from eclipse/se/bug473719 
[473719] use toFileURI to translate from relative or absolute file path to a URI (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=473719)
 2015-10-14 07:48:49 +02:00
Moritz Eysholdt
289b2e9d9b Merge pull request #678 from eclipse/me/bug479397 
[serializer] fix 479397#c10: Problem with Grammar Fragment Invocations
 2015-10-13 18:07:09 +02:00
Sven Efftinge
9a974718ae [473719] use toFileURI to translate from relative or absolute file path to a URI (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=473719) 2015-10-13 17:17:11 +02:00
Sebastian Zarnekow
18c29c3f4c Merge pull request #668 from eclipse/sz/contentAssistParserFix 
Avoid announcing EOF if it wasn’t EOF so far.
 2015-10-13 16:57:24 +02:00
Moritz Eysholdt
9356d40776 [serializer] fix 479397#c10: Problem with Grammar Fragment Invocations 
A Grammar fragment invocation does only instantiate the current object
if the current object has not yet been instantiated.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-13 14:26:10 +02:00
Stefan Oehme
65c13e7c97 Merge pull request #669 from sailingKieler/aa/compareFix 
[xtext generator] added missing dependency addition in 'CompareFragment2'
 2015-10-13 13:52:18 +02:00
Stefan Oehme
223c9cece5 Merge pull request #674 from sailingKieler/aa/codetemplatesGenerator 
[xtext generator] Migration of 'CodetemplateGeneratorFragment'
 2015-10-13 13:52:00 +02:00
Stefan Oehme
c537bb281a Merge pull request #677 from sailingKieler/aa/GeneratedJavaFileAccessTypeComment 
[xtext generator] upgraded 'GeneratedJavaFileAccess' to expect the 'typeComment' as a 'StringConcatenationClient'…
 2015-10-13 13:50:50 +02:00
Christian Schneider
826c03cdac [xtext generator] changed return type of 'TextFileAccess.setContent(...)' to 'void', same for 'GeneratedJavaFileAccess.setTypeComment(...)' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-13 10:53:39 +02:00
Christian Schneider
7bcf17f188 [xtext generator] added missing dependency addition in 'CompareFragment2' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-13 10:45:55 +02:00
Christian Schneider
33a403f811 [xtext generator] Improved 'CodetemplatesGeneratorFragment' as suggested in review. 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-13 10:41:40 +02:00
Christian Schneider
65408ebc10 [xtext generator] Migration of 'CodetemplateGeneratorFragment' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-13 10:30:44 +02:00
Sebastian Zarnekow
d24b726190 Merge branch 'master' into sz/contentAssistParserFix 2015-10-13 10:25:20 +02:00
Christian Schneider
01d79495b7 [xtext generator] upgraded 'GeneratedJavaFileAccess' to expect the 'typeComment' as a 'StringConcatenationClient' and process imports of referenced classes. The generated Java files affected by this change are amended. 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-13 10:10:56 +02:00
Stefan Oehme
a08900580a add convenience overloads for suppresWarnings/normalizeLineDelimiters 2015-10-13 10:10:34 +02:00
Stefan Oehme
c0beee80a8 [generator2] add option to generate a debug grammar 2015-10-13 09:55:12 +02:00
Stefan Oehme
866357397b Merge pull request #671 from sailingKieler/aa/duplicateImports 
[xtext generator] added removal of duplicate imports in 'JavaFileAccess', …
 2015-10-12 17:45:09 +02:00
Christian Schneider
ff36f75788 [xtext generator] added removal of duplicate imports in 'JavaFileAccess', resolved code clone in 'GeneratedJavaFileAccess' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-12 16:03:35 +02:00
Stefan Oehme
b531f7e682 Merge pull request #670 from sailingKieler/aa/refactorElementName 
[xtext generator] Migration of 'RefactorElementNameFragment'
 2015-10-12 15:56:26 +02:00
Christian Schneider
77599af0cc [xtext generator] switched to 'fileAccessFactory.createGeneratedJavaFile' at generation of 'Abstract...ProposalProvider', refactored template correspondingly, removed unwelcome comments 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-12 15:35:58 +02:00
Christian Schneider
a4ddde5c10 [xtext generator] Minor improvement in 'ContentAssistFragement2' (replaced a usage of hashSet by arrayList to avoid ordering changes in generated code) 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-12 14:52:01 +02:00