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
6796 commits 41 branches 98 tags 41 MiB
Commit graph

503 commits

Author SHA1 Message Date
cwehrheim
8d835bc5fd [bug#489904] Fix partial formatting on single line 
If a DSL file is only partially formatted it is possible that the
ITextReplacement is not fully contained in an allowed ITextRegion but
they overlap.

Modified method 'TextReplacerContext.isInRequestedRange(...)' to not
only check for containment but also for intersection. To check for
intersection a private method
'TextReplacerContext.doIntersect(...)' was added.

Added PartialFormattingTest test case and formatter
described in the bug.

Signed-off-by: Christian Wehrheim <christian.wehrheim@itemis.de>
Also-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-04-05 13:16:22 +02:00
Sebastian Zarnekow
9f1b16b6a4 Fixed regression in injector provider 2019-04-04 21:50:57 +02:00
Sebastian Zarnekow
7a41472fa1
Merge pull request #1112 from eclipse/sz_issue734 
[xtext-xtend#734] Fixed restore logic of runtime injector providers
 2019-04-04 17:41:26 +02:00
Arne Deutsch
f4ae741588 [eclipse/xtext-extras#406] Fix missing newline, add test. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-04-04 17:08:28 +02:00
Sebastian Zarnekow
e9630d16c8 Updated more manually written injector providers 2019-04-04 15:43:13 +02:00
Sebastian Zarnekow
4523b55a51 Regenerated testlanguages 2019-04-04 14:34:09 +02:00
Christian Dietrich
35f9e08f60
Merge pull request #1109 from eclipse/kt_issue1076 
[#1076] Remove BOM managed versions
 2019-04-02 22:12:04 +02:00
Karsten Thoms
41349aea38 [#1076] Remove BOM managed versions 
Dependency versions are obsolete since they are managed by the BOM.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-04-02 16:49:01 +02:00
Sebastian Zarnekow
b552ddb354 Replace jcenter by mavenCentral to avoid sync delays and stability issues 2019-04-02 11:34:42 +02:00
Holger Schill
1d5aa77f39
Merge pull request #1101 from eclipse/removeIdea 
Remove idea
 2019-04-02 08:50:04 +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
Christian Dietrich
79f50cb780 [eclipse/xtext#1423] [Wizard] Update Gradle Wrapper to Version 5.3.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-28 17:56:18 +01:00
Christian Dietrich
d4e59eff93
Merge pull request #1096 from pjeanjean/master 
Unit test for #1093
 2019-03-26 23:14:34 +01:00
RhiobeT
1143b119dc Set tests to ignore 
Signed-off-by: Pierre Jeanjean <rhiobet@gmail.com>
 2019-03-26 20:38:59 +01:00
RhiobeT
bdaf4dbcfd Add unit test for eclipse/xtext-core#1093 
Signed-off-by: Pierre Jeanjean <rhiobet@gmail.com>
 2019-03-26 20:28:10 +01:00
Christian Dietrich
f8bc4f5c69 use https in target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-26 19:59:45 +01:00
Lorenzo Bettini
5de819ed4e 1087: updated CliWizardIntegrationTest expectations 
Task-Url: https://github.com/eclipse/xtext-core/issues/1087
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2019-03-22 16:22:52 +01:00
Lorenzo Bettini
0008f203e9 1087: no tycho.testArgLine --add-modules=ALL-SYSTEM in test POM 
It's already handled in the generated parent POM

Task-Url: https://github.com/eclipse/xtext-core/issues/1087
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2019-03-22 16:12:36 +01:00
Christian Dietrich
c37880f199 [eclipse/xtext#1412] build against 2019-06 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-21 12:53:51 +01:00
Christian Dietrich
7b10a1d293 fixed warnings 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-19 09:31:47 +01:00
Christian Dietrich
0e7f803e2b [#1077] update to gson 2.8.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-14 21:36:09 +01:00
Christian Dietrich
cd1137eee3 [#1066] get rid of org.eclipse.xtext.ecore.EcoreSupport again 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-12 20:15:14 +01:00
Christian Dietrich
8e274f3daf
Merge pull request #1037 from eclipse/cd_bug544435 
[544435] fixed issue with serializer and groups in non terminal rules
 2019-03-08 09:01:27 +01:00
Christian Dietrich
d482c3ad8a use orbit 2019-06 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-06 20:35:59 +01:00
Christian Dietrich
48ac48df2b [544435] fixed issue with serializer and groups in non terminal rules 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-06 09:30:06 +01:00
Christian Dietrich
9b38d565e0 [eclipse/xtext-core#1059] updated to lsp4j 0.7.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-05 20:09:10 +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
6e242384cb
Merge pull request #1052 from eclipse/sz_fixInjectorProvider 
[xtext-xtend#734] Make injection of the CompositeEValidator work
 2019-03-02 14:15:51 +01:00
Christian Dietrich
4982e56d33 [#1053] Wizard: Bump Xtext-Gradle-Plugin to latest (2.0.4) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-02 10:36:47 +01:00
Sebastian Zarnekow
edeb506431 Make injection of the CompositeEValidator work 2019-02-26 18:29:10 +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
Arne Deutsch
415beaeb80 [#1038] Filter bad entries when read in MANIFEST. 
Filter all entries from "Require-Bundle", "Export-Package" and
"Import-Package" entries that are empty to fix manifest files that are
invalid in this regard.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-18 12:37:36 +01:00
Christian Dietrich
2e9195b994
Merge pull request #1025 from eclipse/cd_gradle521 
[eclipse/xtext#1393] update to gradle 5.2.1
 2019-02-14 19:18:20 +01:00
Karsten Thoms
7823e915a9
Merge pull request #1028 from eclipse/cd_mwe210wizard 
[eclipse/xtext#1283] switched to MWE 2.10 in wizard
 2019-02-13 15:05:30 +01:00
Arne Deutsch
86f6342354
Merge pull request #1027 from eclipse/ade-mergable-manifest-xtend 
#1018 Maintain existing formatting.
 2019-02-12 09:46:32 +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
Christian Dietrich
1587bcb542 [eclipse/xtext#1283] switched to MWE 2.10 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-11 09:17:58 +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
Christian Dietrich
cef06991c2 [eclipse/xtext#1393][Wizard] update to gradle 5.2.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-09 11:47:11 +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
Arne Deutsch
8d34e55e11 #1018 Maintain existing formatting. 
To avoid reformatting we maintain the separators (e.g. line breaks) with
the entries (e.g. inside the required bundles entry).

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-07 12:23:49 +01:00
Sebastian Zarnekow
4ca8b7e08f Updated test expectation 2019-02-05 23:55:07 +01:00
Sebastian Zarnekow
c1c208e971 Regenerate test langs 2019-02-05 14:20:02 +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
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
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
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
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
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