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

6047 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karsten Thoms
89bcbd0762
Merge pull request #595 from FStolte/issue463 
[eclipse/xtext-eclipse#463] Fixed faulty editor binding
 2017-12-21 11:50:53 +01:00
Florian Stolte
9751c004c1 [eclipse/xtext-eclipse#463] Fixed faulty editor binding 
- for xbase languages, the language specific editor is now correctly
bound to XtextEditor instead of XbaseEditor

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-21 11:05:31 +01:00
Karsten Thoms
da0388a2a2
Merge pull request #594 from FStolte/issue1155 
[eclipse/xtext#1155] Cleaned up javadoc to remove some warnings.
 2017-12-19 13:32:24 +01:00
Florian Stolte
3a740a437e [eclipse/xtext#1155] Cleaned up javadoc to remove some warnings. 
Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-19 12:04:05 +01:00
Karsten Thoms
b981118825 [eclipse/xtext#1152] Fixed Manifest format error 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-12-18 11:57:43 +01:00
Sebastian Zarnekow
5940623fac
Merge pull request #591 from eclipse/sz_regenerateAllLanguages 
Regenerate all languages
 2017-12-18 11:08:29 +01:00
Sebastian Zarnekow
a28d340bd9 Build against master 2017-12-18 11:02:40 +01:00
Karsten Thoms
d5e6578a6d
Merge pull request #588 from FStolte/issue1152 
[eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
 2017-12-18 10:04:26 +01:00
Sebastian Zarnekow
1a50155b32
Merge pull request #590 from eclipse/sz_fixBackwardsCompatibility 
Fixed backwards compatibility issue
 2017-12-18 09:51:55 +01:00
Sebastian Zarnekow
bcaf864fac Fixed backwards compatibility issue 2017-12-15 13:52:53 +01:00
Sebastian Zarnekow
384d395c61 Build against the equivalent branch 2017-12-15 13:43:19 +01:00
Christian Dietrich
f0abce8ada
Merge pull request #587 from eclipse/cd_xtext_issue1153 
Duplicate @Named ids in AbstractMultiLineCommentProvider
 2017-12-15 13:24:06 +01:00
Florian Stolte
1bc930b5b6 [eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header 
- added header to existing manifest files
- added header to manifest generation in xtext generator and wizard

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-14 14:16:20 +01:00
Christian Dietrich
c1f78be257
Merge pull request #584 from FStolte/issue582 
[#582] Updated version of xtext-gradle-plugin
 2017-12-14 13:44:12 +01:00
Christian Dietrich
c3893bc200 Duplicate @Named ids in AbstractMultiLineCommentProvider https://github.com/eclipse/xtext/issues/1153 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-14 13:34:46 +01:00
Christian Dietrich
94a90a486c
Merge pull request #583 from FStolte/issue580 
[#580] Updated maven assembly/war plugins to latest versions
 2017-12-14 10:50:10 +01:00
Florian Stolte
bc1f236450 [#582] Updated version of xtext-gradle-plugin 
- updated from 1.0.19 to 1.0.20
- updated the version in the gradle file
- updated the version used by the wizard
- updated the version in examples

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-14 09:33:53 +01:00
Christian Dietrich
ea159e0958
Merge pull request #586 from eclipse/cd_wizAsm6 
use asm 6
 2017-12-13 22:26:13 +01:00
Christian Dietrich
2ec798bcb7 use asm 6 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-13 22:12:46 +01:00
Christian Dietrich
e62caad9f3
Merge pull request #577 from eclipse/cd_extras_issue208 
increased maven/gradle asm version to 6.0
 2017-12-13 21:21:05 +01:00
Florian Stolte
95225c9545 [#580] Updated maven assembly/war plugins to latest versions 
- updated the wizard to use maven-assembly-plugin version 3.1.0
- updated the assembly descriptors to version 2.0.0
- updated the wizard to use maven-war-plugin version 3.2.0
- updated the tests to these versions, as well

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-13 17:19:04 +01:00
Christian Dietrich
c7ab2c7b32
Merge pull request #578 from FStolte/issue570 
[#570] Added error message for invalid override
 2017-12-13 12:39:30 +01:00
Florian Stolte
6b9d505b07 [#570] Added error message for invalid override. 
- rules with an @Override annotation in a grammar without super grammar
now correctly display an error

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-13 12:23:06 +01:00
Christian Dietrich
58077a7022
Merge pull request #579 from FStolte/typo 
Fixed a typo in XtextValidator
 2017-12-13 11:00:05 +01:00
Florian Stolte
9d6f9434a1 Fixed a typo in XtextValidator. 
Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-13 10:53:40 +01:00
Christian Dietrich
8411fcc8d7 increased maven/gradle asm version to 6.0 https://github.com/eclipse/xtext-extras/issues/208 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-13 09:00:48 +01:00
Christian Dietrich
5fc81ba327
Merge pull request #576 from eclipse/cd_rsf 
made code of resource storage facade more consistent
 2017-12-12 20:11:36 +01:00
Christian Dietrich
5b1d375c24
Merge pull request #575 from eclipse/cd_gradle44 
update to gradle 4.4
 2017-12-12 19:00:52 +01:00
Christian Dietrich
1894da8a38 made code of resource storage facade more consistent 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-12 16:32:33 +01:00
Christian Dietrich
8518cfd546 update to gradle 4.4 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-11 21:23:17 +01:00
Sebastian Zarnekow
1fb8d6e032 Regenerated xtext.tests testlanguages 2017-12-08 17:19:32 +01:00
Sebastian Zarnekow
b6a9f76938 Fixed regression in Xtext generator for type names 2017-12-08 17:17:33 +01:00
Sebastian Zarnekow
193f46ea45 Regenerated Xtext testlanguages 2017-12-08 16:48:43 +01:00
Sebastian Zarnekow
6a3a540f83 Regenerate Xtext.xtext 2017-12-08 15:44:17 +01:00
Sebastian Zarnekow
a7a45658ef Really use the latest Xtend 2017-12-08 15:39:38 +01:00
Sebastian Zarnekow
13051ddac6
Merge pull request #572 from eclipse/sz_avoidDuplicatedCode 
Avoid duplicated code in CA infrastructure
 2017-12-08 15:21:50 +01:00
Sebastian Zarnekow
5300cd812f Compiled with latest Xtend 2017-12-08 15:17:13 +01:00
Karsten Thoms
22b17da3b4
Merge pull request #574 from FStolte/issue463 
[eclipse/xtext-eclipse#463] Only generate Editor stub for Xbase languages
 2017-12-08 14:59:13 +01:00
Florian Stolte
ca7a3f67b1 [eclipse/xtext-eclipse#463] Editor stub is now only generated for Xbase 
languages.

- removed EditorFragment2, put its functionality into
XbaseGeneratorFragment2
- moved the binding of the editor from ImplicitFragment to
XbaseGeneratorFragment2

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-08 14:08:26 +01:00
Sebastian Zarnekow
7f3e555503 Reformatted code 2017-12-08 09:12:15 +01:00
Sebastian Zarnekow
3e74daa61c Do not attempt to bind CA lexer in baseclass 2017-12-08 09:10:30 +01:00
Sebastian Zarnekow
183de4ae98 Remove unused import 2017-12-07 18:28:15 +01:00
Sebastian Zarnekow
ec24238129 Merge remote-tracking branch 'origin/master' into sz_avoidDuplicatedCode 2017-12-07 17:29:11 +01:00
Sebastian Zarnekow
5b96338bc6 Extract more common CA code to base classes 2017-12-07 17:28:25 +01:00
Christian Dietrich
baf8a9b29d
Merge pull request #573 from eclipse/cd_issue571 
Fixed broken tests #571
 2017-12-07 17:07:38 +01:00
Christian Dietrich
43d7186d19 Fixed broken tests #571 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-07 16:50:23 +01:00
Sebastian Zarnekow
7235dfee19 Updated copyright headers 2017-12-07 16:11:47 +01:00
Sebastian Zarnekow
20d8e31730 Fixed copy'n'paste since tag problem 2017-12-07 16:09:03 +01:00
Sebastian Zarnekow
c6e5d8af68 Avoid duplicated code in CA infrastructure 2017-12-07 15:57:35 +01:00
Sebastian Zarnekow
4567dd58c0
Merge pull request #490 from eclipse/sz_contentAssistPRC 
Fixes for content assist with parameterized rule calls
 2017-12-07 10:15:28 +01:00