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
7682 commits 41 branches 98 tags 41 MiB
Commit graph

730 commits

Author SHA1 Message Date
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
Moritz Eysholdt
2b268a4f4f fix #301: Improved support for IAutoWrapFormatter 
The previous fix 
906be319a4
dind't handle insertion of new ITextReplacers

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-07-10 22:15:20 +02:00
Christian Dietrich
8eecbdcd4d [519299] LiveShadowedAllContainerState.containsURI() breaks scoping while refactoring (regression) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-07-06 15:19:07 +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
197ad484d7 updated target platform to oxygen. fixes https://github.com/eclipse/xtext-eclipse/issues/242 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-06-29 12:55:55 +02:00
Sebastian Zarnekow
14b2f35684 Yet another attempt (tm) 2017-06-13 19:45:29 +02:00
Sebastian Zarnekow
9ba194e7f4 Another attempt to fix all the things (tm) 2017-06-13 16:45:44 +02:00
Sebastian Zarnekow
21320c6f85 Renamend another test class to *Suite 2017-06-13 15:53:13 +02:00
Sebastian Zarnekow
9f60f6ea38 More test cases for snythetic token placement 2017-06-12 15:02:55 +02:00
Christian Dietrich
cafeaec480 use xtext gradle plugin version 1.0.18 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-06-09 17:28:55 +02:00
Christian Dietrich
1466ed1675 use gradle 3.5 in new project wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-06-09 09:08:19 +02:00
Christian Dietrich
f7993d9e87 Merge pull request #356 from eclipse/cd_eclipse_issue272 
Fixed problem with the initial build after project creation in maven tycho
 2017-06-08 14:08:42 +02:00
Sebastian Zarnekow
19a3930632 Improved synthetic token placement 2017-06-07 10:31:21 +02:00
Sebastian Zarnekow
18c6233438 Mark test methods as deprecated that test deprecated code 2017-06-02 12:39:48 +02:00
Sebastian Zarnekow
beb7189a8b Suppress keyword validation in test languages 2017-06-02 12:36:53 +02:00
Christian Dietrich
7168c3a175 Fixed problem with the initial build after project creation in maven 
tycho
https://github.com/eclipse/xtext-eclipse/issues/272

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-29 14:06:58 +02:00
Christian Dietrich
569a3ab241 cleanup unused imports 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-24 15:11:20 +02:00
Christian Dietrich
a38d300cc3 code cleanup xtend warnings 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-24 14:52:38 +02:00
Christian Dietrich
12ff9ede5c regen with newest xtext 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-24 13:54:44 +02:00
Miro Spönemann
a75bac8287 Increased version number to 2.13.0-SNAPSHOT 2017-05-24 13:41:16 +02:00
Christian Dietrich
73531344c9 Fixed TracingSugarTest on Windows 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-21 08:55:20 +02:00
Christian Dietrich
d467c7fdbd Fixed CliWizardIntegrationTest on windows. #343 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-21 08:37:40 +02:00
Mikhail Mukhin
33ca000880 test fix fix 
Signed-off-by: Mikhail Muhin <delred@yandex.ru>
 2017-05-19 12:38:22 +03:00
Mikhail Muhin
66a57d59e5 Windows tests fix (linesep) 
Signed-off-by: Mikhail Muhin <delred@yandex.ru>
 2017-05-17 17:09:24 +03:00
Miro Spönemann
e9c0e220cf Don’t indent if there is no content, added another special case test 2017-05-02 09:17:59 +02:00
Miro Spönemann
3a115a7977 Fixed inconsistencies between TemplateNode and Xtend templates 2017-04-28 15:32:19 +02:00
Miro Spönemann
4345a10408 Code cleanup and comments 2017-04-28 09:25:10 +02:00
Miro Spönemann
e40329c501 Allow templates and generator nodes as input to append(Object), improved handling of indent nodes 2017-04-28 09:24:26 +02:00
Miro Spönemann
05dc198460 Fixed mismatch between IndentNode and TargetStringConcatenation wrt. indentation of the first line 2017-04-28 08:57:58 +02:00
Sven Efftinge
0cb38c5f4c [tracing] handle indent differently 2017-04-27 15:02:30 +02:00
Miro Spönemann
e1d1859709 Fixed IndexOutOfBoundsException in TemplateNode 2017-04-26 08:35:32 +02:00
Christian Dietrich
3f3a668214 Merge pull request #319 from eclipse/cd_issue219 
NPE in PartialParsingHelper #219
 2017-04-24 08:48:20 +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
