Commit graph

4623 commits

Author SHA1 Message Date
Christian Schneider
0e719d4c5f [idea plugin generator] avoided warning of superfluous imports & some cosmetics to reduce differences too older artifacts in 'IdeaPluginGenerator' 2015-10-23 22:33:40 +02:00
Christian Schneider
1c91d39ebb [xtext generator] added missing opening angle bracket in plugin.xml contributions of ImplicitFragment 2015-10-23 22:26:30 +02:00
Christian Schneider
a132f00ed1 [xtext generator] some cosmetics in ContentAssistFragment2 2015-10-23 22:22:28 +02:00
Christian Schneider
22314feac7 [xtext generator] fixed bug in template of '...AntlrTokenFileProvider' 2015-10-23 22:17:39 +02:00
Christian Schneider
fa6f9b5f4b [antlr content assist grammar generator] bug fix: added missing check for combined vs. separated grammars 2015-10-23 22:16:11 +02:00
Christian Schneider
002bac2946 [antlr grammar generator] added some cosmetic newlines 2015-10-23 22:10:41 +02:00
Sven Efftinge
cd9e87c716 Merge pull request #736 from eclipse/se/arithmetics_reimpl
[examples] reimplemented Arithmetics example language with current head.
2015-10-23 17:11:34 +02:00
Dennis Huebner
b44c3ed0d8 [api] Fixed missing since tag
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-23 15:42:51 +02:00
Stefan Oehme
882152d5cb [wizard] disable 'cleanEclipseClasspath' for plugin projects 2015-10-23 13:28:36 +02:00
Stefan Oehme
8b527e8456 [wizard] fix access warnings 2015-10-23 13:27:44 +02:00
Stefan Oehme
0e7c64f372 Merge pull request #735 from eclipse/so_generator2
Bug 480420 Generator2 improvements
2015-10-23 12:00:44 +02:00
akosyakov
e8b582cb7a Merge remote-tracking branch 'origin/master' into ak/bug_479723
Conflicts:
	intellij/org.eclipse.xtext.idea/src/org/eclipse/xtext/idea/trace/TraceForVirtualFileProvider.xtend
	intellij/org.eclipse.xtext.idea/src/org/eclipse/xtext/psi/impl/BaseXtextFile.java
	intellij/org.eclipse.xtext.idea/xtend-gen/org/eclipse/xtext/idea/trace/TraceForVirtualFileProvider.java
	tests/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java
