Commit graph

3821 commits

Author SHA1 Message Date
Dennis Huebner
5fd1c8ce5a [releng] Increase version to 2.9.0
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 14:14:58 +01:00
Dennis Huebner
4fb78f56a3 [releng] increase version to 2.8.0 -> 2.8.1
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 11:59:35 +01:00
Dennis Huebner
561d9c660e [mvn] Set version to 2.8.1-SNAPSHOT
Change-Id: Iecb5b6ab6cdbb3b95e3148a51e1bcd7b091375b0
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 11:26:43 +01:00
Moritz Eysholdt
8d8420a472 Merge pull request #28 from eclipse/pr2
[serializer] keywords don't have precedence over rule calls
2015-03-18 10:54:23 +01:00
Dennis Huebner
4c0dd7e885 [mvn] Set version to 2.8.1-SNAPSHOT
Change-Id: Iecb5b6ab6cdbb3b95e3148a51e1bcd7b091375b0
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 10:10:23 +01:00
Sebastian Zarnekow
c3d3682f50 [461939]: Fixed performance problem with Strings.countLines
Instead of using countLines with a substring, the start and endOffset
an be passed as an argument to the methods that deal with line
counting.

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-17 16:17:47 +01:00
Moritz Eysholdt
7c13f76a91 [serializer] bugfix: never break datatype rules into individual tokens
Change-Id: I25a55027dc588b41b70a4cb94ca2b81282c31f4e
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-16 11:03:17 +01:00
Moritz Eysholdt
3e5b500a22 [serializer] keywords don't have precedence over rule calls
Because rule calls can refer to DataType rules which again may
contain keywords.

Change-Id: If128a1fa89330df970fe5a076ec7db0dc8e01e64
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-16 10:52:08 +01:00
Miro Spönemann
1384d14bea [xtend] Bug 460093:
- Enabled content assist for overriding default methods
- Enhanced IDE test infrastructure to support different Java versions

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-03-12 10:27:03 +01:00
Dennis Huebner
9a03eefb14 [tests] reverted check of misleading isJava7Default field 2015-03-06 13:50:08 +01:00
Dennis Huebner
cc760f717f [tests] Fixed failing test with Java7 on server or Java6 locally 2015-03-06 12:33:06 +01:00
Moritz Eysholdt
87d6525159 [formatter2] improved JavaDoc
Change-Id: I84208d0a1a66ed842b07c4d7b8ad445fd005580d
2015-03-05 10:55:46 -05:00
Dennis Huebner
ed8d51db6f [emf] More changes for switching from 2.11 to 2.10.2 2015-03-05 10:24:50 +01:00
Miro Spönemann
d12436e9ee [formatting] Fixes bug 461033: the formatter for XMemberFeatureCall took the wrong tokens in some cases
Change-Id: I2c6599cbbeb1e4cef12a5355aeb5a055c19fb7f4
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-03-05 03:09:55 -05:00
Dennis Huebner
7039180d89 [emf] Set lower bound for EMF to 2.10.2
Change-Id: I5254556239ae64241d4b06f90db546dad03f95bd
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-04 16:32:45 +01:00
akosyakov
54792b4bf7 [intellij] Added parsing tests based on Xtext grammar language
Change-Id: Ie2b07846e80deb7385093aa4278e20d7df8a3ecb
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-03-02 16:55:13 +01:00
akosyakov
1b413152e9 [intellij] Added assignments, antlr and datatypesrules parsing tests
Change-Id: I60d75f6e3d4271bda840daff6ff1735e7874edc6
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-03-02 16:55:13 +01:00
Miro Spönemann
307a2af1b8 [documentation] Reviewed new formatter documentation
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-03-02 09:17:18 +01:00
Stefan Oehme
a1191fd1ed improved LoggingTester API, implement without reflection
Change-Id: Ic955ad5c8d614b9f079da026aa1017593f26cf68
2015-02-27 11:43:57 +01:00
Sebastian Zarnekow
17cf59cd85 [xbase][resources] Rename method to avoid ambiguities
Renamed newly introduced method load(ResourceStorageLoadable)
to loadFromStorage to avoid ambiguity with load(null)

