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

373 commits

Author SHA1 Message Date
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
893a6ed207 Make tests run again 2018-03-26 14:45:59 +02:00
Holger Schill
9641e3b52c Bypass resolution of all crossRefs for FragmentTests. 
Reenable all Fragmenttests
 2018-03-26 13:34:06 +02:00
Holger Schill
66c27998e8 Ignore Fragment-tests to see if the server behaves different for CI now. 
This is a temporally state
 2018-03-26 13:24:32 +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
Florian Stolte
73677dccb3 Fixed a test that did not work on windows due to line ending issues 
Signed-off-by: Florian Stolte <fstolte@gmx.de>
 2018-03-23 11:21:06 +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
Sebastian Zarnekow
7da28520af
Merge pull request #663 from eclipse/sz/bug361216 
[361216] Improved logic that registers scope wrappers
 2018-03-21 18:48:14 +01:00
Sebastian Zarnekow
a46f701920 Incorporated review feedback 2018-03-21 17:23:28 +01:00
Sebastian Zarnekow
9adf2d94ed [361216] Improved logic that registeres scope wrappers 2018-03-21 17:13:06 +01:00
Arne Deutsch
e90230f1b1 [#476] Support EMF's ResourceLocators in XtextResourceSet. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-03-21 15:40:22 +01:00
Holger Schill
04e0375fec Introduce Final Annotation on ParserRules and corresponding test 2018-03-20 16:57:28 +01:00
Christian Dietrich
2d8c00c5cc Updated to Gradle Wrapper Version 4.6 
https://github.com/eclipse/xtext/issues/1177

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-03-09 17:31:43 +01:00
Karsten Thoms
4fea27469a
Merge pull request #651 from eclipse/kth_qn_startwith_null 
startsWith: return false for null argument
 2018-03-05 14:36:29 +01:00
Karsten Thoms
2e534b5246 startsWith: check that prefix is not null 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-03-05 11:41:44 +01:00
Moritz Eysholdt
43b7d1df8c Handle comments and whitespace properly in rewrite scenarios 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-03-04 19:41:46 +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
Karsten Thoms
d1ee1b9857
Merge pull request #601 from eclipse/cd_issue596 
[#596] updated tycho version to 1.1.0 to support java 9 in tycho builds as well
 2018-02-02 23:39:07 +01:00
Karsten Thoms
6ede291fbf
Merge pull request #628 from eclipse/kth_issue627 
[#627] Compute Xtext version from Bundle-Version
 2018-02-02 14:11:55 +01:00
Karsten Thoms
266c673d87 [#627] Compute Xtext version from Bundle-Version 
Reads the version from the 'Maven-Version'
attribute from org.eclipse.xtext.util manifest. It has a static value
of 'unspecified' and gets replaced in a Gradle build.
In devmode the value is not replaced, but the right version can be
computed from the Bundle-Version attribute.

Change-Id: I5b5028ca35c04e4708a07b0c0544dce20810d273
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-02-02 09:16:51 +01:00
Christian Dietrich
f66e355058 [#596] updated tycho version to 1.1.0 to support java 9 in tycho builds as well 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-30 16:13:54 +01:00
Karsten Thoms
22c2c4c98f [#623] Update wizard expectations 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-30 12:07:17 +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
8d0268e386
Merge pull request #619 from eclipse/kth_issue1160 
[eclipse/xtext#1160] Update copyright date range
 2018-01-16 11:00:31 +01:00
Lorenzo Bettini
1514fd8f43
Merge pull request #612 from eclipse/lb/generated-maven-pom 
Lb/generated maven pom
 2018-01-16 09:52:00 +01:00
Karsten Thoms
a61200a0cd [eclipse/xtext#1160] Fixed test expectation 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-16 09:15:34 +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
2184d4de50
Merge pull request #615 from eclipse/kth_issue1160 
[eclipse/xtext#1160] Update copyright date range
 2018-01-16 06:14:56 +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
09cb0c1a90 [#517] Move More Code to JavaVersion 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-15 15:50:07 +01:00
Lorenzo Bettini
a05c6a6852 updated CliWizardIntegrationTest expectations 
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2018-01-15 11:50:36 +01:00
Christian Dietrich
5b3cc90ec6 [#605] Added Test for J9 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-09 19:29:26 +01:00
Christian Dietrich
fd0a80a0cb [#602] [J9][Wizard] Use latest Oxygen Release in Target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-09 15:59:42 +01:00
Sebastian Zarnekow
5940623fac
Merge pull request #591 from eclipse/sz_regenerateAllLanguages 
Regenerate all languages
 2017-12-18 11:08:29 +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
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
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
2ec798bcb7 use asm 6 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-13 22:12:46 +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
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
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
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
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
15b13a279d GH-520 allow shadowed resource descriptions in language server scenario 2017-12-05 20:56:55 +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
Christian Dietrich
629c9db4bd Fixed Test Problem on Windows #557 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-28 09:57:19 +01:00
Florian Stolte
c322f3e73a [#556] Added test for TextRegionsToString::quote 
Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-11-22 16:55:51 +01:00
Christian Dietrich
8f51de3cc4 use newer gradle plugin 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-22 08:48:26 +01:00
Christian Dietrich
84533e40f1 fixed formatting of annotations (e.g. @Override) in Xtext Grammars #534 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-08 22:16:22 +01:00
Christian Dietrich
9b28ee1960 dont exclude required xtextbin and tokens files from fat jars #533 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-08 22:11:50 +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
c7b439923d [#512] Maven AppAssembler - Reduce length of classpath 
On windows the generated classpath in start scripts might become too
long. This can be avoided by additional configuration of the
appassembler-maven-plugin plugin:
- added option repositoryLayout=flat
- added option useWildcardClassPath=true

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-19 14:31:17 +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
1ecb623d5f [525746] Set lower bound for org.eclipse.xtext.xbase.lib 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-09 12:29:55 +02:00
Christian Dietrich
81df41e85b removed unused imports 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-05 08:26:22 +02:00
Jan Koehnlein
08ab8fe119 GH-488 fixed DefaultReferenceDescription test 
We need the fragment path URIs in the renam scenario only

Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-10-02 20:56:19 +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
Christian Dietrich
60a079fe75 ignored DefaultReferenceDescriptionTes #488 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-02 20:34:33 +02:00
Christian Dietrich
ff889c133f ignored failing tests #487 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-02 20:23:15 +02:00
Jan Koehnlein
dd3513b8a9 [refactoring] Fixes in core for https://github.com/eclipse/xtext-eclipse/issues/284 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-10-02 18:08:52 +02:00
Thomas Kutz
0b74443d41 [#483] Append trailing whitespaces and newlines after appending separator in for-loops 
Signed-off-by: Thomas Kutz <thomas.kutz@itemis.de>
 2017-09-29 13:40:36 +02:00
Karsten Thoms
bae491cbbf Merge pull request #479 from eclipse/issue355_update_repo_urls 
[#355] Update repository URLs
 2017-09-28 11:34:05 +02:00
Karsten Thoms
c507600bb9 [#355] Update MWE to 2.9.1 
Changed wizard test expectation

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-09-28 11:19:33 +02:00
Karsten Thoms
3512bacf62 [#355] Update repository URLs 
- MWE 2.9.1
- Oxygen.1

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-09-28 11:03:57 +02:00
Christian Dietrich
9f287c9ed1 Merge pull request #465 from eclipse/cd_extras_issue26 
URIsInEcoreFilesTest fails in Eclipse
 2017-09-27 11:03:00 +02:00
Christian Dietrich
6b98c5cd09 Merge pull request #469 from eclipse/cd_issue460_indent 
fixed indent tests on windows #460
 2017-09-26 14:12:38 +02:00
Christian Dietrich
36792dd026 Merge pull request #466 from eclipse/cd_issue348 
removed EncodingTest.testSetup #348
 2017-09-25 15:52:16 +02:00
Christian Dietrich
762430602a fixed indent tests on windows #460 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-25 10:54:56 +02:00
Christian Dietrich
b71f866eb3 [Tracing] Allow to specify UseForDebugging #467 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-22 13:25:42 +02:00
Christian Dietrich
d5d1e3c88f removed EncodingTest.testSetup #348 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-21 09:53:21 +02:00
Christian Dietrich
94f10f680c URIsInEcoreFilesTest fails in Eclipse 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-20 11:39:52 +02:00
Moritz Eysholdt
846e686bd7 [formatter] improved comment handling in undefined regions 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-09-12 09:18:26 +02:00
Christian Dietrich
0a72876241 improved error message 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-06 10:38:41 +02:00
Christian Dietrich
7b2e23b94e [479137]improved Misleading error message 'Cannot create datatype' for terminal rule #91 
- added test
- fixed broken test framework
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-06 09:34:28 +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
0f99a6e6a3 removed unused imports / dead code 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-05 20:07:14 +02:00
Moritz Eysholdt
6a55da1434 [TextRegionDiffBuilder] improved handling of multi-inserts 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-23 17:31:59 +02:00
Moritz Eysholdt
760c7f92d3 bundle from xtext-core should not depend on downstream repos 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-22 17:24:37 +02:00
Moritz Eysholdt
ae9d0259ef fixed #438: error in ITextRegionAccess.regionForLineAtOffset(int) 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-21 19:25:51 +02:00
Moritz Eysholdt
b913ac015f [TextRegionAccess] Allow usage on mutable EMF models 
This includes the possibility that an EObject has been removed from the
EMF containment tree or moved to another resource.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-20 20:10:02 +02:00
Moritz Eysholdt
fcdd7c4011 [TextRegionAccess] keep track of containment among EObjectRegions 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-18 11:24:29 +02:00
Christian Dietrich
79b887e3de Merge pull request #418 from eclipse/cd_issue417 
Fixed FormattableDocumentTest.autoWrapInsert on windows
 2017-08-16 08:30:54 +02:00
Moritz Eysholdt
6e1c95670e Moved Ecore support to test languages 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-11 11:58:03 +02:00
Moritz Eysholdt
b21c274f8b regenerated test languages 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-11 11:58:03 +02:00
Moritz Eysholdt
0845899c84 Support Modifications on a TextRegionAccess 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-11 08:07:05 +02:00
Moritz Eysholdt
3193d0240f Updated region access test language 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-11 08:07:05 +02:00
Christian Dietrich
5eba4a0ba5 Fixed FormattableDocumentTest.autoWrapInsert on windows 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-08-10 14:46:21 +02:00
Christian Dietrich
4857bce25b [468777] [formatter] ITextRegionAccess.regionForEObject(EObject) should throw exception for resource-external eobjects 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-08-04 13:37:02 +02:00
Karsten Thoms
715bcb249b [eclipse/xtext-eclipse#299] Added support for Language Server Jar 
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-08-03 17:31:40 +02:00
Karsten Thoms
ba4bd8afea [eclipse/xtext-eclipse#299] Added support for Language Server Jar 
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-08-03 14:33:21 +02:00
Karsten Thoms
4a5f5e5e15 [eclipse/xtext-eclipse#299] Added support for Language Server Jar 
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-07-31 10:05:33 +02:00