Commit graph

335 commits

Author SHA1 Message Date
Karsten Thoms
7dcc65bb2e [release] Increment version to 2.15.0
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-22 23:53:44 +02:00
Karsten Thoms
0049750108
Merge pull request #735 from eclipse/junit5_dependencies
[#666] JUnit 5 dependencies
2018-05-16 23:19:00 +02:00
Karsten Thoms
0bef495014 [#666] JUnit 5 dependencies
- Use Tycho 1.2 for JUnit 5
- Removed adding of org.junit as imported package - test projects are
already created with a bundle dependency

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-16 21:44:37 +02:00
Christian Dietrich
f54be52d97 fixed some warnings
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-12 10:58:14 +02:00
Christian Dietrich
f2a738ae3e [#664] fixed generation of val prefs/issue codes when deprecation disabled
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 10:16:46 +02:00
Christian Dietrich
d2134214a6 [#724] fixed compile errors with non xbase languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-03 06:49:22 +02:00
Holger Schill
dbca734a58 Fix for https://github.com/eclipse/xtext-core/issues/722 2018-05-02 13:40:54 +02:00
Christian Dietrich
de25d13970 [eclipse/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-23 13:01:11 +02:00
Christian Dietrich
85f3a05f3d
Merge pull request #703 from eclipse/java-10-integration
Java 10 integration
2018-04-20 11:33:24 +02:00
Karsten Thoms
875e62c901 [#666] JUnit 5 Support
- implemented review comments
- adding JUnitVersion.DEFAULT
- added missing copyright headers for JUnitFragment and Junit4Fragment2
- changed lower bound for org.junit.jupiter.api.extension to 5.1.0

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 12:49:57 +02:00
Arne Deutsch
693c7e420c [eclipse/xtext#1177] Update ASM to 6.1.1 and JDT Core to 3.13.102.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-17 07:37:44 +02:00
Karsten Thoms
3999e54b89 [#666] Extend Xtext Generator for JUnit 5
- Added enum JUnitVersion
- Create JUnitFragment from Junit4Fragment2
  - provide setter for JUnit version
  - Deprecated Junit4Fragment2 and extend from JUnitFragment
  - changed StandardLanguage#junitSupport type to JUnitFragment
- Extended JUnitFragment to produce JUnit version specific code
- Added junitVersion property to WizardConfiguration
- generate JUnit 5 specific configuration to workflow when JUnit 5 is
configured
- TestProjectDescriptor: Configure JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-16 13:27:43 +02:00
Arne Deutsch
c98df4f7bc [eclipse/xtext-eclipse#599] Fix review findings.
Change field names to 'projectWizard' and 'fileWizard'.

Document MWE entities.

Deprecate SimpleProjectWizardFragment2.

Add @Beta annotations.

Update copyright comments.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-11 10:17:36 +02:00
Arne Deutsch
503e1c7843 Merge branch 'master' of git@github.com:eclipse/xtext-core.git into xtext-eclipse-599 2018-04-04 14:20:34 +02:00
Arne Deutsch
b92affb486 [eclipse/xtext-eclipse#599] Adding fragment for new file wizard.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-04 14:16:36 +02:00
Alex Tugarev
fa8e8b2b26 fix error in ValidatorFragment2
Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
2018-04-04 11:30:45 +02:00
Alex Tugarev
d81b59d636 [validation] fix generation of issue code provider
use grammar info instead of `MyDsl`.

cf. https://github.com/eclipse/xtext-core/pull/680

Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
2018-04-03 08:39:14 +02:00
Christian Dietrich
6e23809dee reduced warnings
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-03-29 14:36:26 +02:00
Holger Schill
e75a44c254
Merge pull request #680 from eclipse/hs/ValidationFragment2_configurableIssue
Hs/validation fragment2 configurable issue
2018-03-29 13:12:15 +02:00
Christian Dietrich
76053c6136
Merge pull request #678 from miklossy/master
[479833] Formatter2Fragment2 stub improvements.
2018-03-28 19:01:43 +02:00
Holger Schill
026df8e630 Make multiple annotations on enum rule possible
Add validations to see if Annotation works on the rule in the grammar
Add configurable issue for @Deprecate Annotation
2018-03-28 18:03:29 +02:00
Titouan Vervack
127fa42d17 Removed redundant modifiers
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-03-28 17:41:41 +02:00
Tamas Miklossy
ac7215e80c [479833] Formatter2Fragment2 stub improvements.
- Make the generated Formatter.xtend stub more concise by eliminating
unnecessary semicolons, by eliminating explicit type before the for loop
variable and by using the EReference feature name (instead of its getter
accessor name) in the for loop collection.
- Refactor the Formatter2Fragment2 class to make it more testable.
- Modify the AbstractGeneratorFragmentTests to set the resourceSet into
the used StandardLanguage (needed by the Formatter2Fragment2).
- Implement corresponding Formatter2Fragment2 test cases.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2018-03-28 13:05:17 +02:00
Christian Dietrich
80d27192d5 Fixed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-03-27 07:50:29 +02:00
Holger Schill
3c4601363e Make use of JavaFileAccess to get better results to compare. 2018-03-26 18:25:04 +02:00
Holger Schill
2af21460ea Add javaDoc to new Fragments 2018-03-26 17:44:02 +02:00
Holger Schill
0e93f81c2d Work with GenModel without pollution the environment with globals 2018-03-26 16:31:17 +02:00
Holger Schill
59b8642d93 Use exists instead of Java 8 syntax in Fragments.
Reenable Fragment tests -> Last build ran green without those tests.
Try with approach to not load XMLPackage Class
2018-03-26 15:24:49 +02:00
Holger Schill
cb1b9ef32c Adjust @since tag
Disable GeneratorFragmentTests again since an NPE happens on the CI and we want to find out if this is the cause for the other tests to fail.
2018-03-26 15:12:34 +02:00
Holger Schill
70886d54a5 Make ResourceDesecriptionStrategyFragment and ValidationFragment more configurable 2018-03-26 12:40:19 +02:00
Holger Schill
d377312850 Merge branch 'master' into hs/664_grammarannotations 2018-03-26 11:19:49 +02:00
Holger Schill
047b035d55 Apply changes from review comments from 23.3 2018-03-26 10:46:20 +02:00
Karsten Thoms
e689a0a723 [eclipse/xtext-eclipse#520] Use type references
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-03-23 12:08:52 +01:00
Karsten Thoms
52becf6462 [eclipse/xtext-eclipse#520] Adjust to latest API
The code mining provider base class has been renamed and only offers one
abstract method to implement by clients.
Also some minor cleanups.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-03-22 17:54:30 +01:00
Holger Schill
8893b09e57 GrammarAnnotations: @Deprecated Annotation and corresponding tests 2018-03-22 14:40:23 +01:00
Holger Schill
fafdce378e Merge branch 'master' into grammarannotations 2018-03-22 11:17:31 +01:00
Holger Schill
f995ce41ec Refactor names of generated Classes of ResourceDescriptionStrategyFragment 2018-03-22 11:12:43 +01:00
Holger Schill
a25e761971 Grammarannotations - Exported annotation and corresponding Fragment incl. tests 2018-03-22 09:02:27 +01:00
Karsten Thoms
18834db32d [eclipse/xtext-eclipse#520] Revert unwanted changes
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-03-21 14:46:19 +01:00
Karsten Thoms
aa0561cdb9 [eclipse/xtext#520] Code Mining integration
- Rename class suffix 'Strategy' -> 'Provider'
- Reduce dependencies of generated bundles
- Move provider from generid IDE to Eclipse plugin project
- Binding of reconciler strategies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-03-20 16:29:31 +01:00
René Purrio
b69051f260 [eclipse/xtext-eclipse#520] code mining support with own api
Signed-off-by: René Purrio <rpurrio@itemis.de>
2018-03-19 06:50:38 +01:00
Karsten Thoms
7a66642d2d
Merge pull request #593 from ArneDeutsch/feature-1154
[#1154] Add new project wizard with project template support.
2018-03-06 10:38:55 +01:00
Christian Dietrich
58113d0f41 Regenerated against lastest xbase-lib
https://github.com/eclipse/xtext/issues/1174

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-26 15:07:09 +01:00
Christian Dietrich
7ab31042c8 maintained x-friends https://github.com/eclipse/xtext/issues/1173
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-23 15:57:53 +01:00
Arne Deutsch
3059f43ea4 [eclipse/xtext#1154] Remove dead code.
Use groups in example project template.
Beautify generated code for project templates.
Add some comments.

Change-Id: Ic5c5c1bff84bcb5af9f7b2b3102b7c3c92e9ed06
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-02-13 15:58:58 +01:00
Arne Deutsch
3e208399ac [eclipse/xtext#1154] Support multi projects in project template.
Change-Id: Ifc7950849f9c9c8683f22a373f11ee59fadaac2c
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-02-13 15:58:55 +01:00
Arne Deutsch
0264ed7756 [eclipse/xtext-eclipse#1154] Creating multiple projects from template.
Change-Id: Id1a1652146b2b640cf087596e0f96774ee90c9bb
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-02-13 15:58:52 +01:00
Arne Deutsch
cbdf85dde9 [eclipse/xtext#1154] Add new project wizard with project
template support.
Extend API to support binary file creation in fragments.

Change-Id: Id6125668363e3e8e7e0703d3c5e448c8ca2ef5b4
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-02-13 15:58:43 +01:00
Karsten Thoms
809377cd27 [420984] Compiler optimization: Suppress creation of unused exception variable
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-16 14:54:22 +01:00
Karsten Thoms
90cef27ab4 [eclipse/xtext#1160] Update copyright date range
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-16 09:11:22 +01:00
Karsten Thoms
134c788006 [eclipse/xtext#1160] Update copyright date range
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-15 16:28:39 +01:00
Christian Dietrich
2771f6dee0
Merge pull request #581 from eclipse/cd_extras_issue211
[J9] consume jdt version in maven/gradle that does support Java 9
2017-12-21 15:22:47 +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
Christian Dietrich
30bf17d0e6 [J9] consume jdt version in maven/gradle that does support Java 9 https://github.com/eclipse/xtext-extras/issues/211
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-21 09:10:29 +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
Sebastian Zarnekow
5940623fac
Merge pull request #591 from eclipse/sz_regenerateAllLanguages
Regenerate all languages
2017-12-18 11:08:29 +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
Sebastian Zarnekow
b6a9f76938 Fixed regression in Xtext generator for type names 2017-12-08 17:17:33 +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
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
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
f6a1abe53d Fixed warnings 2017-12-06 14:46:33 +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
6f78cb9084 Merge branch 'master' into sz_contentAssistPRC 2017-12-01 12:13:06 +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
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
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
Julian Dax
a7bf8945b2
Add contentTypeBinding to content[Merge]Viewers
Fixes #542

Signed-off-by: Julian Dax <jdax@itemis.com>
2017-11-15 13:00:05 +01:00
Christian Dietrich
827be6cc3a export all packages as interal to ease subclassing #540
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-10 13:58:48 +01:00
Christian Dietrich
016bf16d3b reuse calculated genclasses/genpackages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-08 09:59:59 +01:00
Christian Dietrich
def098c3a7 Fixed Issue with TypeReference and Custom Pre/Suffixes in EMF #530
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-07 19:53:57 +01:00
Christian Dietrich
4960af9c0a set version to 2.14
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-10-27 09:03:34 +02:00
Karsten Thoms
5b7f5ecf90 [525746] Set Xbase/Xtend lib lower version constraint
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-09 21:39:12 +02:00
Karsten Thoms
0e7772e469 [525746] Extended runtime project config
- added getXbaseLibVersionLowerBound
- added getXtendLibVersionLowerBound

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-09 12:32:26 +02:00
Jan Koehnlein
ded0ce36de GH-487 reverted TypeReference change and fixed usage in RefactorElementNameFragment2
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
2017-10-02 20:56:11 +02:00
Jan Koehnlein
389013e886 [generator] added option to RefactorElementNameFragment to generate CS-based refactoring code 2017-10-02 15:19:51 +02:00
Jan Koehnlein
307bd2b313 [generator] allow inner classes to be bound by fragments 2017-10-02 15:18:48 +02:00
Karsten Thoms
df893fa468 [#470] Contribute org.eclipse.core.contenttype.contentTypes extension
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-09-25 23:04:10 +02:00
Sebastian Zarnekow
34e439a4fd Improved code generator for ContentAssistParser
We can cache the method names by extracting the nameMapping to an own type
that is marked as singleton. This will make CA slightly snappier especially
for very large grammars.
2017-09-13 18:21:19 +02:00
Sebastian Zarnekow
eef480ac2b Fixed problem with referenced, missing methods in nameMapping 2017-09-13 10:29:55 +02:00
Christian Dietrich
b3728a39a2 made CodetemplatesGeneratorFragment2 disableable
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-09-07 15:22:30 +02:00
Christian Dietrich
ca4f22fc49 introduced ConditionalXtextGeneratorFragment
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-09-07 10:21:10 +02:00
Sebastian Zarnekow
1c5b2b0320 Merge pull request #366 from eclipse/sz_bug476690
Refined token placement for indentation based languages
2017-09-05 23:02:36 +02:00
Christian Dietrich
d5d4a0db04 [473623] Generator Support for enablement of XImportSection
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-08-30 13:48:33 +02:00
Hendrik Eeckhaut
681d8d5a0d Created TaskTagPreferencePageFragment2
Signed-off-by: Hendrik Eeckhaut <hendrik.eeckhaut@sigasi.com>
2017-08-18 16:42:19 +02:00
Christian Dietrich
09b1e98a21 generate initialization of nameMapping with chunked method calls #419
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-08-14 17:42:11 +02:00
Karsten Thoms
c148fe40a9 Merge pull request #377 from eclipse/kth_bug462906
safe retrieval of bundle in EEF
2017-07-06 12:29:22 +02:00
Karsten Thoms
02197314d9 safe retrieval of bundle
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-04 13:53:15 +02:00
Christian Dietrich
4794820d28 cleanup after refactoring
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-07-04 08:33:15 +02:00
Christian Dietrich
cab0988d33 QualifiedClazzName->QualifiedClassName
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-07-04 05:48:43 +02:00
Karsten Thoms
6d11cfd977 Merge branch 'master' of git@github.com:eclipse/xtext-core.git 2017-07-03 16:57:07 +02:00
Karsten Thoms
ff3a0847b9 removed unused import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-03 16:56:50 +02:00
Karsten Thoms
f46a269fdd gradleprojectbuilder added by Buildship project import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-01 23:09:36 +02:00
Christian Dietrich
624e4fa53b try to fix problem with bad naming convention epackages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-06-29 09:17:09 +02:00
Sebastian Zarnekow
550eede373 Adjustments to XtextAntlrGeneratorFragment 2017-06-12 15:24:23 +02:00
Christian Dietrich
c52eced33e better message in parsing test
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-06-02 17:29:11 +02:00
Sebastian Zarnekow
ede5399151 Extract method to avoid deprecation warning 2017-06-02 12:40:37 +02:00
Miro Spönemann
a75bac8287 Increased version number to 2.13.0-SNAPSHOT 2017-05-24 13:41:16 +02:00
Christian Dietrich
b7801f175a Merge pull request #316 from eclipse/cd_bug481287
[481287] Fixed bug in plugin.xml content comparison of xtext generator
2017-04-26 10:21:26 +02:00
Christian Dietrich
05221db4cc [508810] Referencing EStringToStringMapEntry results in compile Error in generated Abstract*SemanticSequencer
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-04-17 10:40:45 +02:00
Christian Dietrich
b500e77119 better name conflict resolving in formatter stub. fixes #317
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-04-07 07:19:31 +02:00
Christian Dietrich
8f00827a96 [481287] Fixed bug in plugin.xml content comparison of xtext generator
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-04-06 12:42:55 +02:00
Christian Dietrich
4db0732ef5 fixed broken javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-03-13 12:18:29 +01:00
Karsten Thoms
2070a18a5b Fixed link to documentation
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-03-02 04:52:55 +01:00
Christian Dietrich
3d74fa82e3 [415677] Language Specific Compare Viewer title
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-02-14 15:26:35 +01:00
Christian Dietrich
b5055c9aff Respect @Repeatable property of Annotations in the Xtext Generator. Fixes #270
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-02-03 11:59:42 +01:00
Miro Spönemann
fb8a4fe495 #58: Removed some @noreference, @noextend tags; added Javadoc documentation 2017-01-19 11:10:05 +01:00
Miro Spönemann
8f9a5c0e27 Merge pull request #255 from eclipse/msp_issue223
Deprecated XtextGeneratorLanguage.generateXtendStubs
2017-01-19 11:09:40 +01:00
Miro Spönemann
ba911b4790 Lifted version number to 2.12.0-SNAPSHOT 2017-01-18 11:47:03 +01:00
Miro Spönemann
a8c41d7007 #223: Deprecated XtextGeneratorLanguage.generateXtendStubs 2017-01-18 10:05:35 +01:00
Lorenzo Bettini
da3d6d9e75 244: .xtext.junit4 .xbase.junit added to ui.tests by mwe2
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-16 11:45:38 +01:00
Lorenzo Bettini
0f95ed92b9 230: added flag skipXbaseTestingPackage
Task-Url: https://github.com/eclipse/xtext-core/issues/230
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-12 13:27:48 +01:00
Lorenzo Bettini
4db60c8130 Merge branch 'master' into task_230-Junit4Fragment2_added 2017-01-12 11:11:36 +01:00
Miro Spönemann
0515d22685 Refreshed projects with Buildship 2.0 2017-01-12 10:32:06 +01:00
Lorenzo Bettini
eca73e86a5 generated Xtend servlet class should use !== instead of !=
Since now Xtend issues a warning if you use != with null.

Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 14:54:27 +01:00
Lorenzo Bettini
d65d1f1dd6 230: Junit4Fragment2 added dependencies for .tests project
Task-Url: https://github.com/eclipse/xtext-core/issues/230
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-10 18:40:49 +01:00
Miro Spönemann
43bf2b58f2 [generator] Some fixes:
- XtextGeneratorLanguage was injecting its members incorrectly.
 - LanguageModule must bind the language to a provider to prevent Guice from injecting its members implicitly (masking the previous bug).
 - EMFGeneratorFragment2.updateBuildProperties() should do nothing when build.properties does not exist.
2017-01-09 15:17:04 +01:00
Karsten Thoms
56f1d1079e [492072] Regenerated Xtend code
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-02 14:33:55 +01:00
Karsten Thoms
c9b7bf5af2 [492072] Minimized usage of local variables
The Xtend compiler was optimized to minimize the usage of synthetic variables for member feature calls and right-hand assignments

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-22 00:54:25 +01:00
Karsten Thoms
f2b5cdfe39 [507077] Do not emit empty concatenation
Changes to generated Xtend code due to compiler optimization

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-19 15:47:59 +01:00
Christian Schneider
9aa6d7b13a [generator] consolidation of IDE-related names in 'XtextGeneratorNaming'
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-12-13 11:32:17 +01:00
Christian Schneider
39170e7463 generated code of "[generator] fixed copy-paste bug in 'XtextGeneratorResourceSetInitializer'"
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-12-12 12:14:13 +01:00
Christian Schneider
45bca778f2 [generator] fixed copy-paste bug in 'XtextGeneratorResourceSetInitializer'
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-12-12 11:49:19 +01:00
Karsten Thoms
396f8e3ce3 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals
For comparison with null the triple (not) equal operator should be used.
Resolved compiler warnings


Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-05 16:03:22 +01:00
Christian Dietrich
a912f46272 fixed broken generator regarding !== and ===. fixes #189
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-12-04 09:16:39 +01:00
Karsten Thoms
b4d74f732b [eclipse/xtext#1089] Regenerated xtend-gen code
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-02 16:47:33 +01:00
Karsten Thoms
08194ce996 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals
For comparison with null the triple (not) equal operator should be used. Resolved compiler warnings

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-02 16:46:25 +01:00
Karsten Thoms
79c3eab77c [#5] Changes to .classpath generated by Buildship import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-30 10:00:21 +01:00
Christian Dietrich
7377d51f13 Merge pull request #182 from eclipse/kth/umbrella-issue3-gradle-composite
Gradle composite
2016-11-29 11:37:19 +01:00
Karsten Thoms
8c381f8d59 Gradle composite
see https://github.com/eclipse/xtext-umbrella/issues/3

Remove org.eclipse.buildship.core.prefs
Files are generated on Gradle project import or by Oomph setup

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-28 14:41:08 +01:00
Tamas Miklossy
492dab8bdc [#183] Remove trailing whitespaces
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2016-11-28 12:16:52 +01:00
Karsten Thoms
c637df9451 Gradle composite
connection.project.dir changed to composite build location in new
umbrella project
value 'containers' added by Buildship

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-25 08:49:49 +01:00
Karsten Thoms
b4cf8ed1d0 [406914] Explicitly map identifiers for tab, cr and lf
The underlying ICU transliterator maps the special characters to
'Control'<code>, so these characters have to be mapped without using
ICU. Further to keep camel case of the mapped text the text is mapped
directly in toJavaIdentifierSegment.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-22 08:35:00 +01:00
Christian Dietrich
1188ec13e7 Merge pull request #119 from kthoms/kth/issue118
[#118] Improve generated test code
2016-11-16 14:40:59 +01:00
Sven Efftinge
d46e8af5eb Merge pull request #168 from eclipse/lsp4j
[LSP] migrated to lsp4j 0.1.0
2016-11-08 09:25:43 +01:00
Christian Dietrich
f5b0d3ca14 [#169] [StandaloneSetup] Unnecessary trailing whitespaces
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-11-08 09:23:08 +01:00
Sven Efftinge
baebe053cd [LSP] migrated to lsp4j 0.1.0 2016-11-05 20:52:35 +01:00
Sven Efftinge
f81ef24e49 Merge pull request #151 from eclipse/cs/generatorMod
[xtext.xtext.generator] moved of a generated comment in 'AbstractAntlrGrammarGenerator'
2016-11-01 21:37:51 +01:00
Miro Spönemann
b92f63bc54 eclipse/xtext#1080: Add name and description to generated poms
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-23 13:36:04 +02:00
Christian Dietrich
fd6afda9bf [WEB][Wizard][Generator] Update JS Libary Versions. Fixed #156
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-10-20 13:04:49 +02:00
Christian Schneider
08db089455 [xtext.xtext.generator] moved of a generated comment in 'AbstractAntlrGrammarGenerator'
should now be in line with the former template in 'ParameterizedLexerGrammar.xpt'

Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-10-17 20:53:42 +02:00
Christian Dietrich
7bf4f2ee7b add .testing to dependencies of ui tests
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-10-17 15:22:19 +02:00
Miro Spönemann
6e9931dfaa #143: Added ExecutorServiceProvider for better handling of executor instances
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-17 09:45:47 +02:00
Miro Spönemann
282f734fa0 Fixed #127: Add means for controlling the lifecycle of executors
Also prepared changes required for eclipse/xtext-web#6

Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-14 15:14:24 +02:00
Moritz Eysholdt
80a6f9fcf8 [serializer/performance] avoid redundant grammar analysis 2016-10-11 08:49:25 +02:00
Karsten Thoms
81fd0de7dc [#118] Add validation that resource has no errors
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-10-11 00:01:37 +02:00
Moritz Eysholdt
c683d48d8b [serializer/performance] never resolve cross references
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 20:16:47 +02:00
Moritz Eysholdt
914880e1d7 [XtextGenerator] improve error reporting
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 20:16:47 +02:00
Karsten Thoms
312e0af4d6 [#5] Ignore optional compile problems on *-gen source folders
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-09-23 15:51:18 +02:00
Moritz Eysholdt
86dddf8612 Merge pull request #96 from kthoms/kth/bug378980
[378980] Make line delimiter for Manifest configurable by CodeConfig
2016-09-12 14:10:48 +02:00
Karsten Thoms
36ec5d1e24 [378980] Make line delimiter for Manifest configurable by CodeConfig
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-09-12 14:04:13 +02:00
Sven Efftinge
ca9a755c7e Merge pull request #68 from kthoms/issue67_test_packages_xinternal
[#67] Mark exported test packages as internal
2016-09-12 10:22:09 +02:00
Moritz Eysholdt
79118e564d Merge pull request #72 from eclipse/me_xtextresource
introduce XtextResource#setEntryPoint(ParserRule)
2016-08-12 13:46:25 +02:00
Karsten Thoms
a94438ea69 [431435] Bind generated EPackage and EFactory
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-11 21:23:07 +02:00
Moritz Eysholdt
676736a4b8 [#16, contentAssist] add support for custom parser entry points
ContentAssist needs to use the entry point that can be obtained via 

NodeModelUtils.getEntryParserRule(INode) or 
XtextResource.getEntryPoint()

To support this, AbstractContentAssistParser does now implement 
IPartialEditingContentAssistParser, which is an interface that has been
introduced some time ago for the CodeTemplates language.

XtextAntlrGeneratorFragment2 will no longer generate getFollowElements()
for each language because that method is only able to invoke the first 
parser rule. Instead, there is now a gneric implementation in the super 
class.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:50 +02:00
Moritz Eysholdt
07d38dd13b bugfix: binding for partial content assist is IDE, not UI
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:47 +02:00
Karsten Thoms
cd9290aa30 [#67] Mark exported test packages as internal
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-10 14:12:28 +02:00
Christian Dietrich
c69a4e378e fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=465171
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-03 16:40:25 +02:00
Jan Koehnlein
76c5f1f524 [generator] Provider bindings cannot be overridden #63 2016-08-02 10:08:30 +02:00
Christian Dietrich
76bcf589d1 - escape */ in javadoc of syntactic sequencer.
- fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=398890
- added testcase for Bug 398890
- fixed wrong escaping of /* and */ in grammar access

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-31 21:58:44 +02:00
Lorenzo Bettini
c0bc6616b5 40: toVarName handles EReference differently
Task-Url: https://github.com/eclipse/xtext-eclipse/issues/40
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2016-07-18 14:35:07 +02:00
Miro Spönemann
c55e48ce66 [generator] Fixed error message 2016-07-15 12:10:58 +02:00
Miro Spönemann
761ffeac7e Merge branch 'msp/testWorkflows' 2016-07-13 08:37:47 +02:00
Miro Spönemann
521c0ca7a8 [generator] Added property grammarEncoding, removed restoreEncoding() method 2016-07-13 08:26:56 +02:00
Miro Spönemann
5f19ad2cae Merge branch 'msp/generatorEncoding' into msp/testWorkflows 2016-07-12 16:06:14 +02:00
Miro Spönemann
0bfd8f296d [generator] Added initialization of encoding for the Xtext grammar language 2016-07-12 16:00:23 +02:00
Miro Spönemann
6a5c86e070 Merge branch 'msp/ignoreCaseLexer' into msp/testWorkflows 2016-07-12 11:11:46 +02:00
Miro Spönemann
6725411f9f [generator] Use KeywordHelper to obtain all keywords 2016-07-12 08:38:23 +02:00
Christian Dietrich
b0d0d33bde #32 fixed bug in FragmentFakingEcoreResource
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-11 18:55:20 +02:00
Miro Spönemann
f301aa119c Made scoping fragment extensible to support import URI 2016-07-11 17:52:59 +02:00
Christian Dietrich
db0c4628c0 fixed broken manifests
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-07 13:47:21 +02:00
Sven Efftinge
24dad56ff4 made testlanguages project generator work again 2016-07-07 11:31:14 +02:00
Miro Spönemann
950eb8ae74 Removed old Gradle integration prefs 2016-07-07 11:22:13 +02:00
Miro Spönemann
decf9b22aa Checked in project metadata based on Buildship 2016-07-07 10:19:04 +02:00
Alex Tugarev
b05457e604 [web] Adjusting the order of patterns for Orion's highlighting configuration to fix bracket matching. See also Orion bug #497097
Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
2016-07-01 13:12:41 +02:00
Sven Efftinge
21423cc18c [ide] added IdeModule and IdeSetup - fixed #11 2016-06-21 11:54:54 +02:00
Moritz Eysholdt
ffa109f37f Smaller changes 2016-06-17 18:31:26 +02:00
Miro Spönemann
e2380de556 [generator] Moved Xbase web module superclass configuration to main generator method 2016-06-16 15:29:28 +02:00
Miro Spönemann
e1a4782403 Generated code 2016-06-14 09:45:31 +02:00
Miro Spönemann
96edcf48ae Removed buildship.core.prefs 2016-06-14 09:44:34 +02:00
Miro Spönemann
4270986cba Moved projects to root of repository 2016-06-14 08:30:25 +02:00