Commit graph

6013 commits

Author SHA1 Message Date
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
Sebastian Zarnekow
846a2a7faf Updated generated code 2017-12-01 12:33:54 +01:00
Christian Dietrich
3b8e4e7b99
Merge pull request #564 from eclipse/cd_core_issue359
[tracing] NPE thrown when a file is generated without traces
2017-12-01 12:16:07 +01:00
Sebastian Zarnekow
6f78cb9084 Merge branch 'master' into sz_contentAssistPRC 2017-12-01 12:13:06 +01:00
Christian Dietrich
3b4910adae more review feedback
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-01 11:38:35 +01:00
Christian Dietrich
d9e4a5d265 more review feedback
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-01 11:37:27 +01:00
Christian Dietrich
bb9b15316b implemented review feedback
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-01 11:11:13 +01:00
Christian Dietrich
6997cb0697 [tracing] NPE thrown when a file is generated without traces https://github.com/eclipse/xtext-core/issues/359
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-01 09:54:43 +01:00
Christian Dietrich
67a36a5b64
Merge pull request #563 from eclipse/cd_core_issue544
moved 'copy java problems' configurable issue code to xtext core
2017-11-30 10:35:59 +01:00
Christian Dietrich
94a43ed825 moved 'copy java problems' configurable issue code to xtext core https://github.com/eclipse/xtext-core/issues/544
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-30 10:07:19 +01:00
Karsten Thoms
ee52c11194
Merge pull request #562 from eclipse/refactor_qnconverter
Refactoring & additional tests
2017-11-29 21:46:04 +01:00
Karsten Thoms
f3d2655cab Refactoring & additional tests
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-11-29 16:35:30 +01:00
Karsten Thoms
faec295260
Merge pull request #561 from FStolte/issue463
[eclipse/xtext-eclipse#463] Fix for issue
2017-11-29 10:09:32 +01:00
Karsten Thoms
e3baf9ede5 [refactoring] formatting
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-11-29 08:57:38 +01:00
Christian Dietrich
b6cbf6dc17 avoid name clash with java 9
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-28 15:01:37 +01:00
Christian Dietrich
7e1cf4b5a4 added missing types to CodeGenUtil2.getJavaDefaultTypes() #509
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-28 15:01:37 +01:00
Florian Stolte
94eba69a6b [eclipse/xtext-eclipse#463] Fix for issue.
- Created EditorFragment2 to generate language-specific sub-classes of
XtextEditor

- Added new fragment to StandardLanguage

- Configured the language-specific editor in XbaseGeneratorFragment2

- Added methods to XtextGeneratorNaming for XtextEditor, XbaseEditor and
language-specific editors

- Added binding for language-specific editors in ImplicitFragment

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-11-28 10:39:51 +01:00