Commit graph

3628 commits

Author SHA1 Message Date
Moritz Eysholdt
9881af7b74 fixed 443705 [linking] LazyLinkingResource#handleCyclicResolution breaks cycle detection
Change-Id: I1627a14ed0db8197d7ca14e24c0d6b121c53cd6a
2014-09-11 15:34:07 +02:00
Sven Efftinge
0d4ba23457 Create a copy of the URIs, to avoid CME when new types are loaded into the resource set (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=443739) 2014-09-11 11:18:02 +02:00
Dennis Huebner
8bf2bdbfd6 [api] Removed xtend.core reexport from xtend.ide. Cleanup filters.
Set Xtend compiler to not clean the generated files during clean build.
So the public API types do not get lost when API builder is running and
Xtend comiler is not done.

Change-Id: I327f8e4859d0e18792d29aadb7bee5597aba204b
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-09-10 11:04:15 +02:00
Dennis Huebner
87c937f194 [api] cleaned up api filters
Change-Id: Ib79c29b603f8eeff50c529742660481369157c6a
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-09-10 09:56:22 +02:00
Sven Efftinge
2a1fc40b54 [jvm model associations] turned error logging on for wrong associations. Added check to generic JvmTypesBuilder#cloneAndAssociate. (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=442282) 2014-09-10 03:30:21 -04:00
Dennis Huebner
11a6839888 [releneg] Increasing version to 2.8.0
Change-Id: I108d28a82813ac3f84e20c03a4f311a729d1fbc4
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-09-09 16:18:29 +02:00
Dennis Huebner
f67c48be38 [mvn] Increasing version to 2.8.0-SNAPSHOT 2014-09-09 16:01:03 +02:00
Sebastian Zarnekow
5bd30ad2a2 [xtext][serializer] Unstable auto-generated comment
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=399584

Change-Id: I82cb6b18bb25fcaa49f5b006e4d152cd86b34731
2014-09-08 11:36:08 +02:00
Dennis Huebner
9b229cc552 [releng] Increase version to 2.7.1
Change-Id: I68a4c9245ebeef6414f5bc8d48c256d06e482865
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-09-05 10:19:27 -04:00
Dennis Huebner
4fe6ecc663 [mvn] increase version to 2.7.1-SNAPSHOT 2014-09-05 11:44:08 +02:00
Sebastian Zarnekow
07d12884c9 [xtext][parser] Fixed issue with underscore keywords
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=443221

Change-Id: Ib22c72bedf8a20194a3340a92c2dfdfb3d22bfa2
2014-09-04 13:32:23 +02:00
Sebastian Zarnekow
d41078c470 [xbase][api] Expose XExpression, XAnnotation and a few other types as API
Change-Id: I5d7ddc78ff4c7a65c97fdf57052519ff8a909c25
2014-09-01 16:15:06 +02:00
Dennis Huebner
2e21ceb780 Merge changes I3df3f5c5,Ic30e6e38,I347a2df4
* changes:
  [docs] moved section about testing with multiple different langs (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=439451).
  [website] fixed generics in release notes
  [xtext] don't accidentely resolve AbstractMetamodelDeclaration#getEPackage, since it will leave an empty XMIResource behind. (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=442982)
2014-09-01 07:33:09 -04:00
Sven Efftinge
0a88ca7b8f [xtext] don't accidentely resolve AbstractMetamodelDeclaration#getEPackage, since it will leave an empty XMIResource behind. (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=442982)
Change-Id: I347a2df4fcd996d1232eba1a0b7bfd6082dd54ca
2014-09-01 11:50:14 +02:00
Sebastian Zarnekow
e90acb6175 [xtext][names] Prevent IllegalArgumentException in SimpleNameProvider
Change-Id: I77690cca1e99721dcc6f49bed1ee87e7eded2644
2014-09-01 11:27:40 +02:00
Dennis Huebner
23ed5392df [releng] We require at least EMF 2.10 - Part 2
Also added some eclipse runtime constraints

Change-Id: Ic42f9dfda922626dcfd3cecf57f4a40971701f6e
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-08-27 11:25:27 +02:00
Dennis Huebner
c40b75135a Merge "Added isInitializing method to DerivedStateAwareResource" 2014-08-27 05:23:31 -04:00
akosyakov
1bd2f37e3d Added isInitializing method to DerivedStateAwareResource
Change-Id: I7fb4e697844f7fbbf9e73e78c4843bc6964022a6
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2014-08-27 10:31:21 +02:00
Dennis Huebner
06923c313f [releng] We requiere at least EMF 2.10 see Bug 442577
Change-Id: I6969a8d63c69698a7758e1a766391262d595066e
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-08-27 10:29:43 +02:00
Dennis Huebner
000dbf014d [releng] guava allow v18 - phase II
Change-Id: Ibedb3b25666b0aeb396923933cb6226987797ee5
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-08-26 10:53:29 +02:00
Sebastian Zarnekow
0baa55e549 [xtext][junit4] Attempt to deal with flaky tests
Some of our tests seem to depend on index data to
be present or some other unpredictable things. The
JUnit TestRule Flaky.Rule tries to deal with those
symptomatically. By annotating a test method as
@Flaky, one can indicate that the test should be
executed again if it failed. The number of trials
can be configured and defaults to 3.

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

