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

6766 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastian Zarnekow
e376e522fc
Merge pull request #1017 from eclipse/sz_improvedLexerSplitting 
Improved lexer splitting
 2019-02-06 10:58:45 +01:00
Sebastian Zarnekow
4ca8b7e08f Updated test expectation 2019-02-05 23:55:07 +01:00
Sebastian Zarnekow
cb8a9aa96b Incorporated review feedback 2019-02-05 14:33:49 +01:00
Sebastian Zarnekow
64e0edcb76 Bootstrap Xtext 2019-02-05 14:21:50 +01:00
Sebastian Zarnekow
c1c208e971 Regenerate test langs 2019-02-05 14:20:02 +01:00
Sebastian Zarnekow
56d43cdc6a Allow to pass eclipse dir since it's not always simply relative to the core dir 2019-02-05 14:14:54 +01:00
Sebastian Zarnekow
6e243524dc Also extract the dfa string array into an own static inner class 2019-02-05 14:14:32 +01:00
Karsten Thoms
ed9822833e
Merge pull request #986 from eclipse/kth_issue985 
[#985] Make swallowing of NPEs in validation code configurable
 2019-02-05 10:05:03 +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
Karsten Thoms
6f86c146f7
Merge pull request #1016 from eclipse/kt_bom_encoding 
Set sourceEncoding ISO-8859-1
 2019-02-04 19:18:56 +01:00
Karsten Thoms
a6faa2dff0 Set sourceEncoding ISO-8859-1 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-04 17:31:06 +01:00
Christian Dietrich
22afec172c
Merge pull request #1015 from eclipse/cd_guava21mf 
[eclipse/xtext#1391] pin guava version to 21
 2019-02-04 12:00:41 +01:00
Christian Dietrich
640e11f60c [eclipse/xtext#1391] pin guava version to 21 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-04 11:48:42 +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
Arne Deutsch
2e89ec4e80
Merge pull request #1014 from eclipse/ade-fix-ui-tests 
Fix ui tests
 2019-02-04 10:11:12 +01:00
Arne Deutsch
cad1c87268 itemis/xtext-reference-projects#36: Fix version constraint. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-04 09:54:19 +01:00
Arne Deutsch
1a888f1923 Revert "itemis/xtext-reference-projects#36: Fix version constraint." 
This reverts commit 311068fe82.
 2019-02-04 09:52:20 +01:00
Arne Deutsch
311068fe82 itemis/xtext-reference-projects#36: Fix version constraint. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-04 09:48:32 +01:00
Christian Dietrich
1e0cc3d941
Merge pull request #1013 from eclipse/cd_bump_grgit 
bump grgit
 2019-02-02 10:36:09 +01:00
Christian Dietrich
3c1d095530 bump grgit 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-02 09:37:41 +01:00
Christian Dietrich
9ca2282d3a
Merge pull request #1012 from eclipse/cd_mweManifests 
set minimal mwe version to the one from oxygen
 2019-02-01 13:34:01 +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
Jelle Schuhmacher
86dfd39e94 ... and don't forget to return the result 
Signed-off-by: Jelle Schuhmacher <jelle.schuhmacher@altran.com>
 2019-02-01 08:06:59 +01:00
Sebastian Zarnekow
4a231019ae
Fixed javadoc (#1011) 2019-01-31 16:47:41 +01:00
Sebastian Zarnekow
68545d3721
Added RepeatedTest annotation to xtext.testing (#1010) 
Added utility to run Junit 4 tests in a loop to tackle flaky tests
 2019-01-31 15:58:28 +01:00
Christian Dietrich
81f3ebd5ed no https 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-30 15:03:52 +01:00
Christian Dietrich
920374354e
Merge pull request #1007 from eclipse/cd_mwe210M2 
[eclipse/xtext#1283] update to MWE 2.10 M2
 2019-01-30 14:54:51 +01:00
Jelle Schuhmacher
b40ce61068 ... also invoke super ResourceDescriptionStrategy 
Oops

Signed-off-by: Jelle Schuhmacher <jelle.schuhmacher@altran.com>
 2019-01-30 12:17:43 +01:00
Jelle Schuhmacher
2ef95c9623 Make ResourceDescriptionStrategyFragment aware of super grammars 
such that the @Exported annotations of any supergrammars are used as
well, making it behave like the ValidatorFragment2.

Signed-off-by: Jelle Schuhmacher <jelle.schuhmacher@altran.com>
 2019-01-30 11:50:01 +01:00
Christian Dietrich
63e99b9e11 [eclipse/xtext#1283] update to MWE 2.10 M2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-30 07:07:46 +01:00
Karsten Thoms
cc6ab5469f
Merge pull request #1006 from eclipse/kt_issue1009 
[#1009] Remove managed dependencies from build descriptors
 2019-01-29 17:23:58 +01:00
Karsten Thoms
3017efb3f6 [#1009] Remove managed dependencies from build descriptors 
- removed managed versions of
  - org.eclipse.emf.mwe2.launch
  - xtext-antlr-generator
  - org.junit:junit
  - org.junit.jupiter.api
  - xtext-dev-bom
- updated test expectation
- GradleBuildFile: Use single quoted dependencies for managed
dependencies (where version is null)
- added xtext-antlr-generator as optional dependency to Maven runtime
module. This avoids download of antlr-generator-3.2.0-patch.jar from
itemis server.
- XtextVersion: pin xtext-antlr-version to 2.1.1. Still needed for Tycho
based build for configuration of exec-maven-plugin.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-29 15:33:09 +01:00
Christian Dietrich
e7002113d2
Merge pull request #1002 from AndersDala/patch 
Improve ResourceSetBasedAllContainersStateProvider.getResourc…
 2019-01-28 19:16:52 +01:00
Christian Dietrich
fdf0d9e55c
Merge pull request #1000 from eclipse/cd_java11 
[eclipse/xtext#1182] added support for java 11 as target
 2019-01-28 09:18:23 +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
Christian Dietrich
e654364f73 [eclipse/xtext#1182] added support for java 11 as target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-22 21:55:07 +01:00
Christian Dietrich
4222ab8501
Merge pull request #998 from eclipse/cd_fixGuavaDeprecations 
fixed guava deprecations
 2019-01-20 15:14:24 +01:00
Christian Dietrich
d649ead3c8 fixed guava deprecations 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-20 12:20:42 +01:00
Christian Dietrich
a9ffe46cd6
Merge pull request #987 from eclipse/cd_xtext_issue1372 
[eclipse/xtext#1372] Use 2019-03 in target platforms
 2019-01-18 17:16:26 +01:00
Christian Dietrich
dec5c39745
Merge pull request #976 from eclipse/cd_issue971 
[#971] make junit5 support api
 2019-01-18 12:05:46 +01:00
Holger Schill
1fa8b6262e
Merge pull request #995 from eclipse/hs_web_update 
Update WebFragment, Wizard and tests to use latest versions of web fr…
 2019-01-17 18:04:32 +01:00
Christian Dietrich
eb3adc4c31
Merge pull request #996 from eclipse/miklossy_issue1330 
[https://github.com/eclipse/xtext/issues/1330] Update developers section
 2019-01-17 12:41:20 +01:00
Tamas Miklossy
9251c96901 [https://github.com/eclipse/xtext/issues/1330] Update developers section 
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
 2019-01-17 12:16:31 +01:00
Karsten Thoms
596a8b368e
Merge pull request #990 from eclipse/bootstrap_2.17.0.M1 
[eclipse/xtext#1382] Bootstrap against 2.17.0.M1
 2019-01-17 11:42:30 +01:00
Holger Schill
771eb06607 Update WebFragment, Wizard and tests to use latest versions of web frameworks 2019-01-17 11:03:38 +01:00
Karsten Thoms
2ad19ab6cd
Merge pull request #994 from eclipse/issue1249_native_bom 
Native Gradle BOM & drop of maven-deployment.gradle
 2019-01-16 15:10:30 +01:00
Karsten Thoms
501571bd3c [eclipse/xtext-core#991, eclipse/xtext#1249] Update test expectation 
Native usage of Maven BOM
Drop generation of maven-deployment.gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 15:09:18 +01:00
Christian Dietrich
7a147629b9
Merge pull request #992 from eclipse/cd_issue981 
made args4j non optional
 2019-01-16 15:04:26 +01:00
Karsten Thoms
c5687f17bb [eclipse/xtext-core#991] Dropped generation of maven-deployment.gradle 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 13:59:12 +01:00
Christian Dietrich
8a2d7a12bb made args4j non optional 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-16 12:24:21 +01:00