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

4896 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d7e2ffacd4 Merge pull request #919 from eclipse/maintenance 
Maintenance
 2016-01-26 14:59:55 +01:00
Dennis Huebner
47f58cec18 Use new xtext gradle plugins. Added some javadoc 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2016-01-26 14:24:44 +01:00
Dennis Huebner
cb97d73dae Merge pull request #918 from eclipse/maintenance 
Maintenance
 2016-01-26 13:46:55 +01:00
Dennis Huebner
5d97b8661f Merge pull request #917 from eclipse/bug486262 
Bug 486262 - [idea] Make maven plugin dependency optional
 2016-01-26 13:45:43 +01:00
Dennis Huebner
07300622c2 Fixed android plugin version 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2016-01-26 11:17:34 +01:00
Sven Efftinge
577c43d60c [485239] fixed NPE 2016-01-26 09:08:14 +01:00
Holger Schill
81b14fcc17 [Xtext] Make org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser.currentNode protected see https://bugs.eclipse.org/bugs/show_bug.cgi?id=486469 2016-01-25 13:48:00 +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
490a596d5d [wizard] Bug 486323: add dependencies to old generator when creating a Gradle project from an existing Ecore model 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2016-01-22 15:35:42 +01:00
Miro Spönemann
1b4e4ac0fd [generator] Corrected white space in code and templates 2016-01-21 16:45:30 +01:00
Miro Spönemann
c91201598c Bug 485263: Allow javax.inject.Provider in provideX() methods of reflective modules 2016-01-21 14:56:31 +01:00
Miro Spönemann
827f3b527b [generator] Made equality check in GenModelUtil2 null-safe 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2016-01-19 17:15:20 +01:00
Hendrik Eeckhaut
0742e272d7 [485211] fix getLinAndColumn for RootNodes 
Signed-off-by: Hendrik Eeckhaut <hendrik.eeckhaut@sigasi.com>
 2016-01-05 15:02:18 +01:00
Dennis Huebner
2560e8f3f7 merged maintenance branch 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2015-12-22 13:14:08 +01:00
Dennis Huebner
84dd773391 Merge pull request #888 from iloveeclipse/maintenance 
Bug 484215 - [builder] Performance and OOM problems with QualifiedName while building large projects
 2015-12-22 10:39:37 +01:00
Andrey Loskutov
bb694820cc Bug 484215 - [builder] Performance and OOM problems with QualifiedName 
while building large projects

Use CommonUtils.intern(String) for segments if the Java system property
"xtext.qn.interning" is set to "true".

Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
 2015-12-21 16:06:26 +01:00
Andrey Loskutov
eb4918eb74 Removed trailing whitespace in QualifiedName, no code changes 
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
 2015-12-21 16:06:08 +01:00
Dennis Huebner
284869d79b [releng] Removed obsolete dependency to o.e.xtext.xtext.generator 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2015-12-21 15:58:50 +01:00
Dennis Huebner
4e5be76ea1 Merge pull request #885 from eclipse/sz/proxyInstallationFix 
[grammar][linking] Fixed bogusly installed proxy with fragments
 2015-12-21 14:00:44 +01:00
Dennis Huebner
8792349ce1 Merge branch 'maintenance' 2015-12-18 18:22:54 +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
9c32a97299 [releng] Back to 2.9.1-SNAPSHOT 2015-12-18 15:33:26 +01:00
Dennis Huebner
6311203ece [releng] Prepare for 2.9.1 release 2015-12-18 13:38:38 +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
Sebastian Zarnekow
48d7f9d1d0 [grammar][linking] Fixed bogusly installed proxy with fragments 2015-12-17 13:21:43 +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
Dennis Huebner
f3342679ee [releng] MWE2 dependency Update 2015-12-16 15:30:08 +01:00
Moritz Eysholdt
2ff921b01e Merge pull request #875 from eclipse/me/gcp_testcase 
[serializer] added another test case for grammar constraint provider
 2015-12-16 14:59:04 +01:00
Stefan Oehme
6e5bfd8a77 Use latest Xtext Gradle plugin 2015-12-16 13:44:10 +01:00
Sven Efftinge
a77bb1096e Merge pull request #876 from eclipse/se/fix_hasResourceDescription 
Fixed ResourceDescritpionsBasedContainer to give a proper answer to hasResourceDescription(URI)
 2015-12-16 11:50:27 +01:00
Sven Efftinge
1ac9870b80 [483088] allow nested types in implementationClass in ecore models. 2015-12-16 11:44:21 +01:00
Sven Efftinge
55ffa8a62a Fixed ResourceDescritpionsBasedContainer to give a proper answer to hasResourceDescription(URI) 2015-12-15 16:12:13 +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
Miro Spönemann
d90edd1402 Merge branch 'maintenance' 
* maintenance:
  [documentation] Updated TOC generator, updated Eclipse help content with current website documentation
  Homeautomation example - minor changes
  [docs] updated special language descriptions to match the new code generator
  [examples] migrated homeautomation example to 2.9
  [generator] split parser when synthetic terminal rules are used
  Docs for parameters of Check
  [484315] allow to suppressing generation of example test
  [484201] don't try to load synthetic classes with Java source language
  [478394] Handle possible exception when traversing deleted VirtualFile trees.
  [484176] Don’t raise unnecessary issue on thrown errors
  [web] Small improvements: - Simplified sorting code in ContentAssistService - Handled case of empty classes array in hover HTML - Added check for invalid paths in ResourceBaseProviderImpl

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>

# Conflicts:
#	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF
#	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF
#	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF
 2015-12-15 14:16:41 +01:00
Sven Efftinge
54309f3655 [generator] split parser when synthetic terminal rules are used 2015-12-15 09:36:27 +01:00
Sven Efftinge
ef7329ab22 [484315] allow to suppressing generation of example test 2015-12-14 15:48: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
Sven Efftinge
bb4c77a5ec Merge pull request #863 from eclipse/se/bug483088 
[483088] Fixes for ecore-based wizard
 2015-12-11 12:59:05 +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
Dennis Huebner
40da842fcd [api] Mark method as @noreference - internal use only 2015-12-10 17:04:38 +01:00