Commit graph

1809 commits

Author SHA1 Message Date
Moritz Eysholdt
a90c3af532 [formatter/textRegions] updated RegionAccessBuilderTest
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-04-08 12:01:38 +02:00
Moritz Eysholdt
173450d637 [formatter/textregions] make sure the root has a proper grammar element
Even though the root has been created via an {Action}, the grammar 
element should be the root parser rule.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-04-08 10:22:13 +02:00
Moritz Eysholdt
29ddc6b881 Merge pull request #986 from eclipse/me/formatter1
[formatter/textRegions] fixed some IllegalStateExceptions
2016-04-05 21:50:00 +02:00
Moritz Eysholdt
1cdd0ab042 [formatter/textRegions] fixed some IllegalStateExceptions
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=485118

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-04-05 17:46:00 +02:00
Karsten Thoms
9297b3ebb4 [356750] addPath can also take a comma-separated list of paths and
splits it.
This feature is useful for workflows where the list of paths is passed
in as a single argument.

Change-Id: I0b933c18c318487544e29ed5b9e36cf8acd30698
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-03-31 23:25:54 +02:00
akosyakov
7baa4b3d69 [bug 489547] Allow to provide offset and length for
SyntheticLinkingLeafNode

Change-Id: I4d723aa426e4f09a48cbee2187e98c5d60900920
Signed-off-by: akosyakov <anton.kosyakov@typefox.io>
2016-03-16 13:44:19 +01:00
akosyakov
21096429a2 [bug 479161] Invalidate boolean assignments of fragments
Change-Id: I58de6791ef95e907528bede10124a788ee6b13b8
Signed-off-by: akosyakov <anton.kosyakov@typefox.io>
2016-03-15 15:28:10 +01:00
Dennis Huebner
056d64c14e Merge pull request #954 from eclipse/maintenance
Maintenance
2016-03-03 13:14:31 +01:00
Dennis Huebner
fa6ebdfd71 [mvn] Fixed failing tests due to an overwritten output file
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2016-03-03 11:03:11 +01:00
Christian Dietrich
b8281ec71f Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=488458
Add warning for keywords containing spaces
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-02-25 13:33:22 +01:00
Dennis Huebner
9a325f4181 Bug 481087 - Consider to set guava lower bound to 14.0
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2016-01-28 12:19:59 +01:00
Dennis Huebner
decbb8c947 Merge remote-tracking branch 'origin/maintenance'
Conflicts:
	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation/src-gen/org/eclipse/xtext/example/homeautomation/validation/AbstractRuleEngineValidator.java
	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation/src/org/eclipse/xtext/example/homeautomation/GenerateRuleEngine.mwe2


Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2016-01-28 10:06:59 +01:00
Dennis Huebner
6ecf2e5656 Revert "[wizard] Fixed test expectation. New gradle plugin version 1.0.2"
This reverts commit f1b62dc9d519e9f71b4c64e9bc9e55d20b418f6b.
2016-01-28 09:46:02 +01:00
Dennis Huebner
ad3004f88f [wizard] Fixed test expectation. New gradle plugin version 1.0.2
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2016-01-28 09:30:07 +01:00
Dennis Huebner
5dce632d93 [wizard] Fixed test expectation. New gradle plugin version 1.0.2
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2016-01-27 10:05:41 +01:00
Dennis Huebner
cb97d73dae Merge pull request #918 from eclipse/maintenance
Maintenance
2016-01-26 13:46:55 +01:00
Miro Spönemann
9bbecd9e8f Bug 486454: TokenRegionProvider computes a wrong region
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2016-01-25 12:04:41 +01:00
Miro Spönemann
46dff3f840 Merge branch 'maintenance'
* maintenance:
  [releng] Back to 2.9.1-SNAPSHOT
  [releng] Prepare for 2.9.1 release
  [gradle] Updated xtext gradle plugin version
  [gradle] Exclude common.types.tests from idea repository
  [bug 483931] Relativize output paths even for non existent folders
  [tests] Changed line endings for the .bat file
  [tests] Updated wizard test expectations
  [releng] MWE2 dependency Update
  Use latest Xtext Gradle plugin
  [483088] allow nested types in implementationClass in ecore models.
  Fixed ResourceDescritpionsBasedContainer to give a proper answer to hasResourceDescription(URI)
  [serializer] added another test case for grammar constraint provider

