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

6467 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karsten Thoms
714f4f5377 [eclipse/xtext#1272] Set Xtext bootstrap 2.15 
Refactored to use xtext_bootstrap property from versions.gradle
Changed target definition.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-23 15:10:29 +02:00
Dennis Huebner
08d44e52a3
Merge pull request #875 from eclipse/dh-CA_additionalEdits 
Handle ContentAssistEntry.getTextReplacements in ContentAssistService
 2018-09-19 15:36:45 +02:00
Dennis Huebner
7fe6ddcc4c Handle ContentAssistEntry.getTextReplacements in ContentAssistService 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-09-19 14:34:51 +02:00
Dennis Huebner
ceb5c86df8
Merge pull request #874 from eclipse/dh-ide-tests 
CodeAction as real CodeAction. Example and Test.
 2018-09-19 12:14:45 +02:00
Dennis Huebner
793acb0aa9 CodeAction as real CodeAction. Example and Test. 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
 2018-09-19 11:08:53 +02:00
Karsten Thoms
8df5d76862
Merge pull request #757 from eclipse/kth_issue1224 
[eclipse/xtext#1224] Detect local Jenkins environment
 2018-09-18 10:17:06 +02:00
Karsten Thoms
1427e5240e
Merge pull request #873 from eclipse/kth_merge_release 
backmerge changes from release_2.15.0
 2018-09-16 08:02:19 +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
e4bfce1d11
Merge pull request #872 from eclipse/sz_strings 
Fixed another location with duplicated code
 2018-09-16 07:55:54 +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
Karsten Thoms
cbf67c5151
Merge pull request #871 from eclipse/sz_strings_cherrypick 
Removed copied code from Strings.java
 2018-09-15 23:15:14 +02:00
Sebastian Zarnekow
ac40983dc2 Removed copied code from Strings.java 2018-09-15 21:28:31 +02:00
Karsten Thoms
2be2a73f5f
Merge pull request #870 from eclipse/sz_strings 
Removed copied code from Strings.java
 2018-09-15 21:26:06 +02:00
Sebastian Zarnekow
b2f27be164 Removed copied code from Strings.java 2018-09-15 17:45:25 +02:00
Karsten Thoms
7ae92d1ae9
Merge pull request #869 from eclipse/cd_cp_release_2.15.0 
restored old state for MergableManifest
 2018-09-15 15:21:03 +02:00
Christian Dietrich
07a5eff8d1 restored old state for MergableManifest 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-15 14:04:24 +02:00
Karsten Thoms
0fb93a3070
Merge pull request #868 from miklossy/master 
Fix typo 'recordedErrros'->'recordedErrors' in CrossReferenceSerializer.
 2018-09-14 14:05:47 +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
Karsten Thoms
cedd5f30af [eclipse/xtext#1224] Detect local Jenkins environment 
Build steps defined in Jenkinsfile pass the built-in environment
variable 'JENKINS_URL' to the Gradle/Maven executions. This is evaluated
in the build scripts for upstream repository URLs. On Xtext JIPP this
will use upstream repos from JIPP. In local builds outside of Jenkins
the property defaults to Typefox CI like before.

Extend function jenkinsPipelineRepo() by upstreamBranch parameter and use this in the call.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-13 23:55:46 +02:00
Christian Dietrich
9970859ea6
Merge pull request #865 from eclipse/cd_gradle410 
[eclipse/xtext#1297] update to gradle 4.10
 2018-09-11 13:19:42 +02:00
Christian Dietrich
893296e6d4
Merge pull request #866 from eclipse/cd_gradle410_wiz 
[eclipse/xtext#1297] update to gradle 4.10 in wizard
 2018-09-11 13:19:25 +02:00
Christian Dietrich
1648a02a24 [eclipse/xtext#1297] update to gradle 4.10 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-11 11:33:14 +02:00
Christian Dietrich
b71051209d [eclipse/xtext#1297] update to gradle 4.10 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-11 11:18:23 +02:00
Christian Dietrich
1cb69afbd0
Merge pull request #863 from eclipse/cd_no_more_cpy 
restored old state for MergableManifest
 2018-09-11 11:07:50 +02:00
Christian Dietrich
cc2c4fbc54 restored old state for MergableManifest 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-11 10:27:01 +02:00
Christian Dietrich
93e3e31da5
Merge pull request #855 from eclipse/cd_xtext216 
updated versions to 2.16.0
 2018-09-05 07:03:24 +02:00
Christian Dietrich
e1dc135753
Merge pull request #857 from eclipse/cd_depr_rel 
Mark ColoringServiceImpl as Dreprecated
 2018-09-03 16:32:16 +02:00
Christian Dietrich
1e1ba7635f
Merge pull request #856 from eclipse/cd_depr 
marked ColoringServiceImpl as deprecated (analogous to interface)
 2018-09-03 16:23:37 +02:00
Christian Dietrich
443deece46 marked ColoringServiceImpl as deprecated (analogous to interface) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-03 15:43:36 +02:00
Christian Dietrich
35531dfa33 marked ColoringServiceImpl as deprecated (analogous to interface) 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-03 15:40:47 +02:00
Christian Dietrich
5717762932
Merge pull request #853 from eclipse/cd_issue793 
[#793] update to lsp4j 0.5.0 final
 2018-09-03 15:34:45 +02:00
Christian Dietrich
953b648079
Merge pull request #854 from eclipse/cd_issue793 
[#793] update to lsp4j 0.5.0 final
 2018-09-03 15:34:08 +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
Karsten Thoms
5f4b7eaac3 [release] version 2.15.0 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-03 10:43:47 +02:00
Christian Dietrich
eaa542d6c1 [#793] update to lsp4j 0.5.0 final 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-02 10:30:23 +02:00
Karsten Thoms
f7c7a604ed
Merge pull request #850 from eclipse/kth_issue849 
Make CLIProjectsCreator executable
 2018-08-30 17:36:16 +02:00
Karsten Thoms
f76bebc29d [#849] Make CliProjectsCreator executable 
- Added args4j as CLI framework
- Added CliProjectsCreatorMain and test
- Create WizardConfiguration from options
- Added args4j handlers for enum option
- Manage args4j version

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-08-30 17:33:10 +02:00
Christian Dietrich
30dd4d4006
Merge pull request #852 from eclipse/xtext-core-851-project-wizard-xtext-builder 
[#851] Add xtext builder to example project template.
 2018-08-30 15:54:17 +02:00
Arne Deutsch
86ff0e1266 [#851] Add xtext builder to example project template. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2018-08-30 14:21:49 +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
Christian Dietrich
7a4c79e2bf
Merge pull request #847 from eclipse/waqasilyas-wi_issue525 
Fix for #525: Detect incomplete escape sequences
 2018-08-29 18:55:57 +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
Holger Schill
416db12fe1
Merge pull request #815 from kittaakos/GH-812 
GH-812: Implemented the semantic highlighting for the Xtext LS.
 2018-08-29 17:23:09 +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
1f7e9c8d0f
Merge pull request #843 from eclipse/xtext-eclipse-809-slow-task-markers 
[eclipse/xtext-eclipse#809] Cache task marker pattern for performance
 2018-08-29 14:09:54 +02:00