Commit graph

5505 commits

Author SHA1 Message Date
akosyakov
65ac06cfae release the semaphore if the read request is cancelled 2017-01-31 10:24:49 +05:00
Karsten Thoms
88b04302cb Merge pull request #258 from eclipse/kth_junit412
Change import of AssumptionViolatedException
2017-01-27 08:48:53 +01:00
Christian Dietrich
662c79d34d Merge pull request #262 from eclipse/cd_issue47
load XtextValidationTest.ecore from code to avoid validation problems in workspace
2017-01-25 13:24:52 +01:00
Christian Dietrich
b37a087fd7 load XtextValidationTest.ecore from code to avoid validation problems in workspace. fixes #47
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-01-25 12:49:51 +01:00
Karsten Thoms
6dc1063633 Change import of AssumptionViolatedException
With JUnit 4.12 the class was made public API, the old class is
deprecated.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-25 09:58:09 +01:00
Miro Spönemann
edf68739d8 Merge pull request #256 from eclipse/msp_issue58
Removed some @noreference, @noextend tags; added Javadoc
2017-01-20 15:19:01 +01:00
Miro Spönemann
fb8a4fe495 #58: Removed some @noreference, @noextend tags; added Javadoc documentation 2017-01-19 11:10:05 +01:00
Miro Spönemann
8f9a5c0e27 Merge pull request #255 from eclipse/msp_issue223
Deprecated XtextGeneratorLanguage.generateXtendStubs
2017-01-19 11:09:40 +01:00
Miro Spönemann
baad5c1aaf Merge branch 'release_2.11.0' with 'ours' strategy 2017-01-18 16:32:17 +01:00
Miro Spönemann
1b140cbcac [build] Implemented more intelligent upstream branch selection 2017-01-18 16:27:03 +01:00
Miro Spönemann
01135ffb10 [build] Implemented more intelligent upstream branch selection 2017-01-18 16:20:18 +01:00
Miro Spönemann
a14e54a3e1 Reverted target platform to version 2.10.0 2017-01-18 11:57:51 +01:00
Miro Spönemann
ba911b4790 Lifted version number to 2.12.0-SNAPSHOT 2017-01-18 11:47:03 +01:00
Miro Spönemann
64c9c3351b Increased version number for release 2.11.0 2017-01-18 11:41:47 +01:00
Miro Spönemann
a8c41d7007 #223: Deprecated XtextGeneratorLanguage.generateXtendStubs 2017-01-18 10:05:35 +01:00
Miro Spönemann
b51f99b326 Increased version number for milestone 2.11.0.RC1 2017-01-17 09:06:41 +01:00
Moritz Eysholdt
2012ce7256 fixed #251: Formatter erroneously applies default formatting
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-01-16 20:02:07 +01:00
Lorenzo Bettini
847cb05e02 Merge pull request #246 from eclipse/lb-task_244-Junit4Fragment2
Lb task 244 junit4 fragment2
2017-01-16 15:45:52 +01:00
Sven Efftinge
6133b66961 added explicit dependency to org.eclipse.osgi (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=510504) 2017-01-16 14:48:40 +01:00
Lorenzo Bettini
da3d6d9e75 244: .xtext.junit4 .xbase.junit added to ui.tests by mwe2
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-16 11:45:38 +01:00
Miro Spönemann
97cc054003 Converted LSP4J dependency to version range to include future service
releases (#243)

Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2017-01-16 11:40:58 +01:00
Lorenzo Bettini
8c4eda2e92 244: updated wizard test expectations
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-16 11:10:10 +01:00
Lorenzo Bettini
98c0aa4c94 244: .xtext.junit4 .xbase.junit added to ui.tests by the project wizard
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-16 11:08:39 +01:00
Miro Spönemann
f2652de232 Merge pull request #243 from eclipse/msp_lsp4jRelease
Switched to LSP4J 0.1.0 release
2017-01-16 09:17:33 +01:00
Miro Spönemann
d577c4625e Switched to LSP4J 0.1.0 release 2017-01-16 09:03:56 +01:00
Christian Dietrich
ddad776286 Merge pull request #242 from eclipse/cd_issue240
Return Object insteadof null in LanguageServer.shutdown.
2017-01-16 08:31:31 +01:00
Christian Dietrich
80252ebeec Return Object insteadof null in LanguageServer.shutdown.
Solves #240

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-01-13 09:14:18 +01:00
Lorenzo Bettini
28613d56dd Merge pull request #232 from eclipse/task_230-Junit4Fragment2_added
230: Junit4Fragment2 added dependencies for .tests project
2017-01-12 19:12:09 +01:00
Lorenzo Bettini
0f95ed92b9 230: added flag skipXbaseTestingPackage
Task-Url: https://github.com/eclipse/xtext-core/issues/230
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-12 13:27:48 +01:00
Lorenzo Bettini
4db60c8130 Merge branch 'master' into task_230-Junit4Fragment2_added 2017-01-12 11:11:36 +01:00
Miro Spönemann
0515d22685 Refreshed projects with Buildship 2.0 2017-01-12 10:32:06 +01:00
Miro Spönemann
9d4007a6d8 Merge pull request #234 from eclipse/msp_mwe2Workflows
Generate Xtext languages from Gradle
2017-01-12 10:06:30 +01:00
Miro Spönemann
eb71f2079a [build] Excluded bootstrap project from eclipse-project-layout 2017-01-12 09:51:31 +01:00
Lorenzo Bettini
aabb3c134e Merge pull request #235 from eclipse/lb-bug_479196
479196: AntlrToolFacade always downloads antlr-generator in Maven build
2017-01-11 18:41:25 +01:00
Miro Spönemann
02d3787904 Added common configuration file mwe2-workflows.gradle for generating Xtext languages from Gradle 2017-01-11 16:56:41 +01:00
Miro Spönemann
c65b348e92 [build] Fixed trace file inclusion, updated Xtend plugin to 1.0.15 2017-01-11 15:53:40 +01:00
Lorenzo Bettini
00a949a153 479196: use version range [2.1.1,3)
see
https://github.com/eclipse/xtext-core/pull/235#issuecomment-271882660

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:40:49 +01:00
Lorenzo Bettini
9eb9ad3345 479196: get antlr-generator version using a method
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:24:46 +01:00
Lorenzo Bettini
8fca65f7ee 479196: added xtext-antlr-generator also in the build.gradle
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:22:16 +01:00
Sven Efftinge
6761c499cc [lsp] ensure resources are initialized 2017-01-11 15:17:02 +01:00
Lorenzo Bettini
d2bd0da853 Merge pull request #236 from eclipse/lb-webintegrationfragment
generated Xtend servlet class should use !== instead of !=
2017-01-11 15:09:23 +01:00
Lorenzo Bettini
eca73e86a5 generated Xtend servlet class should use !== instead of !=
Since now Xtend issues a warning if you use != with null.

Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 14:54:27 +01:00
Lorenzo Bettini
7d2675ba40 479196: AntlrToolFacade always downloads antlr-generator in Maven build
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 14:11:56 +01:00
Miro Spönemann
3697c55f65 [build] Include test sources for test projects 2017-01-11 13:43:25 +01:00
Moritz Eysholdt
066e22f507 fixed #12: [formatter] IllegalArgumentException in NodeRegion.toString()
see https://github.com/eclipse/xtext-core/issues/12

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-01-11 10:53:08 +01:00
Miro Spönemann
6b52efede3 Merge pull request #229 from eclipse/msp_grammarAnalysisNullCheck
Added null / proxy check to GrammarElementTitleSwitch
2017-01-11 09:36:12 +01:00
Lorenzo Bettini
d65d1f1dd6 230: Junit4Fragment2 added dependencies for .tests project
Task-Url: https://github.com/eclipse/xtext-core/issues/230
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-10 18:40:49 +01:00
Moritz Eysholdt
e968946b4f [formatter/performance] Don't create stack traces
This change:
- introduces a flag that by default disables creation of stack traces
- lets the formatter do a second pass on conflict with that flag enabled

This combines the benefits of both worlds:
- performance without the need for tweaking
- debug information without the need to enable some magic config

see 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=508894
https://bugs.eclipse.org/bugs/show_bug.cgi?id=507174
https://github.com/eclipse/xtext-core/pull/195

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-01-10 17:54:44 +01:00
Moritz Eysholdt
448b025395 see #199: added comment formatter tests
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-01-10 14:45:39 +01:00
Miro Spönemann
5a6394afbc Added null / proxy check to GrammarElementTitleSwitch 2017-01-10 14:39:07 +01:00