Commit graph

4889 commits

Author SHA1 Message Date
Dennis Huebner
1171323d70 [releng] Exclude o.e.x.x.wizard/resources from the source jar 2015-12-09 13:37:20 +01:00
Sven Efftinge
78a7482218 Merge pull request #856 from eclipse/se/bug83872
[83872] generate TokenSource stubs to src
2015-12-08 14:14:14 +01:00
Sven Efftinge
f81238f48d [83872] generate TokenSource stubs to src 2015-12-08 12:11:35 +01:00
Stefan Oehme
398900aa4d [483886] incremental builder should honor index only flag 2015-12-08 12:07:09 +01:00
Sebastian Zarnekow
493a94515e Merge pull request #850 from eclipse/maintenance
Merge fixes from maintenance into master
2015-12-07 10:48:32 +01:00
Sebastian Zarnekow
8baadd102e Minor: Fixed comment 2015-12-07 10:21:38 +01:00
Sven Efftinge
6f24304505 [483675] fix for NPE 2015-12-04 15:35:22 +01:00
Dennis Huebner
34ec1bf6e6 Merge branch 'maintenance' 2015-12-02 17:04:03 +01:00
Dennis Huebner
0817ec079d [api] Adjusted API filter
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-02 16:19:21 +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
f1bda7da3a [api] Removed unused api filter warning
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-02 14:47:37 +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
5acccde3ae Merge pull request #773 from eclipse/simplify_gradle_build
Simplify gradle build
2015-12-01 16:17:02 +01:00
Dennis Huebner
5a3336d1ef [releng] Switch back to SNAPSHOT. Added category to idea plugins
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-01 15:15:05 +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
Dennis Huebner
6836236fe4 [releng] Prepare for 2.9.0 release
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-01 11:17:57 +01:00
Sven Efftinge
0ca0d763cd Merge pull request #840 from eclipse/se/bug483162
[483162] removed type name guard
2015-12-01 10:49:01 +01:00
Sven Efftinge
11296fb8c8 [483162] removed type name guard 2015-12-01 10:46:23 +01:00
Dennis Huebner
07a3625eb3 Bug 483338 - Different versions of equinox.common dependency
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-01 10:02:08 +01:00
Moritz Eysholdt
78891a651d Merge pull request #837 from eclipse/me/bug482033
[serializer#482033] NPE at SerializationContext.forChild(...)
2015-11-30 22:23:46 +01:00
Moritz Eysholdt
fbd20c4fa2 [serializer#481861] remove possible causes for nondeterminism
https://bugs.eclipse.org/bugs/show_bug.cgi?id=481861

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-30 16:42:26 +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
efd0312d83 [serializer#482033] NPE at SerializationContext.forChild(...)
see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=482033

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-30 16:11:19 +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
Moritz Eysholdt
b770863483 Merge pull request #819 from ghaith/482665
Fix for #482665
2015-11-30 16:02:06 +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
Moritz Eysholdt
b9c0c90ca6 Merge pull request #834 from eclipse/me/serializer5
[serializerFragment] avoid generating duplicate methods
2015-11-30 16:00:32 +01:00
Moritz Eysholdt
0fd95f8579 [serializerFragment] avoid generating duplicate methods
this suppresses the symptoms of 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=482840 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=479400

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-30 15:03:09 +01:00
Dennis Huebner
638a9a01dc Merge pull request #831 from eclipse/dh/idea-wizard-jdk
[idea] [wizard] Configure generator with selected JDK
2015-11-30 14:58:22 +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
4a7438b6bc [idea] [wizard] Configure generator with selected JDK
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-27 15:14:57 +01:00
Dennis Huebner
d65a6cb6fb [409069] Moved both checks into try catch. Can be released with 2.9
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-27 11:49:06 +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
Sven Efftinge
09c5f2879b Merge pull request #821 from eclipse/se/bug482677
[482677] fixed missing parenthesis in debug grammar
2015-11-24 09:01:49 +01:00
Moritz Eysholdt
a5fa89adc6 Merge pull request #815 from eclipse/me/old_serializer_fragment
[oldserializerfragment#481865] Support Deprecated ContextEObject
2015-11-23 14:44:04 +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
Christian Schneider
afa76258b9 Merge pull request #814 from eclipse/cs/uiModuleFineTuning
[xtext generator] some fine-tuning of the UI module generation
2015-11-23 10:00:08 +01:00
Sven Efftinge
9540a3a780 [482677] fixed missing parenthesis in debug grammar 2015-11-20 14:03:22 +01:00
Sven Efftinge
4790cfbee2 Merge pull request #808 from eclipse/se/bug481937
[481937] make ide.highlighting package public
2015-11-20 13:32:11 +01:00
Miro Spönemann
731b7a6f47 [generator] Fixed bug 470533: added 'ignoreCase' option for JS syntax highlighting;
also reordered fragment fields in StandardLanguage to match the order they are added, removed TODOs

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-11-20 12:16:46 +01:00
Miro Spönemann
5f4e9cc1cc [web] Removed module name from generated syntax highlighting,
regenerated statemachine language

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-11-20 11:56:59 +01:00
ghha
a191fb4664 Fix for #482665
Modified the bigger than check to bigger than or equal on
isInRequestedRange as it would otherwise skip the last whitespace region
in a document.

Signed-off-by: ghachem <ghaith.hachem@bachmann.info>
2015-11-20 11:23:10 +01:00
Sven Efftinge
20e5a945be [481937] make ide.highlighting package public 2015-11-20 09:59:19 +01:00
Dennis Huebner
6d052653dc [releng] Switched back to SNAPSHOT builds
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-20 09:40:56 +01:00
Sebastian Zarnekow
b04d0fac42 [xtext][generator] Additional abstract base class
Helps to implement generator fragments that write
to other locations on the disk, e.g to generate
plugins for other editors
2015-11-19 19:56:10 +01:00
Christian Schneider
57513fc90c [xtext generator] some fine-tuning of the UI module generation in 'XtextAntlrGeneratorFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-19 16:06:48 +01:00
Miro Spönemann
87fa5d75d1 Merge pull request #811 from eclipse/msp/webImprovements
Web integration improvements
2015-11-19 15:52:21 +01:00