Change-Id: Ic405b64b3c5c46350fd8a954d6791bf65978a732
2014-08-25 09:08:44 -04:00
Sebastian Zarnekow
2595b54b3d [xtext] Mandatory dependency to equinox.common
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=441984

Change-Id: Iaf3b09620c35d4e0ab8d7c19b87febe696d96ee6
2014-08-21 10:42:45 +02:00
Sebastian Zarnekow
eeb55b3344 [common.types] Added JvmInnerTypeReference
JvmInnerTypeReferences are used to represent types
of the form Outer<T>.Inner which is necessary to keep
track of parameterized inner classes.

This change had some impact on the overall constraints
and invariants for LightweightTypeReferences.
Therefore the ITypeReferenceOwner is now responsible to create
instances of LightweightTypeReference from JvmTypeReferences,
JvmTypes or Classes. Various factory methods have
been added. Those will maintain the invariants, e.g.
InnerTypeReferences are produced where appropriate.

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

Change-Id: I6fdaa49851dc70edebb889ef9482412232fca8a0
2014-08-20 16:09:26 +02:00
Stefan Oehme
b6b96c7db7 fix swallowed stack traces
Change-Id: I5a6bee7b9afb67acd52a08dd76d2a53ff36ef6e8
2014-08-20 09:03:47 +02:00
Sven Efftinge
c8fb68eae4 [xtext] removed caching of URI fragments 2014-08-14 16:29:09 +02:00
Sven Efftinge
f7c8691901 [xtend examples] fixed manifest and tests. Removed TypeReference#operator_equals and TypeReference#is.
TypeReference#is was removed as we decided to support properly implemented equals and hashcode. Inferred type references won't lazily resolve (i.e. mutate). During the first two phases those type references are always inferred. During validation and generation we create proper TypeReference instances again.

Change-Id: I3eaf01a8702a09b77aed88b899d67f0650600ed4
2014-08-14 11:21:32 +02:00
Sebastian Zarnekow
cef3267233 [xtend][linking] Fixed extension linking in anonymous classes
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=441079

Change-Id: I7fb7b7f67845d8b4d92b51c6bac459e0d01fa46b
2014-08-13 17:03:07 +02:00
Dennis Huebner
4d385cf218 Merge "[generator] made syntactic sequence generator stable" 2014-08-13 10:14:40 -04:00
Dennis Huebner
7fee2d7d1b Merge "[xtext][xtext] Fixed broken test on server" 2014-08-13 09:41:12 -04:00
Sven Efftinge
c950cd1b3d [generator] made syntactic sequence generator stable 2014-08-13 15:15:20 +02:00
Sven Efftinge
4bb6582bc7 [EcoreInference] Fixed inference bug with assigned actions in multi groups (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=390326)
For assigned actions that live in a multi-cardinality group we need to also add the Actions type as the feature.

Change-Id: I7b7d756bd6db15b0af1ca137c3135ce2aad1193b
2014-08-13 14:37:12 +02:00
Sebastian Zarnekow
a2b20c7756 [xtext][xtext] Fixed broken test on server
Do not unload generated packages since they cannot
be referenced in the same resource set anyway and it
caused trouble: An edit to a GrammarResource triggered
proxification of the generated package and when the
serializer tried to persist the grammar resource, the
proxies would have been resolved again but there is no
physical resource for the generated resource URI
which will put a dummy XMIResource into the resource
set. Afterwards, that would be broken.

Change-Id: Ida5a7b8edbaf3a1d5914a795c0afa90ff5a89fcc
2014-08-13 14:26:22 +02:00
Sven Efftinge
02685e7a1d Regenerated test languages and fixed workflow
Also added a .launch to specify the needed encoding and JVM

