Commit graph

4871 commits

Author SHA1 Message Date
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
Moritz Eysholdt
70cdf2a115 [oldserializerfragment#481865] Support Deprecated ContextEObject
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481865

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-11-19 14:23:30 +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
Miro Spönemann
28fdde956a [web] Renamed StaticContentServlet -> XtextResourcesServlet
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-11-19 12:46:11 +01:00
Miro Spönemann
f2738e0936 [web] Extended hover service so it can compute hovers for selected content assist entries
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-11-19 12:32:58 +01:00
Sebastian Zarnekow
3507f30bba [482514] Fixed ConcurrentModException
Also: make return types explicit
2015-11-19 09:10:51 +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
Christian Schneider
fb15bf0a6a Merge pull request #809 from eclipse/cs/migrate_runtime_test_languages2
migration of some testlanguages of xtext.tests to new xtext code generator
2015-11-18 15:31:11 +01:00
Dennis Huebner
ed0562bea0 [releng] Prepare for 2.9.0.rc2
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-11-17 10:25:05 +01:00
Christian Schneider
c3274abb11 [xtext tests] re-generated BacktrackingLexerTestLanguage with new generator
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 22:13:37 +01:00
Christian Schneider
85db706fa2 [xtext tests] activated test generation of BacktrackingLexerTestLanguage in 'GenerateAllTestLanguages2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 22:03:32 +01:00
Christian Schneider
5e8262a66e [xtext tests] re-generation of Super- & SubTestLanguage with new generator
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 22:03:03 +01:00
Christian Schneider
960dc02bf8 [xtext tests] changed name computation of lexer grammars to be in line with the formerly taken names, synchronized name computation in grammar comparison fragment
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 21:51:07 +01:00
Sven Efftinge
db160aa5a6 [generator] fixed some issues in lexer generator 2015-11-16 21:46:29 +01:00
Christian Schneider
076807b17b [xtext tests] introduced 'src-gen2' source folder, introduced dedicated 'TestProjectConfig', activated class-splitting in 'TestLanguage', updated 'GenerateAllTestLanguages2' workflow; added documentation in 'StandardProjectConfig'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-11-16 21:46:07 +01:00
Sven Efftinge
5901b857e5 [generator] various minor fixes, first work on generating runtime test languages with new generator
- support isGenerateXtend in IdeaPluginGenerator
 - allow setting overWriteSrc (useful for testing)
 - allow disabling outlets via empty string (mwe2)
2015-11-16 21:41:23 +01:00
Sebastian Zarnekow
cca04071dc [482239] Don’t create unnecessary binding to depr type 2015-11-16 09:10:23 +01:00
Sebastian Zarnekow
730eb96464 Allow to set the class loader for the grammar provider. 2015-11-15 23:44:55 +01:00
Sebastian Zarnekow
6a8ea1a411 Merge pull request #803 from eclipse/sz/bug482116
[482116] Fixed bug in GrammarAccessFragment
2015-11-15 21:14:03 +01:00