Commit graph

4267 commits

Author SHA1 Message Date
Sven Efftinge
297ca7a0c5 [wizard] reverted to old EMFFragment 2015-10-01 11:44:21 +02:00
Stefan Oehme
0c79111b47 [maven] remove unused icu4j dependency (10mb!)
Icu4j is only used in the Generator and UI. But up until now it was
pulled in by xtext runtime.
2015-10-01 11:02:38 +02:00
Stefan Oehme
12c95b807a [wizard] fix jar packaging for plain maven projects 2015-10-01 10:57:49 +02:00
Dennis Huebner
4188a27078 Fixed mwe2 dependency version
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-01 09:43:03 +02:00
Dennis Huebner
00efb66b13 Prepare for beta4
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-01 09:31:21 +02:00
Miro Spönemann
03640ffee0 Added resolution:=optional to mwe2.lib dependency
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-10-01 09:30:01 +02:00
Miro Spönemann
dc4f960413 Merge pull request #629 from eclipse/msp/generatorFragment
Migrated more generator fragments
2015-10-01 09:06:22 +02:00
Stefan Oehme
1bd153ea55 [wizard] fix jar content for Gradle build
include model/generated
exclude .xtend, ._trace, .g etc.
2015-09-30 18:22:07 +02:00
Dennis Huebner
acf8f88f46 Bug 478407 - [web/gradle] 'jettyRun' exits immediately
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-30 16:06:56 +02:00
Sebastian Zarnekow
5c4a73d28b Merge pull request #636 from eclipse/sz/xtext_grammar_enhancement
Expose accessors for new properties in AbstractContentAssistParser
2015-09-30 13:10:10 +02:00
Stefan Oehme
8a5681c61a [wizard] make sure noone accidently adds old asm dependency 2015-09-30 11:16:17 +02:00
Stefan Oehme
5e6dae5c5c [wizard] add maven/idea upload tasks
this way, users only need to insert their repository URLs to upload
their language artifacts to a Maven repository
2015-09-30 11:16:14 +02:00
Sven Efftinge
6976a0ab53 [web/generator] generate .* as CONTAINER_JAR_PATTERN 2015-09-30 10:58:19 +02:00
Sebastian Zarnekow
5a74aa3698 Expose accessors for new properties in AbstractContentAssistParser 2015-09-30 10:06:32 +02:00
Stefan Oehme
f6f513de79 [wizard] let generated projects use latest idea eap 2015-09-29 17:57:41 +02:00
Stefan Oehme
0b02838196 use latest idea-gradle-plugin 2015-09-29 17:54:48 +02:00
Stefan Oehme
0455b188ff make intellij recognize the ideaProvided dependencies 2015-09-29 14:51:18 +02:00
Stefan Oehme
d16079950f make gradle plugin versions dependent on Xtext version 2015-09-29 14:47:36 +02:00
Stefan Oehme
fa24700451 Merge pull request #631 from eclipse/so_fix_classpath_typeprovider
Stale JvmTypes in the incremental builder
2015-09-28 16:42:09 -04:00
Stefan Oehme
12da06469b fixed stale JvmTypes in the index when using Java source language 2015-09-28 18:00:21 +02:00
Dennis Huebner
eb2fac4f97 Bug 478040 - [api] We need a way to obtain the current versions we use
to generate build files

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-28 15:15:48 +02:00
Dennis Huebner
45e8153cee [wizard] Plugin repository entry in generated pom. Fixed test
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-28 09:49:57 +02:00
Dennis Huebner
050b03db10 Bug 478388 - [wizard] Plugin repository entry in generated pom is
missing for snapshots

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-25 17:23:28 +02:00
Miro Spönemann
d9ef0ff6f5 [wizard] Added copyright headers 2015-09-25 14:57:14 +02:00
Miro Spönemann
224c8e835a [generator] implemented new EMF fragment 2015-09-25 14:57:14 +02:00
Miro Spönemann
4f2a136d72 [generator] implemented new validator fragment
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-25 14:57:14 +02:00
Miro Spönemann
67752cd1bd [generator] Implemented new types fragment
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-25 14:57:14 +02:00
Miro Spönemann
7e61163931 [generator] Implemented new scoping fragment
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-25 14:57:13 +02:00
Dennis Huebner
20c3b99973 [idea] Fixed NPE
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-25 14:24:02 +02:00
Dennis Huebner
afe25fefe1 Merge remote-tracking branch 'origin/master' into dh/idea-wizard
Conflicts:
	.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
	intellij/org.eclipse.xtext.xtext.idea.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs


Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-24 16:28:06 +02:00
Dennis Huebner
06694ea9cd [wizard] Apply Facet and set up output configuration
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-24 16:15:45 +02:00
Sebastian Zarnekow
64e08e5d0a Merge pull request #625 from eclipse/sz/xtext_grammar_enhancement
Fixed validation of actions in fragments
2015-09-24 10:52:25 +02:00
Stefan Oehme
9782dd1925 Merge pull request #627 from eclipse/so_wizard_fixes
[wizard] Make upgrading to Xbase seamless
2015-09-23 21:09:48 -04:00
Stefan Oehme
d2669e2e03 include xbase.web dependency by default
This way, users can upgrade to using Xbase without touching their
buildscripts. Users who are very build performance aware can easily
remove it.
2015-09-23 21:47:47 +02:00
Stefan Oehme
c98a50ed20 make AlternateJdkLoader usable for Gradle without Xtend dependency 2015-09-23 20:01:11 +02:00
Dennis Huebner
374858a89f [wizard] Allow creation of module in existing project. Some Tests.
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-23 14:47:09 +02:00
Sebastian Zarnekow
954a4867cd Fixed validation of actions in fragments
Added test
2015-09-23 14:01:54 +02:00
Dennis Huebner
01f98cb305 [idea] [wizard] First draft - WIP
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-23 09:09:44 +02:00
Sebastian Zarnekow
25b27bb8c3 Fixed RegEx for line endings 2015-09-22 19:18:37 +02:00
Sebastian Zarnekow
1172ee9b63 Improved syntactic predicates
Allow nesting of ‘normal’ and ‘first-set’ predicates
to fine tune the lookahead, e.g.

