Commit graph

6643 commits

Author SHA1 Message Date
Christian Dietrich
cd340b79a3
Merge pull request #892 from eclipse/cd_xtext_issue1300_wiz
[eclipse/xtext#1300][Wizard] Update to Gradle Wrapper 4.10.2
2018-10-10 17:05:01 +02:00
Christian Dietrich
2527ae2e25
Merge pull request #891 from eclipse/cd_xtext_issue1300
[eclipse/xtext#1300] Update to Gradle Wrapper 4.10.2
2018-10-10 17:04:45 +02:00
Karsten Thoms
073e2dda00 [eclipse/xtext#1222] Auto-detect upstream repository URLs
Using plugin org.ajoberstar.grgit to be able to determine the
repository's current branch name.

When using jenkinsPipelineRepo Jenkins is contacted to check the
existence of jobs, starting with the current branch name and falling
back to 'master'. This is done for each upstream repository.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-10 14:37:33 +02:00
Christian Dietrich
11bfa28edd [eclipse/xtext#1280] made genManifest / genSourcesManifest gradle 5 ready
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-10 06:37:12 +02:00
Dennis Huebner
ceca3728be
Merge pull request #895 from eclipse/dh-ignoreChangeWatchedFiles
Ignore didChangeWatchedFiles for open documents
2018-10-09 13:12:27 +02:00
Dennis Huebner
07941dbdf0 Additional test for "delete than close" case #895
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-09 10:04:07 +02:00
Dennis Huebner
a92e9b1dfb
Merge pull request #894 from eclipse/dh-server-initialize
Initial Diagnostics can never arrive to the client
2018-10-08 16:42:17 +02:00
Dennis Huebner
b25320cd3b [LSP] Ignore didChangeWatchedFiles for open documents #888
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-08 16:40:11 +02:00
Dennis Huebner
f28fafb8ca Removed runWrite call #800
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-08 16:27:29 +02:00
Dennis Huebner
da30a28a9a Testcase for #800
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-08 15:51:16 +02:00
Dennis Huebner
bb6258d1be [ls] Diagnostics can never arrive to the client #800
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-10-08 15:24:46 +02:00
Dennis Huebner
28a125ffc9
Merge pull request #887 from eclipse/dh-codeActionTests
Make it possible to test position based CodeActions
2018-10-08 09:59:00 +02:00
Karsten Thoms
3eb2a9f04f
Merge pull request #890 from miklossy/master
Fix a typo in the javadoc of the DefaultCommentAssociater class.
2018-10-07 19:32:06 +02:00
Christian Dietrich
11572cb5a8 [eclipse/xtext#1300][Wizard] Update to Gradle Wrapper 4.10.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-06 17:53:26 +02:00
Christian Dietrich
a5410dad0b [eclipse/xtext#1300] Update to Gradle Wrapper 4.10.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-06 17:44:06 +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
c071531b8c
Merge pull request #879 from eclipse/kth_issue1272_2
[eclipse/xtext#1272] Set Xtext bootstrap 2.15
2018-10-03 14:12:17 +02:00
Karsten Thoms
cc216a9ffb [eclipse/xtext#1272] Remove signature workaround
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-03 14:03:20 +02:00
Akos Kitta
349580fc26 GH-882: Fixed the inconsistency between the range and selectionRange.
Added a test assertion to ensure `selectionRange` is always contained by the `range`.

Closes: #882.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
2018-10-02 19:54:17 +02:00
Karsten Thoms
bb85fe78c5 [539677] getValue should return null for null arg
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-01 10:34:24 +02:00
Dennis Huebner
199c60fdf0 Make it possible to test position based CodeActions
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2018-09-27 13:33:31 +02:00
Akos Kitta
9e46f302bb GH-858: [LS] Added support for the hierarchical document symbols.
Closes: #858.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
2018-09-25 14:13:54 +02:00
Karsten Thoms
32b9c2d5c9
Merge pull request #877 from eclipse/kth_JavaVersionTest
Testing more methods from JavaVersion
2018-09-23 15:16:05 +02:00
Karsten Thoms
fc60f2407a
Merge pull request #878 from eclipse/kth_issue1272
[eclipse/xtext#1272] Compile with Xtend 2.15
2018-09-23 15:12:59 +02:00
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
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
3eca192009 Testing more methods from JavaVersion
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-09-21 06:49:06 +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