Commit graph

4973 commits

Author SHA1 Message Date
Anton Kosyakov
dcd274fd07 Merge pull request #967 from eclipse/ak/bug_489547
[bug 489547] Allow to provide offset and length for SyntheticLinkingLeafNode
2016-03-22 15:48:31 +00: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
d1b582f3f8 [bug 489574][web][jetty] Don't lock static resources on Windows
Change-Id: I102e9567bba1f604072f608e089d6fd363e48a40
Signed-off-by: akosyakov <anton.kosyakov@typefox.io>
2016-03-15 18:31:36 +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
c4cb85e533 Merge branch 'maintenance'
# Conflicts:
#	xtext-website/download.html
2016-03-04 15:46:47 +01:00
Dennis Huebner
005199d04c [releng] Back to snapshot version 2016-03-04 15:14:14 +01:00
Sven Efftinge
c3a8333266 [488309] Added missing null checks 2016-03-04 09:40:50 +01:00
Dennis Huebner
df2582a2da [releng] Prepare for release build 2016-03-04 09:38:30 +01:00
Lorenzo Bettini
f1138107f9 488966: AbstractOutlineTest
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=488966
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2016-03-03 18:18:13 +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
Dennis Huebner
ef0cbdd914 [cluster] Log "Cluster capped" as warn. Better memory info massage.
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2016-03-03 10:34:09 +01:00
Sven Efftinge
0ba45fac8a [486420] fixed scope provider binding for xbase 2016-03-01 14:33:08 +01:00
Miro Spönemann
613390a021 Bug 484465: Improved performance of GrammarConstraintProvider.Constraint#collectBounds()
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-02-29 17:44:30 +01:00
Sven Efftinge
690bdede00 Merge pull request #934 from vorburger/bug409003_ImportedNamespaceAwareLocalScopeProvider
[409003] ImportedNamespaceAwareLocalScopeProvider public getQualifiedNameConverter()
2016-02-29 17:14:36 +01:00
Andreas Heiduk
92cdc8ca9a [488589] Fix NPE in ReferenceFinder.findLocalReferencesFromElement
Solves https://bugs.eclipse.org/bugs/show_bug.cgi?id=488589

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
2016-02-26 20:08:06 +01:00
Sven Efftinge
9a11718c68 Merge pull request #939 from cdietrich/bf488458
Add warning for keywords containing spaces
2016-02-25 15:02:50 +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
Jan Koehnlein
412a1dd4ee Merge branch 'maintenance' 2016-02-25 10:26:50 +01:00
Trabajo
0319d7a2b8 [bug 486980] add JavaDocs to describe how to compose validators 2016-02-19 17:01:20 +01:00
Michael Vorburger
18c5fdcd4b [409003] ImportedNamespaceAwareLocalScopeProvider public
getQualifiedNameConverter()

https://bugs.eclipse.org/bugs/show_bug.cgi?id=409003

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
2016-02-16 16:44:17 +01:00
Dennis Huebner
eb6c093769 Revert "[409003] ImportedNamespaceAwareLocalScopeProvider public getQNC" 2016-02-15 11:32:43 +01:00
Michael Vorburger
bb38f29ed1 [409003] ImportedNamespaceAwareLocalScopeProvider public getQualifiedNameConverter()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=409003

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
2016-02-12 12:54:43 +01:00
Jan Koehnlein
5dd3aaf971 [bug 487622] register Ecore.ecore directly to resourceSet in generator 2016-02-11 16:35:04 +01:00
Jan Koehnlein
b4bcf93b6e [bug 487508] added an NPE guard in IDEA generator 2016-02-09 14:35:39 +01:00
Sven Efftinge
208bc7624e [junit] CompositeEValidator - added operationCanceledManager to the copy method 2016-02-02 20:54:08 +01:00
Miro Spönemann
cf59f1c53f [web] Added API for template proposals 2016-02-01 15:26:51 +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
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