=>(name=ID ->child=SomeComplexRule)

allows to define a predicate that will only look
two tokens ahead: the ID token followed by one of
the elements of the first-set of SomeComplexRule
2015-09-22 18:26:52 +02:00
Sebastian Zarnekow
fd6e3a9465 Allow fragments to be used in predicates 2015-09-22 18:24:57 +02:00
Sebastian Zarnekow
927120ec60 Project settings for xtext.text.generator 2015-09-22 18:24:57 +02:00
Sebastian Zarnekow
1979cd93c9 Disallow actions in parser rule fragments 2015-09-22 18:24:55 +02:00
Sebastian Zarnekow
6c591d2554 [462047] A test language to reproduce the problem 2015-09-22 14:59:03 +02:00
Sven Efftinge
072db655a5 Merge pull request #613 from eclipse/se/bug477683
[477683] Xtext/IDEA - only report syntax errors and broken links to rules and grammars
2015-09-22 09:04:45 +02:00
Stefan Oehme
5b3d0c0f3d Merge pull request #509 from eclipse/so_remove_splitting_from_api
Deduplicate code between new and old generator
2015-09-21 11:39:43 -04:00
Sven Efftinge
c2f1c09313 [477683] Xtext/IDEA - only report syntax errors and broken links to rules and grammars 2015-09-21 17:15:23 +02:00
Stefan Oehme
3ef32dc237 address review comments 2015-09-21 16:20:36 +02:00
Sven Efftinge
40f41bb721 [idea builder] store installed languages in persisted index state and trigger clean-build if differs after restart. 2015-09-21 14:55:47 +02:00
Sven Efftinge
7c696e5e07 Merge pull request #603 from eclipse/ak/use_operation_canceled_manager
Use OperationCanceledManager to check a cancelIndicator
2015-09-21 12:33:39 +02:00