sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 16:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4239 commits 41 branches 98 tags 41 MiB
Commit graph

4239 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dennis Huebner
5905bd3491 [misc] Eclipse Modeling Project -> Eclipse Xtext 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-09-21 11:25:16 +02:00
Sebastian Zarnekow
73519e563c Added missing semicolon. 2015-09-20 19:56:49 +02:00
Sebastian Zarnekow
810df712e8 Merge pull request #607 from eclipse/sz/null_guards 
Some null guards
 2015-09-20 19:52:22 +02:00
Stefan Oehme
0b58d550e7 [wizard] integration test for project generation 
This test generates the five most important wizard configurations. It
makes sure that the output is exactly as expected.

Once we have a Beta release, we can build these examples as part of our
tests and make sure they work.
 2015-09-18 22:53:56 +02:00
Stefan Oehme
95e110932d Merge remote-tracking branch 'origin/master' into 
so_remove_splitting_from_api

Conflicts:
	plugins/org.eclipse.xtext.generator/META-INF/MANIFEST.MF
	plugins/org.eclipse.xtext.generator/plugin.xml_gen
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/AntlrOptions.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/splitting/AntlrLexerSplitter.java
	plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/parser/antlr/splitting/internal/LexerSpecialStateTransitionSplitter.java
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.xtend
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.xtend
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/AntlrCodeQualityHelper.java
	plugins/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGeneratorFragment2.java
	plugins/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrOptions.java
	tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
 2015-09-18 20:42:08 +02:00
Stefan Oehme
f859022dc3 [wizard] use Java 6 source/target level 2015-09-18 19:29:58 +02:00
Stefan Oehme
fb35f7caaf [wizard] use ui harness for ui plugin tests, don't fail on missing tests 2015-09-18 19:29:55 +02:00
Sebastian Zarnekow
79a012e574 Some null guards 2015-09-18 16:43:16 +02:00
Sebastian Zarnekow
ffba673dcc Regenerated test languages 2015-09-18 15:01:46 +02:00
Sven Efftinge
675c77f4f1 [xbase] regenerated with latest generator changes 2015-09-18 14:04:58 +02:00
akosyakov
d1ccbe3609 Use OperationCanceledManager to check a cancelIndicator 2015-09-18 13:48:28 +02:00
Sven Efftinge
9203da64b0 Merge pull request #602 from eclipse/sz/grammar_gen_options 
Several changes in Antlr generator and generator2
 2015-09-18 11:35:46 +02:00
Dennis Huebner
c62586427d [idea] Fixed NPE. Facet may be missing at this point 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-09-18 11:31:16 +02:00
Sebastian Zarnekow
2559c0319d Write valid manifest files 2015-09-18 11:12:03 +02:00
Sebastian Zarnekow
099803452a Don’t write empty plugin.xml_gen, use proper encoding in plugin.xml 2015-09-18 10:33:48 +02:00
Sebastian Zarnekow
f256e58ce7 Obtain PluginXmlAccess and ManifestAccess from injector 2015-09-18 10:33:25 +02:00
Sebastian Zarnekow
4ed3cb5429 Make sure written manifest is valid and consistent 2015-09-18 10:23:33 +02:00
Sebastian Zarnekow
d9db109f22 Eliminate redundant code and thereby reduce size of generated parser 2015-09-18 10:23:11 +02:00
Sven Efftinge
7b94dee4e9 [generator] fixed wrong escaping 2015-09-18 08:18:59 +02:00
Stefan Oehme
f027d7dafa fixed formatting 2015-09-18 04:21:24 +02:00
Stefan Oehme
dd866a21a3 [wizard] tests for the WizardConfiguration 2015-09-18 04:14:49 +02:00
Stefan Oehme
1779e412c4 [wizard] handle inlined test projects with Gradle 2015-09-17 17:24:21 +02:00
Miro Spönemann
0116d37f84 [generator][web] Added check for existing files (the webApp outlet is configured as overwriting) 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-09-17 16:21:37 +02:00
Miro Spönemann
bae240981b [web] Added special handling of keywords that are not found by the word boundary matcher \b 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-09-17 15:17:49 +02:00
Miro Spönemann
51fd8f3e5b [web] Fixed content assist for Orion: 
having an 'int' property in a JSON object means the default value is zero

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-09-17 10:49:41 +02:00
Miro Spönemann
9c24316ae9 [generator] Added escape characters for Jar pattern 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-09-17 09:33:38 +02:00
Stefan Oehme
5661bc52d6 [generator] fix test code location for maven layout 2015-09-17 08:01:08 +02:00
Stefan Oehme
91b597e45b [wizard] fix idea.assembleSandbox for maven layout 2015-09-16 20:50:04 +02:00