5bb8a27d73 added test for #219 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-04-12 13:59:26 +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
Sven Efftinge
c86c7c1445 [tracing] Handle null argument in template append (fixes #314) 
Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
 2017-03-31 09:24:36 +02:00
Sven Efftinge
f2017600f9 [tracing] Handle null argument in template append (fixes #314) 2017-03-31 08:52:46 +02:00
Christian Dietrich
ffad50d897 Merge pull request #307 from eclipse/cd_bug410605 
[410605]  [grammar][terminal] Validate that EOF cannot be inverted
 2017-03-29 09:34:59 +02:00
Christian Dietrich
6ef6a0f16f Merge pull request #305 from eclipse/cd_bug380449 
[380449] Enhancements to Task Finder
 2017-03-29 09:30:41 +02:00
Christian Dietrich
697fc6dc67 [380449] implemented reuse of END_TAG pattern from MUltiLineCommentProvider 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-28 18:21:06 +02:00
Christian Dietrich
8e303f37ec Merge pull request #306 from eclipse/cd_bug493990 
[493990] Fixed Duplicate Problem in TraceRegionMerger
 2017-03-28 17:31:11 +02:00
Christian Dietrich
a08820b6af update to tycho 1.0.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-27 13:34:32 +02:00
Christian Dietrich
257c2c88fc [410605] [grammar][terminal] Validate that EOF cannot be inverted 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-24 15:39:00 +01:00
Christian Dietrich
6919d13563 [493990] Fixed Duplicate Problem in TraceRegionMerger 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-24 15:28:04 +01:00
Christian Dietrich
770e6897d7 [380449] Enhancements to Task Finder 
- Introduced a hook to allow stripping of the node text before calling the task parser
- Stripped trailing comment in tasks

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-22 10:55:54 +01:00
Christian Dietrich
04f21fd7b3 generalized charset setting 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-10 14:52:55 +01:00
Sven Efftinge
250d421868 Merge pull request #288 from eclipse/se_tracing 
[code gen] Added support for tracing in code generation (#287)
 2017-02-28 12:45:56 +01:00
Sven Efftinge
0ac49cb58c [tracing] changes regarding moritz’ feedback (fixes #287) 2017-02-27 16:38:35 +01:00
Sven Efftinge
d909078dfd [tracing] various improvements (#287) 
- fixed indentation issues
 - support newLineIfNotEmpty semantics
 - indent and newline nodes contain the actual string
 - better naming
 - documentation
 2017-02-27 16:38:23 +01:00
Sven Efftinge
ac2b856e6e [tracing] rename (#287) 2017-02-27 16:38:07 +01:00
Sven Efftinge
3e96aa3939 [tracing] Improved client API (#287) 2017-02-27 16:37:57 +01:00
Sven Efftinge
cfc62dea7a [tracing] Added support for tracing in code generation (#287) 
Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
 2017-02-27 16:37:43 +01:00
Christian Dietrich
a061aa6fb1 Merge remote-tracking branch 'origin/maintenance_2.11' 2017-02-27 15:57:13 +01:00
Christian Dietrich
fcce289084 [Wizard] Include .xtext file in jar created by gradle #284 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-22 20:16:08 +01:00
Christian Dietrich
2d6140d345 Merge pull request #281 from eclipse/cd_issue280 
run test with UTF-8 always #280
 2017-02-20 09:06:32 +01:00
Christian Dietrich
4c275f67f0 run test with UTF-8 always #280 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-17 21:32:55 +01:00
Christian Dietrich
1ff8ec6361 adaped test expectations. #222 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-15 13:45:16 +01:00
Christian Dietrich
a31ea419d2 Fixed Broken Launch Config. Resolves #273 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-06 09:11:01 +01:00
Moritz Eysholdt
923422737e fixed #238 in PolymorphicDispatcher#compare by not sorting methods 
This fix prevents exceptions such as "IllegalArgumentException:
Comparison method violates its general contract" by not sorting the list
of methods at all. Since the method selection algorithm scans the
complete list of methods, the order of the list does not impact the
algorithm's outcome. 

The fix does not change the precedence of methods since the
implementation of compare(method1, method2) is kept the same.

However, this bug taught us that compare(m1, m2) is not suitable to
establish a total order among a list of methods and that 
compare(m1, m2)==0 && compare(m2, m3)==0 
does NOT imply compare(m1, m3)==0.

Example:
m1(A a), m2(B b), m3(C c), class A{}, class B{}, class C extends A{}

This observation required another change: When scanning the list of
methods for candidates, it does not suffice to compare the current
candidate with the last best candidate. Instead, it is needed to compare
the current candidate with all best candidates, because
compare(currentCandidate, lastBestCandidate)==0 does NOT imply compare()
to return 0 for the other best candidates. 

When calling compare(m1, m2) among the best candidates it is always
expected to return 0, meaning the candidates are unrelated (e.g.
independent inheritance hierarchies of their parameter types) or equal.

see https://github.com/eclipse/xtext-core/issues/238

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-02-04 01:01:27 +01:00
Sven Efftinge
1c2b7a49f3 Merge pull request #237 from eclipse/se_reuse_resourcet 
[language server / incrmental builder] allow reusing resource set
 2017-02-01 12:08:19 +01:00
Miro Spönemann
eaa0a66288 [build] Increased version number to 2.11.1-SNAPSHOT 2017-02-01 11:20:39 +01:00
Miro Spönemann
0bc4eb7975 Merge branch 'release_2.11.0' 2017-01-31 13:16:13 +01:00
Moritz Eysholdt
8cbddaa4d8 fixed #265: Create pom.xml that installs Xtend Debug Info 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-01-28 15:14:07 +01:00
Christian Dietrich
b37a087fd7 load XtextValidationTest.ecore from code to avoid validation problems in workspace. fixes #47 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-01-25 12:49:51 +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
Moritz Eysholdt
2012ce7256 fixed #251: Formatter erroneously applies default formatting 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-01-16 20:02:07 +01:00
Lorenzo Bettini
8c4eda2e92 244: updated wizard test expectations 
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-16 11:10:10 +01:00
Miro Spönemann
0515d22685 Refreshed projects with Buildship 2.0 2017-01-12 10:32:06 +01:00
Miro Spönemann
9d4007a6d8 Merge pull request #234 from eclipse/msp_mwe2Workflows 
Generate Xtext languages from Gradle
 2017-01-12 10:06:30 +01:00
Miro Spönemann
02d3787904 Added common configuration file mwe2-workflows.gradle for generating Xtext languages from Gradle 2017-01-11 16:56:41 +01:00
Lorenzo Bettini
00a949a153 479196: use version range [2.1.1,3) 
see
https://github.com/eclipse/xtext-core/pull/235#issuecomment-271882660

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-11 15:40:49 +01:00
Lorenzo Bettini
8fca65f7ee 479196: added xtext-antlr-generator also in the build.gradle 
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-11 15:22:16 +01:00
Sven Efftinge
dd82d2ac5f [language server / incrmental builder] allow reusing resource set 2017-01-11 15:14:15 +01:00
Lorenzo Bettini
7d2675ba40 479196: AntlrToolFacade always downloads antlr-generator in Maven build 
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-11 14:11:56 +01:00
Moritz Eysholdt
066e22f507 fixed #12: [formatter] IllegalArgumentException in NodeRegion.toString() 
see https://github.com/eclipse/xtext-core/issues/12

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-01-11 10:53:08 +01:00
Moritz Eysholdt
e968946b4f [formatter/performance] Don't create stack traces 
This change:
- introduces a flag that by default disables creation of stack traces
- lets the formatter do a second pass on conflict with that flag enabled

This combines the benefits of both worlds:
- performance without the need for tweaking
- debug information without the need to enable some magic config

see 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=508894
https://bugs.eclipse.org/bugs/show_bug.cgi?id=507174
https://github.com/eclipse/xtext-core/pull/195

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-01-10 17:54:44 +01:00
Moritz Eysholdt
448b025395 see #199: added comment formatter tests 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-01-10 14:45:39 +01:00
Miro Spönemann
90dea707ad Regenerated test languages in tests bundle, fixed lazy linking test language 2017-01-09 10:12:02 +01:00
Miro Spönemann
0618470051 Merge pull request #218 from eclipse/msp_crossRefSerializer 
Fixed CrossReferenceSerializer regression for special proxy URI formats
 2017-01-06 16:43:29 +01:00
Miro Spönemann
a0c5eacbe0 Added missing encoding settings 2017-01-06 16:20:58 +01:00
Miro Spönemann
383b65b7ad Fixed CrossReferenceSerializer regression for special proxy URI formats 2017-01-06 15:37:34 +01:00
Miro Spönemann
0e312a85c8 Fixed #215: Wrong version dependency to org.eclipse.emf.mwe2.launch generated by wizard 2017-01-03 16:52:52 +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
55b7531d74 Merge pull request #210 from eclipse/kth_bug492072 
[492072] Minimized usage of local variables
 2016-12-22 14:20:40 +01:00
Christian Schneider
290b698f95 [xtext.testing + xtext.wizard] fix/improvement of build config of test projects in 'TestProjectDescriptor' 
* consolidated version of 'org.junit' with our reference in 'gradle/versions.gradle' (currently 4.12)
* added dependency to 'junit:junit:4.12' with scope 'testCompile' to templates of 'pom.xml' + 'build.gradle'

Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
 2016-12-22 10:44:42 +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
Christian Schneider
8846f34734 [xtext.wizard] added 'org.eclipse.xtext.common.types' to dependencies of MWE executions in 'RuntimeProjectDescriptor's build file templates. 
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
 2016-12-20 17:48:09 +01:00
Miro Spönemann
7bceda03da Switched test project dependency created by wizard from xbase.junit to xbase.testing 2016-12-20 10:31:18 +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
Karsten Thoms
365e8b8def Merge pull request #192 from eclipse/kth/refactorings 
Some minor refactorings
 2016-12-12 15:02:39 +01:00
Karsten Thoms
46c09cc63a [eclipse/xtext-core#193] Added missing Override annotations 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-06 00:47:21 +01:00
Karsten Thoms
f015d7e1eb Use non-deprecated Timeout constructor 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-06 00:26:10 +01:00
Karsten Thoms
853692957f Close fileInputStream properly 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-05 23:44:43 +01:00
Karsten Thoms
ce58a244bd Removed unused imports 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-05 15:55:04 +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
Karsten Thoms
13ba597bc4 Merge branch 'master' of git@github.com:eclipse/xtext-core 2016-11-29 15:33:08 +01:00
Karsten Thoms
c4ba710623 Classpath inclusion/exclusion rules changed by buildship import 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-29 15:32:57 +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
Christian Dietrich
dada46f859 fixed broken test 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-11-29 11:31:28 +01:00
Sven Efftinge
ea3c3faa6e Merge pull request #181 from kittaakos/GH_180 
Fixed issue in URI based file system access when checking missing files.
 2016-11-29 09:04:57 +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
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
9919a9a46e [406914] Reenabled generation of all test languages 
Added Bug406914TestLanguage

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-22 08:35:04 +01:00
Karsten Thoms
7eb96d2fd6 [406914] Regenerated code for Bug301935TestLanguage 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-22 08:35:03 +01:00
Karsten Thoms
5b59e18217 [406914] Add test language 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-22 08:35:02 +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
Akos Kitta
64010edcfc Fixed issue in URI based file system access when checking missing files. 
A FNFE was thrown instead of returning with false.

Signed-off-by: Akos Kitta <kittaakos@gmail.com>
 2016-11-21 23:04:27 +01:00
Miro Spönemann
fd48d274c1 #160: Changed test expectation to use unspecified Xtext version 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2016-10-23 19:51:52 +02:00
Miro Spönemann
2a449c744e Merge pull request #157 from eclipse/cd_issue156 
[WEB][Wizard][Generator] Update JS Libary Versions. Fixed #156
 2016-10-20 15:32:16 +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
Sven Efftinge
89733c8ab9 updated wizard to currently used gradle version 2016-10-20 09:15:37 +02:00
Miro Spönemann
e0a6217129 Removed old build files 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2016-10-18 17:05:23 +02:00
Christian Schneider
5d472b86ca [xtext validation] added checks for missing or invalid '@Override' annotations in 'XtextValidator' as desired by #121, put the issue codes to 'XtextConfigurableIssueCodes' although the severity is not configurable (yet), added a corresponding test to 'XtextValidatorTest' 
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
 2016-10-18 09:54:44 +02:00
Christian Schneider
eba5492719 [grammar] introduced annotations to parser, terminal, and enum rules paving the way for @Override annotations as desired by #121, updated generated + affected artifacts and tests 
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
 2016-10-18 09:54:44 +02:00
Miro Spönemann
986ec23fc7 Regenerated test languages 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2016-10-17 10:05:07 +02:00
Moritz Eysholdt
db03d9f7b8 [serializer/perf] produce diagnostics only on error 
Don't always run the old ConcreteSyntaxValidator before serialization.
Instead, create diagnostics in the serializer only when serialization
fails.

see https://github.com/eclipse/xtext-core/issues/48

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-10-14 12:22:40 +02:00
Moritz Eysholdt
d2bc2f52f1 [serializer/perf] don't generate events for unassigned parser rules 
Because they're neither consumed by the old- nor the new formatter.
And they are not needed to generate text.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-10-13 19:30:55 +02:00
Miro Spönemann
44bc1f733b Regenerated test languages 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2016-10-13 15:29:31 +02:00
Miro Spönemann
e8682fbfd3 [serializer] Improved performance of bounds computation 
Implemented new algorithms for computing upper and lower bounds in GrammarConstraintProvider

Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2016-10-11 15:38:09 +02:00
Moritz Eysholdt
80a6f9fcf8 [serializer/performance] avoid redundant grammar analysis 2016-10-11 08:49:25 +02:00
Miro Spönemann
54b63bc0d9 Merge pull request #102 from kthoms/kth/issue101 
[#101] Configure lineDelimiter in workflows
 2016-10-10 08:35:17 +02:00
Moritz Eysholdt
40016bd0dd regenerated test languages 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-10-07 20:16:47 +02:00
Moritz Eysholdt
607e2cd031 regenerated test languages 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-10-07 15:26:40 +02:00
Moritz Eysholdt
127b2af797 Removed test case triggering new validation rule 
The validation rule was introduced in
73fd155426

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-10-07 15:26:40 +02:00
Karsten Thoms
9697786f3d [#101] Configure lineDelimiter in workflows 
Add 'lineDelimiter' to project configuration and generate it to the
'code' configuration in the workflow.
Adjusted test expectations.


Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-10-07 15:07:30 +02:00
Miro Spönemann
9e579127ee Merge pull request #123 from kthoms/kth/bug502879 
[502879] Streamlined plugin metadata
 2016-10-07 11:34:30 +02:00
Miro Spönemann
8b795af1c8 Merge pull request #100 from kthoms/kth/bug378980_2 
[378980] Refactored calls on deprecated API
 2016-10-07 11:07:07 +02:00
Moritz Eysholdt
b717ec5b87 removed a System.out.println() 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-10-06 16:46:52 +02:00
Karsten Thoms
38f4122a2b [502879] Streamlined plugin metadata 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-30 17:17:31 +02:00
Sven Efftinge
7c51af4e58 [lsp] use language specific proposal acceptor, added SerializableEObjectDescriptionProvider hook 2016-09-27 01:17:00 +02:00
Moritz Eysholdt
6bbad4f142 fixed #14: [formatter2] honor FormatterRequest.allowIdentityEdits 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-09-25 23:15:59 +02:00
Moritz Eysholdt
7c7e1f88b7 fixed #97 [Formatting2/auto-wrap] never wrap preceding lines 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-09-25 22:50:45 +02:00
Lorenzo Bettini
4de451dd36 Merge pull request #104 from kthoms/kth/issue5 
[#5] Ignore optional compile problems on *-gen source folders
 2016-09-23 17:15:56 +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
Karsten Thoms
4b1737a6a7 [#112] Generate launch configs for Xtext workflow and Runtime Eclipse 
- Launch config for Runtime Eclipse is only generated when the runtime
project is a plugin project.
- Launch config for Xtext workflow is dependent on the build system. For
plain Maven projects the launch config uses the m2e launcher, for Gradle
builds buildship is launched.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-23 14:03:06 +02:00
Karsten Thoms
9b0947fe62 [format] Streamlined whitespaces 
Consistent use of tabs instead of spaces
Use single whitespace between brackets

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-14 16:00:10 +02:00
Karsten Thoms
52f4fc8417 [378980] Refactored calls on deprecated API 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-14 09:13:11 +02:00
Karsten Thoms
8585d50734 [378980] Adjusted test: Manifest line break is system dependent 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-13 09:38:46 +02:00
Christian Dietrich
73fd155426 [445175] Missing error message on invalid alternative assignments with cross references 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-09-08 07:57:30 +02:00
Christian Dietrich
6858354b19 [482110] fixed AbstractFormatter2.shouldFormat 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-08-18 14:51:14 +02:00
Karsten Thoms
d7efc23796 [478377] Add null guard 
Test call findNodesForFeature with null feature

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-16 22:21:44 +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
Moritz Eysholdt
467ee9cf51 Merge pull request #83 from kthoms/kth/bug484500 
Kth/bug484500
 2016-08-12 13:38:03 +02:00
Karsten Thoms
6309bba2e7 [484500] Changed build.properties for test expectations 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-12 11:04:44 +02:00
Karsten Thoms
735ea5d929 [484500] Add bin.excludes to build.properties 
- the runtime project excludes .mwe2 and .xtend files
- the feature sdk project excludes nothing
- all other Eclipse projects exclude .xtend
- add test case WizardConfigurationTest#binExcludes

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-12 11:04:13 +02:00
Karsten Thoms
ae123abe38 [#79] Upgrade Eclipse & MWE p2 repository URLs 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-12 08:30:48 +02:00
Moritz Eysholdt
6d19ebaa6c Merge pull request #77 from kthoms/kth/issue76 
[#76] Upgrade to Tycho 0.25.0
 2016-08-12 06:57:13 +02:00
Karsten Thoms
337e4371e4 [#76] Upgrade to Tycho 0.25.0 
Covered by test CliWizardIntegrationTest

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-11 23:07:08 +02:00
Moritz Eysholdt
0745d5a43d [#16, XtextResource] introduce setEntryPoint(ParserRule) 
This change allows to specify on XtextResource what ParserRule the
parser should be using as the entry point.

see https://github.com/eclipse/xtext-core/issues/16

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-08-11 15:35:49 +02:00
Moritz Eysholdt
927d574d96 [#16, partial-parser] On fully re-parse, keep the entry parser rule 
When the partial parser does a full re-parse, it should use the same
entry parser rule that has been used during the last parse.

see https://github.com/eclipse/xtext-core/issues/16

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-08-11 15:35:48 +02:00
Moritz Eysholdt
dc674d1abf Merge pull request #71 from eclipse/me_strict_partial_parser_test 
make AbstractPartialParsrTest more strict
 2016-08-10 17:00:55 +02:00
Christian Dietrich
49b9ff4e55 Do not collect EObjects in transient Features when calculating IdToEObjectMap for Serialization. Fixes #65 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-08-03 08:16:44 +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
Christian Dietrich
1c13b558e2 fixed #60. GenerateSerializerLanguages.mwe2 should behave like GenerateAllTestLanguages.mwe2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-07-31 20:38:27 +02:00
Christian Dietrich
8bc76b67ed fixed broken test data calculation 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-07-29 10:25:56 +02:00
Moritz Eysholdt
b78ea72ffe make AbstractPartialParsrTest more strict 
It should also test if node.getGrammarElement() is correct

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2016-07-27 08:50:52 +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
8387438f99 Updated plugin metadata 2016-07-15 14:41:59 +02:00
Miro Spönemann
c6f66ccf84 Removed some obsolete tests and their languages (#32) 2016-07-14 17:16:19 +02:00
akosyakov
b92009b9a6 Remove simple.jar from project's meta-data 2016-07-13 15:23:11 +02:00
Christian Dietrich
78154f2391 Merge pull request #38 from eclipse/cd/testWorkflows 
Fix UriBasedReaderTest
 2016-07-13 08:49:26 +02:00
Miro Spönemann
192f70c59f Generated AllTestLanguages 2016-07-13 08:13:44 +02:00
Christian Dietrich
fa84a99b56 fixed UriBasedReaderTest (#32) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-07-12 19:38:36 +02:00
Miro Spönemann
5f19ad2cae Merge branch 'msp/generatorEncoding' into msp/testWorkflows 2016-07-12 16:06:14 +02:00
Miro Spönemann
522897c192 Generated EncodingTestLanguage 2016-07-12 14:48:00 +02:00
Miro Spönemann
69c1e29a7c Generated EcoreInferenceTestLanguages 2016-07-12 14:15:38 +02:00
Miro Spönemann
7d14c12ed9 Generated ValidationLanguages 2016-07-12 14:12:12 +02:00
Miro Spönemann
a03a871ef3 Generated TestLanguages 2016-07-12 14:07:36 +02:00
Miro Spönemann
b9f39a928e Generated SerializerLanguages 2016-07-12 13:59:45 +02:00
Miro Spönemann
8d6dff45ad Generated EObjectAtOffsetTestLanguage 2016-07-12 13:54:56 +02:00
Miro Spönemann
a1e136821c Generated UnassignedTextTestLanguage 2016-07-12 13:49:08 +02:00
Miro Spönemann
4fbacd1b51 Generated ReconstrTestLanguages 2016-07-12 13:39:58 +02:00
Miro Spönemann
c385e0e63b Generated CommentAssociationTestLanguage 2016-07-12 13:15:59 +02:00
Miro Spönemann
3fadeea82a Generated FormatterTestLanguages, removed ElementMatcherTestLanguage 2016-07-12 13:00:07 +02:00
Miro Spönemann
f2562915cb Generated UnorderedGroupsTestLanguages 2016-07-12 12:12:29 +02:00
Miro Spönemann
1590bbac0d Generated TerminalrulesTestLanguages 2016-07-12 11:56:30 +02:00
Miro Spönemann
52db47c2dd Generated ParametersTestLanguages 2016-07-12 11:53:15 +02:00
Miro Spönemann
5465c5b41c Generated IndentationTestLanguages 2016-07-12 11:49:33 +02:00
Miro Spönemann
35dc492128 Generated FragmentTestLanguages 2016-07-12 11:45:13 +02:00
Miro Spönemann
0094d5414e Generated AssignmentsTestLanguage 2016-07-12 11:31:01 +02:00
Miro Spönemann
da053f60bb Removed TestLanguagesFragmentsEx.mwe2 2016-07-12 11:26:26 +02:00
Miro Spönemann
35708f0be9 Generated AntlrParserTestLanguages 2016-07-12 11:03:05 +02:00
Miro Spönemann
f8a5549995 Generated MetamodelReferencing 2016-07-12 10:32:39 +02:00
Christian Dietrich
88894d23b8 reactivated src/org/eclipse/xtext/mwe/UriBasedReaderTest.java 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-07-12 10:29:50 +02:00
Miro Spönemann
02254f86bc Moved generator related sources to new source folder 2016-07-12 09:23:24 +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
ae079352a8 Generated LinkingTestLanguages 2016-07-11 17:55:57 +02:00
Miro Spönemann
f301aa119c Made scoping fragment extensible to support import URI 2016-07-11 17:52:59 +02:00
Miro Spönemann
29bae68924 Generated BacktrackingLexerTestLanguage and IgnoreCaseLexerTestLanguage 2016-07-11 17:08:14 +02:00
Miro Spönemann
c7153a7c3e Generated InheritanceLanguages 2016-07-11 13:31:26 +02:00
Miro Spönemann
dc831d597e Generated meta models 2016-07-11 12:57:09 +02:00
Miro Spönemann
e9215fc006 Generated GrammarAccessTestLanguage 2016-07-11 12:55:50 +02:00
Miro Spönemann
20a531f1ae Generated FormatterTestLanguages 2016-07-11 12:06:41 +02:00
Miro Spönemann
8badcdcafb Generated SubTestLanguage 2016-07-11 11:53:06 +02:00
Lorenzo Bettini
3275b75302 30: updated CliWizardIntegrationTest expectations 
Task-Url: https://github.com/eclipse/xtext-core/issues/30
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2016-07-11 11:26:33 +02:00
Miro Spönemann
441afdfd6b Generated EnumRuleTestLanguage 2016-07-08 16:05:59 +02:00
Miro Spönemann
8468d39ed2 Migrated workflows to new generator 2016-07-08 15:55:22 +02:00
Miro Spönemann
e80ec81fd7 Updated manifests and launch configs, added filter for parent subfolders 2016-07-08 11:36:31 +02:00
Miro Spönemann
d2386a89b5 Packaging the test source set for tests projects 2016-07-08 11:09:00 +02:00
Christian Dietrich
404f8009c3 fixed packaging of genmodels 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-07-08 10:11:07 +02:00
Christian Dietrich
9e9c6df4aa fixed packaging of tests project 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-07-08 09:42:55 +02:00
Miro Spönemann
2b46d0e51f Replaced 'mwe2' configuration with 'mwe2' source set for more flexible dependency setup 2016-07-07 14:49:07 +02:00
Sven Efftinge
eb2a0b6d0f removed bogus .gitignore 2016-07-07 14:17:41 +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
Miro Spönemann
b148945f6c Some build file cleanup 2016-07-07 10:09:01 +02:00
Miro Spönemann
3c6725c105 Removed project meta data 2016-07-07 10:09:01 +02:00
Christian Dietrich
c62496571d https://github.com/eclipse/xtext/issues/1058 excluded testsuites from junit test run 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-06-27 18:48:31 +02:00
Christian Dietrich
71c37e567f fixed typo 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-06-24 07:52:03 +02:00
Christian Dietrich
f8e2ceabc2 fixed typo Errorneous Erroneous 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-06-23 09:18:19 +02:00
Sven Efftinge
517f471423 [gradle] disable xtext generator, fixed wrong groovy string 2016-06-21 12:03:37 +02:00
Sven Efftinge
21423cc18c [ide] added IdeModule and IdeSetup - fixed #11 2016-06-21 11:54:54 +02:00
Sven Efftinge
ae59ba21cb [gradle] updated gradle config and metadata 
added mwe2 dependencies
commented out bad dependencies in mwe2 files (they are still not running)
 2016-06-21 11:12:12 +02:00
Christian Dietrich
7544cc3842 added missing xtend-gen file 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-06-18 20:08:08 +02:00
Christian Dietrich
b023e52507 added org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.xtend 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-06-18 11:18:47 +02:00
Moritz Eysholdt
a23adf2b3d fixed tests 2016-06-17 18:31:25 +02:00
Moritz Eysholdt
3c45943ca2 removed tests that should not be in xtext-core 2016-06-17 18:27:33 +02:00
Moritz Eysholdt
afdd548598 organized imports 2016-06-17 18:26:10 +02:00
Moritz Eysholdt
9e0a31aec5 added generated files 2016-06-17 17:59:39 +02:00
Miro Spönemann
4270986cba Moved projects to root of repository 2016-06-14 08:30:25 +02:00