Change-Id: If1f14b018b246968e576bb690be2417f771fd923
2015-02-26 17:45:41 +01:00
Miro Spönemann
f01f6a9712 Fixed links to documentation according to renaming of Markdown files
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-02-26 09:36:40 +01:00
Sebastian Zarnekow
866274ea50 [460759]: [xtend][templates] Fixed CA in template proposals
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=460759

Change-Id: I032d3f0513e4b61575cbdc7f8bcba634db423e31
2015-02-25 15:20:48 +01:00
Sebastian Zarnekow
1fb2cf8294 [460730]: [xtend] Fixed quickfix for wrong package declaration
Also fixed a general issue with the DefaultTextEditComposer
and DerivedStateAwareResources.

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

Change-Id: I70fa21069e9b0ffc6929090d2851cfe2ad2541cc
2015-02-25 14:27:14 +01:00
Dennis Huebner
dbc9d4490b Merge "Bug 460552 regenerate all languages with the recent generator changes and mark xtext.ide provisional see https://bugs.eclipse.org/bugs/show_bug.cgi?id=460552" 2015-02-24 15:57:18 -05:00
Holger Schill
b49c02cb0b Bug 460552 regenerate all languages with the recent generator changes and mark xtext.ide provisional see https://bugs.eclipse.org/bugs/show_bug.cgi?id=460552 2015-02-24 20:42:35 +01:00
Jan Koehnlein
c410c8857d Bug 460269 [editor] open generated file doesn't work for multi-type Xtend files with comment as first statement
Trace merger tests and minor fix

Change-Id: I4d9403787c7799ac10241c6595b8d92c7494c183
2015-02-24 13:30:19 +01:00
Dennis Huebner
cb5123a764 Merge "Fixed links to documentation according to new website structure" 2015-02-23 13:16:06 -05:00
Miro Spönemann
b58eea29d9 Fixed links to documentation according to new website structure
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-02-23 17:33:55 +01:00
Jan Koehnlein
16049ef03f Bug 460269 [editor] open generated file doesn't work for multi-type Xtend files with comment as first statement
Re-implemented merging of inverted traces. Tests TBD

Change-Id: Ib1e8d7bd89325d630207b638a2ba35e58e95c28c
2015-02-23 17:21:04 +01:00
Sebastian Zarnekow
baf15a52cb [456482]: [xtext] Fixed referenced to Xcore from Xtext grammar workflow
The LanguageConfig will use a proper index for the resource set
and the grammar access will clone the resources from the resource set
as fully initialized to avoid duplicate initialization

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

Change-Id: I66f7f0cffdeb208b71c35b1594f3cb90fcd528ad
2015-02-22 14:55:24 +01:00
Jan Koehnlein
d8db274a42 Bug 460112: Strange IllegalStateException when importing URL in grammar editor
PackageRemover should never unload registered EPackages.

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

Change-Id: I921ae358ca39c4538e6e595ac0b56728638484eb
2015-02-20 18:15:58 +01:00
akosyakov
c28ab97d43 [intellij] added more tests for terminal rules
Change-Id: Ie4ae218c3974d417e85165e1685b82b585af2fda
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-02-20 14:22:45 +01:00
Jan Koehnlein
ee82c7438a Bug 460269 [editor] open generated file doesn't work for multi-type Xtend files with comment as first statement
Consider region overlap when iterating trace regions.

Change-Id: Ia252510ef935316004d5f39ad9279d43f267ab5c
2015-02-19 20:19:23 +01:00
akosyakov
c600f9e09f [intenllij] added terminal rules parsing tests
Change-Id: I5bb0f5f337472229d7c53e0567bd757d59715173
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-02-18 17:16:59 +01:00
akosyakov
2644541fe5 [intellij] tested unordered groups parsing
Change-Id: If2f1a238d8da017ce4ef98f550f3df96c011d08e
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-02-18 12:57:43 +01:00
akosyakov
f2c8eb65d3 [intellij] Generated psi parsers for all test languages from
org.eclipse.xtext.tests project

