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

522 commits

Author SHA1 Message Date
Christian Dietrich
91a5c3bb81 [#1190] fixed bug where formatter "destroys" its own config 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-06-27 16:47:11 +02:00
Lorenzo Addazi
c6c34d2541 [eclipse/xtext-core#1161] Added configurable issue for generated java package names not conforming to Java package naming conventions (Default: Ignore). 
Signed-off-by: Lorenzo Addazi <lorenzo.addazi@mdh.se>
 2019-06-25 14:30:40 +02:00
Nico Prediger
c9a07291d8 [eclipse/xtext#1474] Prepare Master for 2.19 
Signed-off-by: Nico Prediger <mail@nicoprediger.de>
 2019-06-03 14:02:18 +02:00
Sebastian Zarnekow
4450b57242 Improved performance of validation for keyword heavy languages 2019-05-14 15:48:59 +02:00
Arne Deutsch
23e73a25d4 [eclipse/xtext#1440] Update to ASM 7.1.0. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-05-02 13:09:19 +02:00
Sebastian Zarnekow
d5d8ffd965 [#748] Remove caliper benchmarks 2019-04-15 19:58:03 +02:00
Christian Dietrich
540b8ecc86
Merge pull request #1123 from lievenlemiengre/nodemodelbuilder 
Performance improvement of array interning in NodeModelBuilder
 2019-04-15 09:05:21 +02:00
Jan Koehnlein
7ebd587d0c [lsp] some build performance tuning 
When a resource is loaded for the first time, there is no need to unload it between pre-indexing and build
 2019-04-12 10:05:01 +02:00
Lieven Lemiengre
20a09fc980 Performance improvement of array interning in NodeModelBuilder 
Signed-off-by: Lieven Lemiengre <lieven.lemiengre@sigasi.com>
 2019-04-11 21:56:55 +02:00
Holger Schill
fe96a20cf9 Remove IDEA since the support has been dropped. 
Signed-off-by: Holger Schill <Holger.Schill@itemis.de>
 2019-04-02 08:48:56 +02:00
Dennis Huebner
312e236ec3
Merge pull request #1044 from eclipse/dh-serializer 
[ide] Bogus serialization when reassign container #1043
 2019-03-18 15:35:55 +01:00
Christian Dietrich
51977631e7 added missing getter/setter for operationCanceledManager 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-17 15:53:28 +01:00
Karsten Thoms
6c0d14bdf8 Cleanup WS formatting in package org.eclipse.xtext.build 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-03-13 21:41:54 +01:00
Christian Dietrich
f8708cefd5 [eclipse/xtext#1414] prepared master for version 2.18.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-05 16:47:14 +01:00
Sebastian Zarnekow
92a3fc77b0 Added x-friend to xtext.xtext.ui.tests 2019-02-26 18:49:08 +01:00
Sebastian Zarnekow
edeb506431 Make injection of the CompositeEValidator work 2019-02-26 18:29:10 +01:00
Dennis Huebner
e807fecdbe [ide] Bogus serialization when reassign container #1043 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2019-02-21 09:03:07 +01:00
Sebastian Zarnekow
787ef1d8bd
Merge pull request #1033 from epoell/ep_issue1021 
Replaced ThreadLocal state.set(null) with state.remove() in AbstractDeclarativeValidator
 2019-02-20 10:58:22 +01:00
Eva Poell
a5bcb66f26 [#1034] corrected code formatting 
Signed-off-by: Eva Poell <epoell@itemis.com>
 2019-02-19 16:12:46 +01:00
Eva Poell
673a7ee1d8 [#1034] Added Validation that entry rule is not a fragment 
Signed-off-by: Eva Poell <epoell@itemis.com>
 2019-02-19 09:01:42 +01:00
Eva Poell
084ac859fd Solve Issue 1021 
Replaced ThreadLocal state.set(null) with state.remove(). And tried to decrement the calls of state.get() by keeping it in a variable if possible.
Might need a closer look, if this works.

Signed-off-by: Eva Poell <epoell@itemis.com>
 2019-02-14 09:42:10 +01:00
Sebastian Zarnekow
53756198b2
Merge pull request #1030 from eclipse/kt_findInstantiableCompatible 
[performance] Improve isInstantiatableSubType
 2019-02-11 22:25:04 +01:00
Karsten Thoms
e00313cff2 [performance] Short cut findInstantiableCompatible 
Avoid calling isInstantiatableSubType to reduce number of conditions to
check until identity is checked.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-11 21:12:34 +01:00
Karsten Thoms
bf0546ba3b isAssignableFrom: check both args for null & identity 
Added covering test case

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-11 21:08:32 +01:00
Sebastian Zarnekow
e34bcf8a71
Merge pull request #1024 from eclipse/sz_classpath 
Make bin/main also the default output directory to avoid buildship confusion
 2019-02-11 08:49:30 +01:00
Christian Dietrich
dfe72b83c0 fixed some javadocs 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-10 22:25:11 +01:00
Sebastian Zarnekow
09c3ceac85 Make bin/main also the default output directory to avoid buildship confusion 2019-02-10 14:55:03 +01:00
Karsten Thoms
98a17c35da [eclipse/xtext#1274] Updated .classpath by Gradle 
Changes done by Buildship 3.0.1.v20181217-1554

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-07 17:03:45 +01:00
Sebastian Zarnekow
64e0edcb76 Bootstrap Xtext 2019-02-05 14:21:50 +01:00
Karsten Thoms
929b393e75 [#985] Make exception handling for validation code customizable 
Added AbstractDeclarativeValidator#handleExceptionDuringValidation to
allow overriding of the default exception handling behavior. Clients
especially may want to propagate or handle NPEs more decent than just
swallowing it.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-05 10:04:34 +01:00
Sebastian Zarnekow
f665cfa984
Merge pull request #984 from eclipse/kth_issue983 
[#983] Make issue message customizable
 2019-02-04 11:19:22 +01:00
Christian Dietrich
175d7bc975 set minimal mwe version to the one from oxygen 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-01 10:39:20 +01:00
qdagans
703bd62f09 427770: Improve ResourceSetBasedAllContainersStateProvider.getResourceSet 
Short:
    Implement solution mentioned in above BUG report.

Longer:
    Bug (?) can be triggered by e.g.:

    IResourceServiceProvider sp = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(fileUri);
    IResourceSetProvider provider = sp.get(IResourceSetProvider.class);
    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
    // ... file etc
    IProject project = file.getProject();
    // Use the provider to get the resource set for the given project
    // FIXME how to get the existing XtextResourceSet? Below just creates a new rs. :-(
    ResourceSet rs = provider.get(project);
    // ... run build to generate index used by namespace etc
    BuildRequest request = new BuildRequest();
    request.setResourceSet(rs);
    request.setBaseDir(UriUtil.createFolderURI(new File(baseDir)));
    request.setDirtyFiles(allFiles);
    // ... copy paste code ...
    indexState = incrementalBuilder.build(request, languages).getIndexState();

    Hints for doing this correctly/cleaner is highly appreciated!

    After the code above has been triggered doing a Project Clean will
    trigger method from title to be called with a CurrentDescriptions.

Note that this commit goes together with a commit in xtext-eclipse (see
fork).

Signed-off-by: Anders Dahlberg <anders.xb.dahlberg@ericsson.com>
 2019-01-24 16:45:47 +01:00
Sebastian Zarnekow
ecc7ae0bc3
[eclipse/xtext#1249] use bom for version management (#988) 2019-01-11 16:41:50 +01:00
Karsten Thoms
666779139d [#983] Make exception based diagnostic creation customizable 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-12-18 07:41:04 +01:00
Christian Dietrich
1b4f6c78a4 change version 2.16.0 -> 2.17.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-05 09:48:47 +01:00
Dennis Huebner
9a2696a017 Fixed typo 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-11-21 13:21:05 +01:00
Dennis Huebner
28d7c94ed5 [trace] Improved implementation for GeneratorNodeProcessor.Context 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-11-21 11:48:19 +01:00
Karsten Thoms
4b10068a79 [eclipse/xtext-eclipse#900] Use org.eclipse.xtend.typesystem.emf version 
2.2.0

Use latest from Oxygen TP

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-11-18 22:07:17 +01:00
Karsten Thoms
e6bd78ae7f
Merge pull request #963 from eclipse/kth_issue1168 
[eclipse/xtext#1168] Minimal target platform Oxygen.3a
 2018-11-17 09:59:45 +01:00
Karsten Thoms
37172c68dd [eclipse/xtext#1168] Minimal target platform Oxygen.3a 
Update lower bound version constraints on platform related bundles with
versions from an Oxygen.3a platform.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-11-14 17:27:50 +01:00
Karsten Thoms
6b522695c1 [#959] hasAnnotation: Add null guard 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-11-14 04:43:51 +01:00
Karsten Thoms
34c8c53468 Revert last commit 
Accidently pushed to master instead to bugfix branch

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-11-14 04:40:49 +01:00
Karsten Thoms
8e53832b18 [#959] hasAnnotation: Add null guard 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-11-14 04:36:54 +01:00
Sebastian Zarnekow
e8850a77ec Cleanup some warnings 2018-11-09 15:59:28 +01:00
Sebastian Zarnekow
5ddfcadce9 Improved JavaStringConverter after heavy benchmark session 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
fa00a330ac Base the STRINGValueConverter on the reusable new JavaStringConverter 2018-11-09 11:14:32 +01:00
Tamas Miklossy
50b0c5b3a9 Refactoring the JavaDoc Reference Support. 
- Add the computeEObjectReferencedInComment(XtextResource,
int) method to the IJavaDocTypeReferenceProvider interface.
- Add implementation to the MultiLineJavaDocTypeReferenceProvider class.

See also https://github.com/eclipse/xtext-xtend/issues/372

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2018-11-08 19:07:57 +01:00
Christian Dietrich
4af6181d2e review feedback 
- indentation
- make counter limit protected

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-07 12:40:21 +01:00
Christian Dietrich
b75cdd0970 [#844] Performance optimization for lazy linking cycle detection 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-05 11:51:53 +01:00
Christian Dietrich
9515372b39 [eclipse/xtext#1325] switch to ASM 7 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-31 12:51:25 +01:00
Kulla Christoph
c7e3deacd9 Fix race condition when getting the grammar (fixes #906) 
Signed-off-by: Kulla Christoph <christoph.kulla@de.bosch.com>
 2018-10-15 13:55:10 +02:00
Christian Dietrich
ac598a676d fixed javadoc 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-12 21:44:12 +02:00
Tamas Miklossy
2764048fe4 Fix a typo in the javadoc of the DefaultCommentAssociater class. 
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2018-10-05 16:09:22 +02:00
Karsten Thoms
2b7e2b4609 [eclipse/xtext#1272] Compile with Xtend 2.15 
Order of static & final modifiers changed
(eclipse/xtext-xtend#554)

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-21 17:45:41 +02:00
Karsten Thoms
cad7d13c31 Merge remote-tracking branch 'origin/release_2.15.0' into kth_merge_release 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>

# Conflicts:
#	gradle/versions.gradle
#	releng/pom.xml
 2018-09-16 07:59:59 +02:00
Karsten Thoms
72501e9af8 [trivial] Added whitespace 
if and catch keywords are usually followed by one space

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-16 07:52:36 +02:00
Sebastian Zarnekow
78a91474af Fixed another location with duplicated code 2018-09-16 00:24:30 +02:00
Tamas Miklossy
b0563c0947 Fix typo 'recordedErrros'->'recordedErrors' in CrossReferenceSerializer. 
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2018-09-14 13:57:51 +02:00
Christian Dietrich
2f0f093fb5 updated versions to 2.16.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-03 11:11:51 +02:00
Christian Dietrich
26a8247033
Merge pull request #848 from eclipse/cd_issue261_b 
[xtext/xtext-gradle-plugin#120] performance optimization java source lang
 2018-08-30 09:18:08 +02:00
Christian Dietrich
f3457dbe9e
Merge pull request #846 from eclipse/xtext-core-845-task-marker-collections 
[#845] Avoid creation of collections if not necessary.
 2018-08-29 18:57:03 +02:00
Arne Deutsch
e389e23880 [#845] Avoid creation of collections if not necessary. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-08-29 18:17:33 +02:00
Sebastian Zarnekow
f4f7607975 Refined solution to better match the other value converter messages 2018-08-29 17:10:59 +02:00
Sebastian Zarnekow
c9f659bf92 Merge branch 'wi_issue525' of git://github.com/waqasilyas/xtext-core into waqasilyas-wi_issue525 2018-08-29 17:06:44 +02:00
Christian Dietrich
1639c0a2b0
Merge pull request #839 from eclipse/cd_issue1266_asm62 
[eclipse/xtext#1266] Update to ASM 6.2
 2018-08-29 14:38:30 +02:00
Christian Dietrich
a2250de55e [eclipse/xtext#1266] Update to ASM 6.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-29 14:37:03 +02:00
Arne Deutsch
40333a7257 [eclipse/xtext-eclipse#809] Cache task marker pattern for performance 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-08-29 14:06:45 +02:00
Sebastian Zarnekow
39ad0d05a6 Added slightly more efficient way to create QualifiedNames 2018-08-28 23:46:38 +02:00
Sebastian Zarnekow
4da2fbf082 Refined API of DefaultDeclarativeQualifiedNameProvider 2018-08-28 17:26:43 +02:00
Sebastian Zarnekow
88ced22ef3 Performance tuning for the incremental builder 
Especially for projects with many files, the on-demand requested services
from the resource service provider are expensive. This reduces these attempts
by introducing intermediate data objects, making services a singleton or
using the known resource service provider that is available as a field on
XtextResource instances.
 2018-08-28 16:55:56 +02:00
Sebastian Zarnekow
6f2253cb3e Allow to circumvent the expensive copying of URI sets in the SourceLevelURIsAdapter 2018-08-28 16:54:22 +02:00
Sebastian Zarnekow
2c405104ff Made DefaultDeclarativeQualifiedNameProvider easier to customize 2018-08-28 16:49:37 +02:00
Titouan Vervack
2dbb39ebc0 Fixed typo in IQualifiedNameConverter 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-08-20 12:32:29 +02:00
Titouan Vervack
9010afb07f
Merge pull request #810 from eclipse/TargetURIConverter_non_ui 
Added TargetURIConverter to non UI
 2018-08-07 10:25:14 +02:00
Titouan Vervack
496fecef26 Added TargetURIConverter to non UI 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-08-07 10:21:23 +02:00
Christian Dietrich
06ab1b01ad [#221] Fixed Templats 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-08-06 10:00:40 +02:00
Akos Kitta
b0c664fd76 GH-798: Increased the visibility of the stateful incremental builder. 
Added `protected` setters for the build context and the request.
Replaced the context and request assignments with setter calls.

Closes #798.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
 2018-07-30 09:14:33 +02:00
Christian Dietrich
1e36a3b7c9 [#790] Search Check annotation only once 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-07-18 19:11:30 +02:00
Christian Dietrich
0277b89235 [eclipse/xtext#1231] fixed jdt and platform versions 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-07-03 19:24:04 +02:00
Christian Dietrich
58b683d085 [474468][eclipse/xtext-core#778] Fix bogus validation in MaxLineWidthDocument 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-06-27 20:32:06 +02:00
Titouan Vervack
08d59c6e4d Added equals to Task and TaskTag making TaskAssert useless 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-06-04 18:46:03 +02:00
Karsten Thoms
d627e9aad4
Merge pull request #754 from eclipse/develop_2.15.0 
[release] Increment version to 2.15.0
 2018-05-26 10:37:56 +02:00
Christian Dietrich
7b55d9b0d0
Merge pull request #752 from tivervac/taskTagsDuplicateKeys 
Fixed duplicate key insertion with task tags
 2018-05-24 21:25:50 +02:00
Titouan Vervack
b3717cc478 Fixed typo in EObjectDiagnosticImpl 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-05-24 18:41:15 +02:00
Titouan Vervack
e91be2aee3 Fixed duplicate key insertion with task tags 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-05-24 18:29:38 +02:00
Karsten Thoms
7dcc65bb2e [release] Increment version to 2.15.0 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-22 23:53:44 +02:00
Jan Koehnlein
42dda5e9d3 [serializer] relax API 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2018-05-22 14:45:09 +02:00
Moritz Eysholdt
42be5d030d fixes #739: Potential NPE during ChangeSerialization 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-05-17 16:39:37 +02:00
Karsten Thoms
81ceecd9ff Update copyright 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-05-15 06:10:10 +02:00
Christian Dietrich
be7a958127 [#716] [LSP] Problems for a deleted file are shown after deletion 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-25 14:29:38 +02:00
Christian Dietrich
de25d13970 [eclipse/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-23 13:01:11 +02:00
Christian Dietrich
497b70425c added missing since 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-04-20 18:52:22 +02:00
Christian Dietrich
ef9817b9a8
Merge pull request #696 from ArneDeutsch/xtext-eclipse-599 
[eclipse/xtext-eclipse#599] Support waiting operation.
 2018-04-20 18:49:24 +02:00
Arne Deutsch
693c7e420c [eclipse/xtext#1177] Update ASM to 6.1.1 and JDT Core to 3.13.102. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-17 07:37:44 +02:00
Arne Deutsch
f826570410 [eclipse/xtext-eclipse#599] Support waiting operation. 
ActiveAnnotationProcessors might run in parallel. Read operations should
wait until all write operations are ready to avoid race conditions.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-04-11 13:39:59 +02:00
Moritz Eysholdt
5804e8b6bc Fix eclipse/xtext-xtend#408: Allow mismatching node model 
Because quick fixes change the model and can cause any kind of mismatch

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-04-05 17:10:21 +02:00
Titouan Vervack
4f702ddc7a Added throw keyword to Throwables.propagate 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-30 11:58:41 +02:00
Titouan Vervack
57af220521 Fixed guava compatibility issue 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-29 18:26:41 +02:00
Titouan Vervack
0ea85189c8 Fixed warnings 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-29 18:18:18 +02:00
Christian Dietrich
6e23809dee reduced warnings 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-03-29 14:36:26 +02:00
Holger Schill
e75a44c254
Merge pull request #680 from eclipse/hs/ValidationFragment2_configurableIssue 
Hs/validation fragment2 configurable issue
 2018-03-29 13:12:15 +02:00
Holger Schill
2e99cff76d #664 [Grammar] Add Support for more Annotations 
Signed-off-by: Holger Schill <Holger.Schill@itemis.de>
 2018-03-29 11:14:39 +02:00
Christian Dietrich
14fd588a2d
Merge pull request #679 from tivervac/redundant_modifier 
Removed redundant modifiers
 2018-03-28 18:57:08 +02:00
Holger Schill
026df8e630 Make multiple annotations on enum rule possible 
Add validations to see if Annotation works on the rule in the grammar
Add configurable issue for @Deprecate Annotation
 2018-03-28 18:03:29 +02:00
Titouan Vervack
127fa42d17 Removed redundant modifiers 
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
 2018-03-28 17:41:41 +02:00
Arne Deutsch
89baed80ba [eclipse/xtext-eclipse#616] Reverse of empty is empty again, not null. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-03-27 15:33:12 +02:00
Holger Schill
47effb3ff1 Allow multiple annotations on Terminal but restrict it to a well defined set. 2018-03-26 16:15:53 +02:00
Holger Schill
70886d54a5 Make ResourceDesecriptionStrategyFragment and ValidationFragment more configurable 2018-03-26 12:40:19 +02:00
Holger Schill
8893b09e57 GrammarAnnotations: @Deprecated Annotation and corresponding tests 2018-03-22 14:40:23 +01:00
Holger Schill
fafdce378e Merge branch 'master' into grammarannotations 2018-03-22 11:17:31 +01:00
Holger Schill
2bfe5fb64b Allow multiple Annotations on ParserRules 2018-03-22 11:12:08 +01:00
Sebastian Zarnekow
7da28520af
Merge pull request #663 from eclipse/sz/bug361216 
[361216] Improved logic that registers scope wrappers
 2018-03-21 18:48:14 +01:00
Christian Dietrich
4b0d37e1aa
Merge pull request #659 from ArneDeutsch/recursive-emf 
[#449] Avoid stack overflow with deep EMF containment trees.
 2018-03-21 18:45:30 +01:00
Sebastian Zarnekow
9adf2d94ed [361216] Improved logic that registeres scope wrappers 2018-03-21 17:13:06 +01:00
Arne Deutsch
e90230f1b1 [#476] Support EMF's ResourceLocators in XtextResourceSet. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-03-21 15:40:22 +01:00
Arne Deutsch
3ecaa1a493 [#449] Avoid stack overflow with deep EMF containment trees. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-03-21 14:22:01 +01:00
Holger Schill
04e0375fec Introduce Final Annotation on ParserRules and corresponding test 2018-03-20 16:57:28 +01:00
Moritz Eysholdt
cfb627da1e [hidden regions] Code Cleanup 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-03-05 17:16:54 +01:00
Karsten Thoms
4fea27469a
Merge pull request #651 from eclipse/kth_qn_startwith_null 
startsWith: return false for null argument
 2018-03-05 14:36:29 +01:00
Karsten Thoms
2e534b5246 startsWith: check that prefix is not null 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-03-05 11:41:44 +01:00
Moritz Eysholdt
43b7d1df8c Handle comments and whitespace properly in rewrite scenarios 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2018-03-04 19:41:46 +01:00
Christian Dietrich
58113d0f41 Regenerated against lastest xbase-lib 
https://github.com/eclipse/xtext/issues/1174

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-02-26 15:07:09 +01:00
Christian Dietrich
1a86a763fb maintained x-friends https://github.com/eclipse/xtext/issues/1173 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-02-26 12:39:26 +01:00
Christian Dietrich
7ab31042c8 maintained x-friends https://github.com/eclipse/xtext/issues/1173 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-02-23 15:57:53 +01:00
Karsten Thoms
77c13da27d
Merge pull request #634 from kthoms/kth_Reader_mwe2doc 
[doc] Added MWE2 usage example
 2018-02-13 23:19:54 +01:00
Karsten Thoms
5316f0c66c
Merge pull request #635 from TraneSlink/doc 
Print mwe2 syntax in error message
 2018-02-13 23:19:09 +01:00
Karsten Thoms
1ea9596739 [doc] Added MWE2 usage example 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-02-08 22:35:27 +01:00
René Purrio
f760c53548 Print mwe2 syntax in error message 
Signed-off-by: René Purrio <rpurrio@itemis.de>
 2018-02-08 16:52:16 +01:00
Karsten Thoms
4bdb317e10 Return empty list instead of null 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-02-08 16:26:12 +01:00
Christian Dietrich
26e06d1f26 implemented review feedback 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-26 11:43:48 +01:00
Christian Dietrich
26d6870c88 [#550] Cache AbstractInternalAntlrParser.createAllRules 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-26 10:08:02 +01:00
Christian Dietrich
5292c344c6
Merge pull request #613 from eclipse/cd_issue611 
[#611] Fixed broken/outdated javadoc
 2018-01-23 07:17:37 +01:00
Karsten Thoms
809377cd27 [420984] Compiler optimization: Suppress creation of unused exception variable 
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-16 14:54:22 +01:00
Karsten Thoms
90cef27ab4 [eclipse/xtext#1160] Update copyright date range 
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-16 09:11:22 +01:00
Karsten Thoms
134c788006 [eclipse/xtext#1160] Update copyright date range 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-15 16:28:39 +01:00
Christian Dietrich
d1d596d64b [#611] Fixed broken/outdated javadoc 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-15 13:26:35 +01:00
Arne Deutsch
7b1bb9d188 [eclipse/xtext-eclipse#145] Create new implementations in core. 
Move implementation from CopyQualifiedNameService and
DefaultCopyQualifiedNameService to xtext core plugin.

Rename CopyQualifiedNameService to ICopyQualifiedNameService.

Document the interface.

Move to public API package "org.eclipse.xtext.naming".

Change-Id: I3ffdbbcda641cc4f70396f4274e42934e4248278
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-01-11 09:56:49 +01:00
Florian Stolte
3a740a437e [eclipse/xtext#1155] Cleaned up javadoc to remove some warnings. 
Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-19 12:04:05 +01:00
Karsten Thoms
d5e6578a6d
Merge pull request #588 from FStolte/issue1152 
[eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
 2017-12-18 10:04:26 +01:00
Florian Stolte
1bc930b5b6 [eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header 
- added header to existing manifest files
- added header to manifest generation in xtext generator and wizard

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-14 14:16:20 +01:00
Christian Dietrich
c3893bc200 Duplicate @Named ids in AbstractMultiLineCommentProvider https://github.com/eclipse/xtext/issues/1153 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-14 13:34:46 +01:00
Christian Dietrich
c7ab2c7b32
Merge pull request #578 from FStolte/issue570 
[#570] Added error message for invalid override
 2017-12-13 12:39:30 +01:00
Florian Stolte
6b9d505b07 [#570] Added error message for invalid override. 
- rules with an @Override annotation in a grammar without super grammar
now correctly display an error

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-13 12:23:06 +01:00
Florian Stolte
9d6f9434a1 Fixed a typo in XtextValidator. 
Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-12-13 10:53:40 +01:00
Christian Dietrich
1894da8a38 made code of resource storage facade more consistent 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-12 16:32:33 +01:00
Jan Koehnlein
9e4087bf5b GH-520 more tests for live scoping 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-12-06 08:51:30 +01:00
Jan Koehnlein
2c0b77541a [cleanup] various typos 2017-12-05 20:56:55 +01:00
Jan Koehnlein
15b13a279d GH-520 allow shadowed resource descriptions in language server scenario 2017-12-05 20:56:55 +01:00
Sebastian Zarnekow
c4b4c8e4a9
Merge pull request #565 from eclipse/sz_stableSyntacticSequencerOrder 
Make generated code in syntactic sequence more stable
 2017-12-01 19:23:26 +01:00
Sebastian Zarnekow
e48a062d2b Make generated code in syntactic sequence more stable 2017-12-01 12:41:32 +01:00
Christian Dietrich
3b4910adae more review feedback 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-01 11:38:35 +01:00
Christian Dietrich
d9e4a5d265 more review feedback 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-01 11:37:27 +01:00
Christian Dietrich
bb9b15316b implemented review feedback 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-01 11:11:13 +01:00
Christian Dietrich
6997cb0697 [tracing] NPE thrown when a file is generated without traces https://github.com/eclipse/xtext-core/issues/359 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-01 09:54:43 +01:00
Christian Dietrich
67a36a5b64
Merge pull request #563 from eclipse/cd_core_issue544 
moved 'copy java problems' configurable issue code to xtext core
 2017-11-30 10:35:59 +01:00
Christian Dietrich
94a43ed825 moved 'copy java problems' configurable issue code to xtext core https://github.com/eclipse/xtext-core/issues/544 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-30 10:07:19 +01:00
Karsten Thoms
f3d2655cab Refactoring & additional tests 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-11-29 16:35:30 +01:00
Karsten Thoms
e3baf9ede5 [refactoring] formatting 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-11-29 08:57:38 +01:00
Florian Stolte
c322f3e73a [#556] Added test for TextRegionsToString::quote 
Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-11-22 16:55:51 +01:00
Florian Stolte
22820aac32 [#555] Fix for issue. 
Since windows line endings are replaced by unix line endings - i.e. the
"\r" character is removed -, the result string can be shorter than the
input string.
Since the loop iterating over the characters of the input string is
limited to "maxLength + 1" iterations, the check "result.size() >
maxLength" did not give the desired result in the presence of windows
line endings.

Now, the number of iterations is incremented when a character is deleted
from the string.


Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-11-22 14:04:02 +01:00
Karsten Thoms
07b182918c
Merge pull request #529 from eclipse/me/newline_fix 
Fixed #460: Test failure on Windows due to CarriageReturn char
 2017-11-22 12:17:49 +01:00
Karsten Thoms
c22e0bb047
Merge pull request #549 from FStolte/refactoring 
Refactoring: Cleaning up warnings
 2017-11-15 17:32:25 +01:00
Florian Stolte
2a503da006 Refactoring: Cleaning up warnings. 
Removed four unused imports and one unused local variable declaration.

Signed-off-by: Florian Stolte <fstolte@itemis.de>
 2017-11-15 15:54:57 +01:00
fstolte
88fdbc819f [#537] Added null guards. 
Added null guards to all relevant public methods of the Serializer
class.

Signed-off-by: fstolte <fstolte@itemis.de>
 2017-11-15 11:33:50 +01:00
Christian Dietrich
dfa56bfc2e fixed formatting of annotations (e.g. @Override) in Xtext Grammars #534 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-08 22:29:43 +01:00
Christian Dietrich
84533e40f1 fixed formatting of annotations (e.g. @Override) in Xtext Grammars #534 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-08 22:16:22 +01:00
Moritz Eysholdt
f41d82c540 Fixed #460: Test failure on Windows due to CarriageReturn char 2017-11-08 08:48:31 +01:00
Waqas Ilyas
b8d1aa0294 Fix for #525: Detect incomplete escape sequences 
Signed-off-by: Waqas Ilyas <waqas.ilyas@gmail.com>
 2017-11-05 03:21:42 -06:00
Christian Dietrich
4960af9c0a set version to 2.14 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-27 09:03:34 +02:00
Moritz Eysholdt
ee2d61b332 [textRegionAccess] grammar elements may be TerminalRules 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-18 19:54:34 +02:00
Christian Dietrich
5f2b37de0f widened version range for asm to include version 6 https://github.com/eclipse/xtext-core/issues/501 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-13 10:32:42 +02:00
Moritz Eysholdt
5c293fb6c4 Made another value converter null-safe 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-12 09:50:46 +02:00
Moritz Eysholdt
d68ca48a55 Fix an NPE during ValueConversion of xtext.xtext.GrammarID 
java.lang.NullPointerException: null
	at
org.eclipse.xtext.xtext.XtextValueConverters$1.internalToValue(XtextValueConverters.java:44)
	at
org.eclipse.xtext.xtext.XtextValueConverters$1.internalToValue(XtextValueConverters.java:40)
	at
org.eclipse.xtext.conversion.impl.AbstractNullSafeConverter.toValue(AbstractNullSafeConverter.java:31)
	at
org.eclipse.xtext.conversion.impl.AbstractDeclarativeValueConverterService.toValue(AbstractDeclarativeValueConverterService.java:79)
	at
org.eclipse.xtext.ide.serializer.impl.ReferenceUpdater.getQualifiedName(ReferenceUpdater.java:124)
	at
org.eclipse.xtext.ide.serializer.impl.ReferenceUpdater.needsUpdating(ReferenceUpdater.java:146)
	at
org.eclipse.xtext.ide.serializer.impl.ReferenceUpdater.update(ReferenceUpdater.java:172)
	at
org.eclipse.xtext.ide.serializer.impl.RecordingXtextResourceUpdater.applyChange(RecordingXtextResourceUpdater.java:70)
	at
org.eclipse.xtext.ide.serializer.impl.ChangeSerializer.endRecordChanges(ChangeSerializer.java:136)
	at
org.eclipse.xtext.ide.serializer.impl.ChangeSerializer.applyModifications(ChangeSerializer.java:75)
	at
org.eclipse.xtext.ui.editor.quickfix.WorkbenchMarkerResolutionAdapter$1.lambda$1(WorkbenchMarkerResolutionAdapter.java:131)
	at java.util.LinkedHashMap.forEach(LinkedHashMap.java:684)
	at
org.eclipse.xtext.ui.editor.quickfix.WorkbenchMarkerResolutionAdapter$1.execute(WorkbenchMarkerResolutionAdapter.java:139)
	at
org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106)
	at
org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2313)
	at
org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118)
	at
org.eclipse.xtext.ui.editor.quickfix.WorkbenchMarkerResolutionAdapter.run(WorkbenchMarkerResolutionAdapter.java:142)
	at
org.eclipse.xtext.xtext.ui.editor.quickfix.XtextGrammarQuickfixProviderTest.assertAndApplyAllResolutions(XtextGrammarQuickfixProviderTest.java:172)
	at
org.eclipse.xtext.xtext.ui.editor.quickfix.XtextGrammarQuickfixProviderTest.testFixAllEmptyEnumLiteral(XtextGrammarQuickfixProviderTest.java:106)

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-11 19:02:45 +02:00
Moritz Eysholdt
85f07a23c0 [textRegionAccess] make accessing EStructuralFeatures easier 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-10-11 14:54:40 +02:00
Christian Dietrich
81df41e85b removed unused imports 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-05 08:26:22 +02:00
Jan Koehnlein
08ab8fe119 GH-488 fixed DefaultReferenceDescription test 
We need the fragment path URIs in the renam scenario only

Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-10-02 20:56:19 +02:00
Jan Koehnlein
dd3513b8a9 [refactoring] Fixes in core for https://github.com/eclipse/xtext-eclipse/issues/284 
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
 2017-10-02 18:08:52 +02:00
Christian Dietrich
abc098556c Merge pull request #484 from tkutz/tku_templateNodeWhitespace 
#483: Remove last whitespaces only when appending separator in for-loops
 2017-10-01 21:26:50 +02:00
Knut Wannheden
ea7e45a602 #481: Improve performance of ResourceStorageLoadable 
Wrap ZipInputStream in a BufferedInputStream before reading from it with
with a DataInputStream or ObjectInputStream. This improves performance
quite significantly (overall roughly by a factor 4), as the
decompression works much more efficiently with larger chunks of data.

Signed-off-by: Knut Wannheden <knut.wannheden@paranor.ch>
 2017-10-01 21:23:32 +02:00
Thomas Kutz
0b74443d41 [#483] Append trailing whitespaces and newlines after appending separator in for-loops 
Signed-off-by: Thomas Kutz <thomas.kutz@itemis.de>
 2017-09-29 13:40:36 +02:00
Moritz Eysholdt
c1014a0972 [formatter/perf] Avoid calling List.newArrayList() during autowrap 
To navigate the TextReplacers in reverse order, this change introduces a
reversed iterable. Thus, it is no longer necessary to copy all the 
TextReplacers into a list for reverse navigation.


Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-09-27 19:42:42 +02:00
Christian Dietrich
b71f866eb3 [Tracing] Allow to specify UseForDebugging #467 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-22 13:25:42 +02:00
Sven Efftinge
11c084dc5e GH-73 Replaced the string replace with URI factory to fix the authority. 
Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
 2017-09-13 17:24:57 +02:00
Moritz Eysholdt
846e686bd7 [formatter] improved comment handling in undefined regions 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-09-12 09:18:26 +02:00
Sebastian Zarnekow
278a115708 Merge pull request #404 from eclipse/sz_gh341 
Problem with content assist and grammar fragments
 2017-09-06 14:29:14 +02:00
Christian Dietrich
d8a45bcfe2 fixed wrong import 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-06 10:41:45 +02:00
Christian Dietrich
7b2e23b94e [479137]improved Misleading error message 'Cannot create datatype' for terminal rule #91 
- added test
- fixed broken test framework
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-09-06 09:34:28 +02:00
Sebastian Zarnekow
7be950d6a2 Merge branch 'master' into sz_gh341 2017-09-05 23:11:22 +02:00
Sebastian Zarnekow
1c5b2b0320 Merge pull request #366 from eclipse/sz_bug476690 
Refined token placement for indentation based languages
 2017-09-05 23:02:36 +02:00
Karsten Thoms
077b26c5ca [formatting] removed obsolete tab 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-08-24 16:05:23 +02:00
Dennis Huebner
87e7b088e3 Merge pull request #354 from yanntm/master 
remove greedy flags from critical dependency paths
 2017-08-24 08:59:32 +02:00
Moritz Eysholdt
8ff6017c62 [ChangeSerializer] improved toString() 2017-08-23 18:27:51 +02:00
Moritz Eysholdt
6a55da1434 [TextRegionDiffBuilder] improved handling of multi-inserts 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-23 17:31:59 +02:00
Moritz Eysholdt
ae9d0259ef fixed #438: error in ITextRegionAccess.regionForLineAtOffset(int) 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-21 19:25:51 +02:00
Moritz Eysholdt
353cdac76e make AbstractEObjectRegion.addChild(IAstRegion) public 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-21 10:16:53 +02:00
Moritz Eysholdt
b304d5e921 [ChangeSerializer] improve handling of multiple deleted regions 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-20 20:10:02 +02:00
Moritz Eysholdt
b913ac015f [TextRegionAccess] Allow usage on mutable EMF models 
This includes the possibility that an EObject has been removed from the
EMF containment tree or moved to another resource.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-20 20:10:02 +02:00
Moritz Eysholdt
fcdd7c4011 [TextRegionAccess] keep track of containment among EObjectRegions 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-18 11:24:29 +02:00
Moritz Eysholdt
80f8bca39f [debug] also visualize changes that only change URIs but not text 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-08-16 18:09:20 +02:00