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

6029 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Sebastian Zarnekow
9b11cb58f9 Merge remote-tracking branch 'origin/master' into sz_contentAssistPRC 2017-12-07 10:14:33 +01:00
Sebastian Zarnekow
9ed107859f Updated since tags 2017-12-07 08:29:06 +01:00
Sebastian Zarnekow
74258fc120 Fixed since tags 2017-12-06 18:31:24 +01:00
Sebastian Zarnekow
f6a1abe53d Fixed warnings 2017-12-06 14:46:33 +01:00
Jan Koehnlein
a9f1c2d828
Merge pull request #569 from eclipse/jk/GH520_2 
GH-568 ... more assertions
 2017-12-06 11:50:07 +01:00
Jan Koehnlein
e4dd20cf2e GH-568 ... more assertions 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-12-06 11:41:14 +01:00
Jan Koehnlein
e6042819bc
Merge pull request #567 from eclipse/jk/GH520_1 
GH-520 more tests for live scoping
 2017-12-06 11:16:25 +01:00
Jan Koehnlein
4baf82fad4 added another assertion according to feedback 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-12-06 11:16:01 +01:00
Jan Koehnlein
9e4087bf5b GH-520 more tests for live scoping 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-12-06 08:51:30 +01:00
Jan Koehnlein
0b0e32472d
Merge pull request #523 from eclipse/jk/GH-520 
GH-520 clear various caches before updating references
 2017-12-05 21:01:44 +01:00
Jan Koehnlein
2c0b77541a [cleanup] various typos 2017-12-05 20:56:55 +01:00
Jan Koehnlein
15b13a279d GH-520 allow shadowed resource descriptions in language server scenario 2017-12-05 20:56:55 +01:00
Jan Koehnlein
8c7295e56e GH-524 use Module2.mixin() to combine runtime and IDE module in example languages 2017-12-05 20:56:54 +01:00
Christian Dietrich
7efac94bb7
Merge pull request #566 from eclipse/cd_regenXtend 
regenerated xtend code (java 9 java.lang.Module conflict)
 2017-12-03 21:52:11 +01:00
Sebastian Zarnekow
c4b4c8e4a9
Merge pull request #565 from eclipse/sz_stableSyntacticSequencerOrder 
Make generated code in syntactic sequence more stable
 2017-12-01 19:23:26 +01:00
Christian Dietrich
9e66409f38 regenerated xtend code (java 9 java.lang.Module conflict) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-01 19:13:09 +01:00
Christian Dietrich
034234d3fe Removed unused import 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-01 17:17:18 +01:00
Sebastian Zarnekow
e48a062d2b Make generated code in syntactic sequence more stable 2017-12-01 12:41:32 +01:00