# Conflicts:
#	intellij/build.gradle
2015-12-18 16:28:34 +01:00
Dennis Huebner
aecc7be10c [releng] Version update 2.9.1->2.9.2 2015-12-18 16:18:58 +01:00
Dennis Huebner
c7b370956b [gradle] Updated xtext gradle plugin version
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2015-12-18 13:25:31 +01:00
Dennis Huebner
530b86007c Merge pull request #881 from eclipse/mwe2.8.3
[releng] MWE2 dependency Update
2015-12-17 09:34:13 +01:00
Dennis Huebner
45f66b7462 Merge pull request #880 from eclipse/so_new_gradle_plugin
Use latest Xtext Gradle plugin
2015-12-17 09:33:50 +01:00
Dennis Huebner
82f63c4fb2 [tests] Changed line endings for the .bat file 2015-12-16 15:45:00 +01:00
Dennis Huebner
3ac20c2787 [tests] Updated wizard test expectations 2015-12-16 15:37:11 +01:00
Stefan Oehme
6e5bfd8a77 Use latest Xtext Gradle plugin 2015-12-16 13:44:10 +01:00
Moritz Eysholdt
6ccaab1a3f [serializer] added another test case for grammar constraint provider
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-12-15 16:07:11 +01:00
Dennis Huebner
e5e45719d6 Merge pull request #866 from eclipse/maintenance
[idea] Fixed test failures
2015-12-11 15:18:29 +01:00
Dennis Huebner
db0e1aebfe [idea] Fixed test failures 2015-12-11 11:24:35 +01:00
Dennis Huebner
38b3b8a991 Merge pull request #864 from eclipse/maintenance
Merge PR maintenance -> master
2015-12-11 10:48:34 +01:00
Sven Efftinge
87c8621841 Merge pull request #859 from eclipse/se/bug483667
[483667] Wizard, pom.xml - exec plugin needs compile scope of project
2015-12-10 14:04:56 +01:00
Sven Efftinge
9159ca9047 [483667] Wizard, pom.xml - exec plugin needs compile scope of project 2015-12-10 14:02:45 +01:00
Dennis Huebner
8c783fb419 [wizard] Use Mwe 2.8.2 when generating build scripts 2015-12-10 14:00:42 +01:00
Sebastian Zarnekow
23a321b017 Merge pull request #858 from eclipse/maintenance
Merge fixes from maintenance into master
2015-12-10 09:05:23 +01:00
Stefan Oehme
398900aa4d [483886] incremental builder should honor index only flag 2015-12-08 12:07:09 +01:00
Dennis Huebner
11fc0660ac [releng] Changed version to 2.9.1. Deploy to nightly/maintenance 2015-12-02 15:34:19 +01:00
Dennis Huebner
e27181a4bc [releng] Increase version to 2.10
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-02 13:05:59 +01:00
Stefan Oehme
af43cebfc0 Merge remote-tracking branch 'origin/master' into simplify_gradle_build
Conflicts:
	maven/org.eclipse.xtext.xtext/pom.xml
	plugins/org.eclipse.xtext.xtext.generator/pom.xml
2015-12-01 13:33:25 +01:00
Sven Efftinge
11296fb8c8 [483162] removed type name guard 2015-12-01 10:46:23 +01:00
Stefan Oehme
5f49461546 Merge remote-tracking branch 'origin/master' into simplify_gradle_build
Conflicts:
	intellij/build.gradle
2015-11-30 16:25:31 +01:00
Moritz Eysholdt
a70f1eca80 [formatter] implemented test for Xtext instead of Xtend
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=482665

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-30 16:03:26 +01:00
Stefan Oehme
1cc7085d90 Merge branch 'master' into simplify_gradle_build
Conflicts:
	.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
	intellij/build.gradle
	intellij/org.eclipse.xtext.idea.common.types.tests/build.gradle
2015-11-30 16:00:54 +01:00
Sebastian Zarnekow
be6021fe64 [xtext][nodeModel] Improved findActualSemanticObject
Make sure it is symmetric to the behavior of 
findActualNodeFor
2015-11-29 14:56:50 +01:00
Dennis Huebner
95c31a76b5 [409069] - Exception by XMLEncodingProvider
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-27 10:28:45 +01:00
Christian Schneider
e99de4449b [xtext generator, 482677] fixed issue in determining required parenthesizes of generated ANTLR grammars
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-24 10:32:28 +01:00
Christian Schneider
606a95f9ff Merge pull request #824 from eclipse/cs/testLangUpdate
update/re-generation of xtext.testlanguages
2015-11-24 09:19:11 +01:00
Christian Schneider
1ae4fbf778 [xtext.testlanguages.idea] updated generated stubs in testlanguages.idea project
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-23 12:15:13 +01:00
Christian Schneider
83afd8cdb7 [xtext.testlanguages] updated generated sources of test languages in ...xtext.testlanguages 2015-11-23 11:29:17 +01:00
Sven Efftinge
9540a3a780 [482677] fixed missing parenthesis in debug grammar 2015-11-20 14:03:22 +01:00
Christian Schneider
4dc072dee7 [grammar comparison] enhanced grammar comparator to ignore single & multi line comments, added corresponding tests, moved test helper methods & classes into new helper class
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-19 13:08:18 +01:00
Christian Schneider
053f9a8d87 [xtext tests] registered source folder 'src-gen2' in build.properties
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-18 16:09:17 +01:00