Commit graph

5181 commits

Author SHA1 Message Date
Christian Dietrich
5738a92b86 fixed broken eclipse metadata
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-19 21:45:11 +02:00
Christian Dietrich
f0f3c52f2d added missing smoketest package export in xtext.testing
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-19 18:56:39 +02:00
Christian Dietrich
de95cc4a25 added missing logging package export in xtext.testing
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-19 17:12:44 +02:00
Christian Dietrich
95dd656cb6 Merge pull request #87 from eclipse/cd_bug482110
[482110] fixed AbstractFormatter2.shouldFormat
2016-08-18 16:00:34 +02:00
Christian Dietrich
6858354b19 [482110] fixed AbstractFormatter2.shouldFormat
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-18 14:51:14 +02:00
Moritz Eysholdt
c73065d2dd Merge pull request #86 from kthoms/kth/bug478377
[478377] Add null guard
2016-08-17 08:54:38 +02:00
Karsten Thoms
d7efc23796 [478377] Add null guard
Test call findNodesForFeature with null feature

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-16 22:21:44 +02:00
Moritz Eysholdt
79118e564d Merge pull request #72 from eclipse/me_xtextresource
introduce XtextResource#setEntryPoint(ParserRule)
2016-08-12 13:46:25 +02:00
Christian Dietrich
076229c563 Merge pull request #78 from eclipse/cd_bug435441
[435441] Added JavaDoc to CheckType Enum
2016-08-12 13:41:09 +02:00
Christian Dietrich
625803b3c9 [435441] Added JavaDoc to CheckType Enum
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-12 13:40:49 +02:00
Moritz Eysholdt
467ee9cf51 Merge pull request #83 from kthoms/kth/bug484500
Kth/bug484500
2016-08-12 13:38:03 +02:00
Karsten Thoms
6309bba2e7 [484500] Changed build.properties for test expectations
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-12 11:04:44 +02:00
Karsten Thoms
735ea5d929 [484500] Add bin.excludes to build.properties
- the runtime project excludes .mwe2 and .xtend files
- the feature sdk project excludes nothing
- all other Eclipse projects exclude .xtend
- add test case WizardConfigurationTest#binExcludes

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-12 11:04:13 +02:00
Christian Dietrich
80b26388b8 Merge pull request #75 from kthoms/kth/bug431435_bindEPackageAndEFactory
[431435] Bind generated EPackage and EFactory
2016-08-12 09:12:59 +02:00
Christian Dietrich
2d10ffbd5e Merge pull request #80 from kthoms/kth/issue79
[#79] Upgrade Eclipse & MWE p2 repository URLs
2016-08-12 08:55:50 +02:00
Karsten Thoms
ae123abe38 [#79] Upgrade Eclipse & MWE p2 repository URLs
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-12 08:30:48 +02:00
Moritz Eysholdt
6d19ebaa6c Merge pull request #77 from kthoms/kth/issue76
[#76] Upgrade to Tycho 0.25.0
2016-08-12 06:57:13 +02:00
Karsten Thoms
337e4371e4 [#76] Upgrade to Tycho 0.25.0
Covered by test CliWizardIntegrationTest

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-11 23:07:08 +02:00
Karsten Thoms
a94438ea69 [431435] Bind generated EPackage and EFactory
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-11 21:23:07 +02:00
Moritz Eysholdt
5e203dea8e implemented ContentAssistContextFactoryTest
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 16:02:36 +02:00
Moritz Eysholdt
449ddcc804 added a test language for partial content assist
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 16:02:35 +02:00
Moritz Eysholdt
714bfe79c4 created InjectorProviders for test language
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:52 +02:00
Moritz Eysholdt
15fb792a28 regenerated test languages
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:51 +02:00
Moritz Eysholdt
676736a4b8 [#16, contentAssist] add support for custom parser entry points
ContentAssist needs to use the entry point that can be obtained via 

NodeModelUtils.getEntryParserRule(INode) or 
XtextResource.getEntryPoint()

To support this, AbstractContentAssistParser does now implement 
IPartialEditingContentAssistParser, which is an interface that has been
introduced some time ago for the CodeTemplates language.

XtextAntlrGeneratorFragment2 will no longer generate getFollowElements()
for each language because that method is only able to invoke the first 
parser rule. Instead, there is now a gneric implementation in the super 
class.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:50 +02:00
Moritz Eysholdt
0745d5a43d [#16, XtextResource] introduce setEntryPoint(ParserRule)
This change allows to specify on XtextResource what ParserRule the
parser should be using as the entry point.

see https://github.com/eclipse/xtext-core/issues/16

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:49 +02:00
Moritz Eysholdt
927d574d96 [#16, partial-parser] On fully re-parse, keep the entry parser rule
When the partial parser does a full re-parse, it should use the same
entry parser rule that has been used during the last parse.

see https://github.com/eclipse/xtext-core/issues/16

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:48 +02:00
Moritz Eysholdt
07d38dd13b bugfix: binding for partial content assist is IDE, not UI
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:47 +02:00
Moritz Eysholdt
9b43417e24 make grammar GrammarElementTitleSwitch more robust
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:46 +02:00
Moritz Eysholdt
dc674d1abf Merge pull request #71 from eclipse/me_strict_partial_parser_test
make AbstractPartialParsrTest more strict
2016-08-10 17:00:55 +02:00
Moritz Eysholdt
6c0579c9cd Merge pull request #70 from eclipse/me_move_ca_tests
Move some Content Assist tests from xtext-eclipse to xtext-core
2016-08-10 16:51:21 +02:00
Moritz Eysholdt
597496cfb6 migrated content assist tests from xtext-eclipse/o.e.x.ui.tests
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-10 15:34:06 +02:00
Moritz Eysholdt
d62bce84eb move test language from xtext-eclipse/o.e.x.ui.tests to xtext.testlangs
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-10 15:34:05 +02:00
Moritz Eysholdt
4a0a1591a7 Merge pull request #59 from eclipse/me_manifest
[MANIFEST.MF-cleanup] splitting lines should also work on UNIX newlines
2016-08-09 11:16:19 +02:00
Christian Dietrich
c69a4e378e fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=465171
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-03 16:40:25 +02:00
Christian Dietrich
1e778ae011 Merge pull request #66 from eclipse/cd_issue65
(De)Serializing the NodeModel with IResourceStorageFacade is not working if transient features involved
2016-08-03 08:25:02 +02:00
Christian Dietrich
49b9ff4e55 Do not collect EObjects in transient Features when calculating IdToEObjectMap for Serialization. Fixes #65
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-03 08:16:44 +02:00
Jan Köhnlein
b5529bd356 Merge pull request #64 from eclipse/jk/63
[generator] Provider bindings cannot be overridden #63
2016-08-02 12:56:04 +02:00
Jan Koehnlein
76c5f1f524 [generator] Provider bindings cannot be overridden #63 2016-08-02 10:08:30 +02:00
Christian Dietrich
291722e5ff Merge pull request #61 from eclipse/cd_bf398890
Bugfix 398890
2016-07-31 22:21:51 +02:00
Christian Dietrich
76bcf589d1 - escape */ in javadoc of syntactic sequencer.
- fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=398890
- added testcase for Bug 398890
- fixed wrong escaping of /* and */ in grammar access

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-31 21:58:44 +02:00
Christian Dietrich
bea251a9af Merge pull request #62 from eclipse/cd_issue60
fixed #60.
2016-07-31 21:51:22 +02:00
Christian Dietrich
1c13b558e2 fixed #60. GenerateSerializerLanguages.mwe2 should behave like GenerateAllTestLanguages.mwe2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-31 20:38:27 +02:00
Moritz Eysholdt
c667a546b4 [MANIFEST.MF-cleanup] splitting lines should also work on UNIX newlines
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-07-29 13:59:01 +02:00
akosyakov
48193bee16 [ls] Make sure that there is only one instance of BuildManager per
WorkspaceManager
2016-07-29 15:37:07 +05:00
Christian Dietrich
8bc76b67ed fixed broken test data calculation
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-29 10:25:56 +02:00
akosyakov
4dfc529c5a [ls] Don't log cancellation of requests as errors 2016-07-28 08:36:53 +05:00
Moritz Eysholdt
b78ea72ffe make AbstractPartialParsrTest more strict
It should also test if node.getGrammarElement() is correct

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-07-27 08:50:52 +02:00
akosyakov
c216f1aa1d [ls] Log exceptions from failed requests instead of swallowing 2016-07-27 11:08:27 +05:00
Christian Dietrich
bf9021d822 Merge pull request #55 from eclipse/cd_issue20
[LanguageServer] Fix HoverService
2016-07-26 10:57:19 +02:00
Christian Dietrich
d8dc3ff328 fixed hoverservice for non self contained cross references #20
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-26 09:51:05 +02:00