2015-10-23 11:54:23 +02:00
Stefan Oehme
799fa768ff hotfix for generator dependencies until mwe2 pom.xml gets fixed 2015-10-23 11:47:24 +02:00
akosyakov
f0b20b3c03 [idea] Mark AST nodes associated with semantic elements 2015-10-23 11:43:06 +02:00
Sven Efftinge
622b6dd5f6 [arithmetics] Create project in concrete TestClass 2015-10-23 10:55:08 +02:00
Stefan Oehme
69093080fc introduce AbstractGenerator and IGeneratorContext 2015-10-23 10:26:37 +02:00
Stefan Oehme
080b35fd74 Bug 480420 fix afterGenerate hook in parallel builder participant 2015-10-23 09:36:54 +02:00
Sven Efftinge
d7285f5ec6 [wizard] added missing dependencies and improved toString for EclipseProjectConfig 2015-10-22 22:43:22 +02:00
Sven Efftinge
7777198e0d Merge pull request #731 from eclipse/se/workspace_config_hello_again
Reintroduced workspace config
2015-10-22 22:36:32 +02:00
Sven Efftinge
2652d81383 [examples] reimplemented Arithmetics example language with current head. 2015-10-22 22:24:13 +02:00
Sven Efftinge
3629379b03 Reintroduced workspace config 2015-10-22 20:56:55 +02:00
Sebastian Zarnekow
4a2a2525e0 [480445] Added TypeReference#guessTypeRef
Improved backwards compatibility.
2015-10-22 19:02:54 +02:00
Sebastian Zarnekow
25c3978d98 [480436] Fixed bug in GrammarFlattener 2015-10-22 18:14:19 +02:00
Stefan Oehme
b542ba8e06 Merge pull request #723 from eclipse/so_generator2
IGenerator2 improvements
2015-10-22 17:57:21 +02:00
Stefan Oehme
a7c983cb21 Merge pull request #722 from eclipse/so_generator_maven_dependencies
[generator2][wizard] only depend on new generator in new projects
2015-10-22 17:57:13 +02:00
Stefan Oehme
d55b5a4bde fix wizard integration test 2015-10-22 16:44:28 +02:00
Anton Kosyakov
b5e0f8cdfc Merge pull request #724 from eclipse/ak/fixed_node_replacement
[NodeModel] replace a first child of a new node with null if an old does not have children
2015-10-22 16:30:59 +02:00
Stefan Oehme
75e304e304 [generator2][wizard] only depend on new generator in new projects 2015-10-22 16:05:34 +02:00
Stefan Oehme
cef38085b2 make Generator2 the default for new languages 2015-10-22 16:00:31 +02:00
Stefan Oehme
07cdb06281 [wizard] add a utility to update test expectations 2015-10-22 15:55:22 +02:00
Jan Sebechlebsky
34d61d4d80 Fix freeze on FailedPredicateException
Signed-off-by: Jan Sebechlebsky <jan.sebechlebsky@cz.ibm.com>
2015-10-22 15:52:25 +02:00
akosyakov
4afaa98cf9 [NodeModel] replace a first child of a new node with null if an old
does not have children
2015-10-22 15:01:11 +02:00
akosyakov
75219755ec [NodeModel] replace a first child of a new node with null if an old
does not have children
2015-10-22 14:53:47 +02:00
Stefan Oehme
7dfaaf17d8 Bug 477068 generator2 should expose a CancelIndicator 2015-10-22 14:10:02 +02:00
Sven Efftinge
4a43c1aaa9 updated test expectations 2015-10-22 12:40:54 +02:00
Sven Efftinge
316dc4be62 [generator/wizard] NamesAreUniqueValidator is not active by default 2015-10-22 11:57:31 +02:00
Stefan Oehme
a058fd1072 Merge pull request #702 from sailingKieler/aa/ecore2XtextValueConverterService
[xtext generator] Migrated 'Ecore2XtextValueConverterServiceFragment'
2015-10-22 10:41:44 +02:00
Stefan Oehme
8aa96eeb3a [generator 2] don't generate unused imports 2015-10-22 10:38:07 +02:00
Christian Schneider
afb3b9a018 [xtext generator] Added 'org.eclipse.xtext.xtext.generator.ecore2xtext' to exported packages
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-22 10:23:00 +02:00
Christian Schneider
c1186a05f9 [xtext generator] Migrated 'Ecore2XtextValueConverterServiceFragment'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-22 10:14:54 +02:00
Stefan Oehme
30f25bc56f remove confusing setter from languageSetup
Thanks Miro for spotting that =)
2015-10-22 09:12:44 +02:00
Stefan Oehme
eb1cc00bd5 fix order of standard language fragments 2015-10-22 09:07:36 +02:00
Stefan Oehme
37218795e8 remove brittle nested class detection magic from TypeReference 2015-10-21 16:17:53 +02:00
Stefan Oehme
9f4a7ff41a pull generateStub/inheritImplementation to super classes 2015-10-21 16:17:50 +02:00
Stefan Oehme
b2060c6151 [generator2] aggregate exceptions from generator fragments 2015-10-21 16:17:48 +02:00
Christian Schneider
c4d9d79983 [antlr grammar generation] simplified 'replace' expression in 'compileParserMembers'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-21 15:59:19 +02:00
Christian Schneider
fde041627e [antlr grammar generation] partial revert in 'compileParserMembers'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-21 15:41:30 +02:00
Christian Schneider
f6d4cac3df [antlr grammar generation] fixed issue in 'compileParserMembers' of content assist grammar generator and 'compileTokens' of AbstractAntlrGrammarGenerator
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-21 15:14:07 +02:00
Stefan Oehme
b3a4d042c1 Merge pull request #715 from eclipse/sz/grammarGenFixes
A few fixes for the Antlr generator 2
2015-10-21 14:52:24 +02:00
Stefan Oehme
21dd488f2c Merge pull request #716 from sailingKieler/cs/codeConfigEncodingLineDelim
[xtext generator] added default value of 'encoding' and 'lineDelimiter' in CodeConfig
2015-10-21 14:49:04 +02:00