Change-Id: I3e16af96de08aa88ca0300ad5e0f4164bd5051e2
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-02-17 16:10:15 +01:00
Dennis Huebner
e226792fae [osgi] Part of Bug 460001 : Missing "uses"-constraints cause class
loader problems with different Guava versions.
- Removed guava reexport from bundles which already reexport xbase.lib
- Removed "optional" in xtext.util for bundles that are used in public
signatures
- Added uses directive to xtext.util to track the use of guava packages

Change-Id: I79ef3add1befe66c3068b4345a53bab29042b73d
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-02-17 10:51:11 +01:00
Sven Efftinge
2aefc97350 [storage] allow nullable URIs. E.g. ReferenceDescription containerEObjectURI might be null if the reference is in a root eobject.
Change-Id: I25a354ca8d05a97c24be34c65170167f37f5128e
2015-02-16 13:20:44 -05:00
Dennis Huebner
17057231ae Merge "[459633]: [xtend][builder] Fixed memory leak with cancelled builds" 2015-02-16 09:54:31 -05:00
Sebastian Zarnekow
bb3bf12803 [459633]: [xtend][builder] Fixed memory leak with cancelled builds
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=459633

Change-Id: Icc580d21f7810a7aa9b8c069e6517d504b40e23b
2015-02-16 14:39:35 +01:00
Holger Schill
e705659ac0 Fix broken Tests for Xtext Grammar ContentAssist 2015-02-16 14:04:30 +01:00
Holger Schill
785a39d785 [Xtext] [GrammarEditor] ContentAssist for grammar inheritance see https://bugs.eclipse.org/bugs/show_bug.cgi?id=459866
Change-Id: Ic9956ee742ee7c65c0ed84c239120bdf24f0af9f
2015-02-13 12:17:04 +01:00
Sebastian Zarnekow
196296613d [xtext][formatter] Added missing author information
Change-Id: I17d7b51e69ae7916a1dc8658c1f970b8ea0bf4a5
2015-02-12 15:39:34 +01:00
Sebastian Zarnekow
24197724d5 [xtext][tests] Use org.junit.Assert rather than junit.framework.Assert
This avoid unnecessary deprecation warnings on the server

Change-Id: I0a1ace2703a211f632355495bd3b6d092edb48ef
2015-02-12 10:19:58 +01:00
Sebastian Zarnekow
617965332c [xtext][formatter] Javadoc proofreading
Also a few minor typos in method or parameter names.
Added two methods to interfaces to avoid bogus cast
operations in the implementation classes.

Change-Id: I662d3c9a1028e489b00adcbf6921a13f0d07f44c
2015-02-11 18:08:44 +01:00
Dennis Huebner
eb6ecc5183 Bug 458176 - Discouraged access after regenerating with 2.8
Change-Id: Icae131e2c2860324e75fe209f9ed4d0c4435ef28
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-02-11 15:09:04 +01:00
Miro Spönemann
e2ef796cea [xtext] Created example language with semantic whitespace (bug 451838)
- Added missing imports to content assist parser
- Disabled emitting of synthetic end tokens for content assist parser
- Added detection of overridden methods for new formatter stubs

Change-Id: I989585ebc42db8ddb72514eef17ab6e47481ddcc
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-02-11 13:38:06 +01:00
Dennis Huebner
ba3364e0c5 Merge "[performance] some more small performance improvements." 2015-02-10 14:34:34 -05:00
Sven Efftinge
8971b90c86 [performance] some more small performance improvements.
- avoid iterating adapters twice
 - avoid iterating whole tree
 - wrap DeflaterOutputStream with BufferedOutputStream
 - [typeresolver] check rootedExpressions first

Change-Id: I14a02ec15a3bc22f4292c1361579cecc33b566f1
2015-02-10 18:58:13 +01:00
Sebastian Zarnekow
9a5ba2c01d Bug 408323: Log if type resolution is triggered in the model inferrer
For Xtend we’ll throw an exception in these cases.

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

Change-Id: I944695de8d6db5bd54d7a7c4d09f0fde692536e1
2015-02-10 15:02:27 +01:00