Change-Id: Ib8e618542ef2f89cc045b6e78ca14369646d9911
2014-08-13 13:35:57 +02:00
Sebastian Zarnekow
9fb279e03e [xtext][xtext] Fixed Stackoverflow in unloader
Change-Id: I26425dea4f15ba96d4c4e49cc0f4cc4d17403e35
2014-08-13 10:31:51 +02:00
Stefan Oehme
ef640a5246 Merge "[439682][441473] proxify EPackages used in Xtext grammars" 2014-08-13 01:02:13 -04:00
Stefan Oehme
c0e758b717 [439682][441473] proxify EPackages used in Xtext grammars 2014-08-12 14:20:58 +02:00
Sebastian Zarnekow
051d5bb77b [xtext][junit] Generic implementation of smoke tests
By running a test suite with the XtextSmokeTestRunner,
all test cases in that suite will be used to extract
smoke test scenarios generically. Clients choose how
to process the input by means of the ProcessedBy annotation
on the test suite.

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

Change-Id: I1be69cf2361590a76a4fe9d0152933a2aabc83fc
2014-08-12 11:18:25 +02:00
Sebastian Zarnekow
50441a19fd [xtext][grammarAccess] Made grammar access thread safe
Instead of lazy initialization in the getters, the
accessor fields are assigned in the constructor of the
grammar access.
Also the grammar EObjects are fully resolved before
they are obtained from the grammar provider.

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

Change-Id: I7398e6d61b99b035a364ae95d7b149bb4e0e30cb
2014-08-07 14:12:12 +02:00
Sebastian Zarnekow
0e56337113 Revert "[xbase] Change model inference to not being called twice but just once and cache the initialization code in the resource. This will avoid unneeded unloading and proxification after indexing."
This reverts commit 1f2b99a88a9a4ad5568c96ee976356e3f5e501df.

Change-Id: I1f967f92ecaef84fa3608249107aa92350e54e01
2014-08-07 11:13:10 +02:00
Sebastian Zarnekow
084ad69958 Fixed typos
Change-Id: If160a4eb016882d12a39df970841fc30cd063608
2014-08-06 18:38:41 +02:00
Jan Koehnlein
eb4b2d383c [document] Adding priorityReadOnly and more cancelable model listeners
https://bugs.eclipse.org/bugs/show_bug.cgi?id=439880

Change-Id: I0a67e82e6da7d6af89118e471811761dd1d5453a
2014-08-06 16:18:56 +02:00
Sven Efftinge
6857521146 [xbase] Change model inference to not being called twice but just once and cache the initialization code in the resource. This will avoid unneeded unloading and proxification after indexing.
Also removed secondary inferrer extension point

Change-Id: Icf2a6048c493a71b90d18fc01a69ae9c87261e0e
2014-08-06 14:05:57 +02:00
Sven Efftinge
36b636af9c [xbase test] Made CompilationTestHelper work on real file system (temp folder). Added test for active annotation that reads and writes through the FileSystemSupport.
Change-Id: I62ebdf449ce193b036545d1ee87c86d3ae65582b
2014-08-05 13:13:14 +02:00
Dennis Huebner
aa006f1d58 [osgi] setting eclipse lower bound to Helios(3.6)
Change-Id: I46e437f0fcce2fc778344e83e9b9d2382ae3959a
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2014-08-01 10:55:58 -04:00
Sebastian Zarnekow
c7d15112a3 [xtend][contentAssist] Fixed proposals after throws keyword
Also tweaked subtype proposals in common.types.
As soon as we switched to Helios, the reflective
code can be removed.

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

Change-Id: Ia25580d5956e84245abbf2b9b7b5a478d3bcaaa7
2014-08-01 12:13:36 +02:00
Sebastian Zarnekow
269271b964 [guava][latest] Avoid usage of APIs that have been removed
Among them are a couple of #copy APIs on
(Input|Output)StreamSupplier

Change-Id: I1e5a59fd3044c065ab70ba88e0748a43b78a80ff
2014-07-31 10:31:39 +02:00
Sebastian Zarnekow
782c2346d8 Removed some more warnings from code base
Change-Id: I76b5717fc021f552c4b86096e5b93362e60ee749
2014-07-30 20:26:04 +02:00
Sebastian Zarnekow
9692c1afcf Removed hundreds of warnings from code base
Resolution strategies included:
- x-friends directive
- API filter
- @SuppressWarnings
- Minor code rewrite (e.g. introduce local variable)
- Organize imports
- Adjusted project specific compiler settings

Change-Id: Ife7936493b115a1d6f8f80da7b97704f007059db
2014-07-30 16:41:03 +02:00
Sebastian Zarnekow
ba952bcfc6 [xtext][findRefs] Restored DefaultReferenceFinder
The deprecation stategy is to not break existing code
at runtime during injector creation.

Change-Id: I8985be9bd91c8e9eede13e6001f984631182cefe
2014-07-28 14:01:25 +02:00
Sven Efftinge
5bbc0eee75 Add URI to logged exception on cyclic resolution (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=365116) 2014-07-28 11:44:42 +02:00