Commit graph

4604 commits

Author SHA1 Message Date
Sebastian Zarnekow
895ff52a8f [480686] Fixed regression in NodeModelBuilder 2015-10-27 16:00:58 +01:00
Christian Schneider
d3576904fa [xtext generator] changed check in 'ImportNamespacesScopingFragment2.getDelegateScopeProvider()' from 'usesXImportSection' to 'inheritsXbase'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-27 14:58:38 +01:00
Dennis Huebner
cd76972135 [mvn] Workaround for "Tycho treats optional dependencies as required"
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-27 11:42:52 +01:00
Christian Schneider
d4f10db7d4 [xtext generator] added generation of surrogate '...QuickfixProvider' classes into src-gen in case stub generation is switch off
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-27 11:00:05 +01:00
Christian Schneider
14f1d21fcf [xtext generator] fixed naming of generated [Abstract]...ProposalProvider in 'ContentAssistFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-27 11:00:02 +01:00
Christian Schneider
1ce296463c [xtext generator] fixed naming of generated [Abstract]...Validator in 'ValidatorFragment2'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-27 11:00:00 +01:00
Christian Schneider
ed7ed58f21 [xtext generator] fixed naming of generated [Abstract]ScopeProvider in 'ImportedNamespacesScopingFragment2' as suggested in review 2015-10-27 10:59:58 +01:00
Christian Schneider
9578112d55 [antlr content assist grammar generator] removed line of code in handling of unordered groups in the content assist grammar template dedicated to separated grammars in old generator, updated new generator respectively.
We cannot prove by means of the history that this line was wrong, but it looked like and the UnorderedGroups content assist tests were satisfied for separated grammars, as well.
Updated old generator template  as the grammar comparison wouldn't work otherwise.

Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-27 10:59:56 +01:00
Christian Schneider
cd49fc92b9 removed version constraints from dependencies to '...idea.generator', added on missing 'optional' flag 2015-10-27 10:31:36 +01:00
Christian Schneider
d5d167d974 Merge pull request #746 from sailingKieler/cs/generator/fixes
generator fixes & improvements performed while migrating the test languages in '...xtext.testlanguages'
2015-10-27 09:44:23 +01:00
Christian Schneider
b3bee86d2e re-added optional dependencies to '...idea.generator' to plug-ins referencing the old idea generator fragment in mwe2 workflows 2015-10-27 09:09:21 +01:00
Sebastian Zarnekow
2e9914e70b [480614] Fixed NPE in Xtext grammar editor 2015-10-26 17:24:40 +01:00
Stefan Oehme
5ffd70f822 add mwe2.launch to projects created by the wizard 2015-10-26 15:56:07 +01:00
Sebastian Zarnekow
a132e0a197 Merge pull request #750 from eclipse/sz/webAPI
Removed unnecessary comment
2015-10-26 13:34:36 +01:00
Sebastian Zarnekow
703b083159 Removed unnecessary comment 2015-10-26 13:34:06 +01:00
Sebastian Zarnekow
0d918b5a65 Merge pull request #749 from eclipse/sz/webAPI
Fix: Deserialized issue from marker was broken
2015-10-26 12:00:20 +01:00
Dennis Huebner
2cb0b5f041 [releng] Removed references to deleted idea.generator project
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-26 10:30:26 +01:00
Dennis Huebner
a5839b5d20 [mvn] mwe2 Launcher 2.8.2 should provide dependencies
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-26 10:03:05 +01:00
Sebastian Zarnekow
384eef8296 Fix: Deserialized issue from marker was broken 2015-10-26 09:48:05 +01:00
Moritz Eysholdt
66fee19452 Merge pull request #744 from eclipse/me/serializer
[serializer] fixed a bug in PDA construction
2015-10-25 18:36:13 +01:00
Moritz Eysholdt
791584041b [serializer] fixed a problem with the GrammarPDAProvider
make sure that AbstractElements which have been duplicated in the 
FlattenedGrammarAccess are properly merged back together in the 
GrammarPDAProvider

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-25 17:21:28 +01:00
Moritz Eysholdt
cba64e4082 [serializer] fixed a bug in PDA construction
when two unassigned rules calls followed one another, the second 
one was not properly considered

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-25 17:21:28 +01:00
Sebastian Zarnekow
64668e2483 Updated wizard expectations 2015-10-25 16:19:22 +01:00
Sebastian Zarnekow
2e656a3023 Fixed conversion code that obtains location 2015-10-24 19:55:45 +02:00
Sebastian Zarnekow
99df905733 Some Javadoc 2015-10-24 18:35:30 +02:00
Sebastian Zarnekow
036b43e45e [web] Added missing @since tag 2015-10-24 18:35:22 +02:00
Sebastian Zarnekow
804f968c56 [web] Include the column number in the validation results 2015-10-24 17:58:39 +02:00
Sven Efftinge
3970ccefea Get rid of some warnings 2015-10-24 12:51:08 +02:00
Christian Schneider
932762ab44 [xtext generator] changed 'ImportNamespacesScopingFragment2' to always generate the 'Abstract...ScopeProvider' in src-gen allowing to let it be referenced by "sub languages" regardless of the presence of a concrete '...ScopeProvider' (stub) in src 2015-10-23 23:16:54 +02:00
Christian Schneider
3afa6dbc71 [xtext generator] added choice of Java vs. Xtend classes/templates of generator stubs in 'GeneratorFragment2', minor improvement in contained plugin.xml template 2015-10-23 23:08:13 +02:00
Christian Schneider
4e525a011e [xtext generator] added choice of Java vs. Xtend templates for module stubs and setups, added missing '.typeRef' in template of eclipse plug-ins' activators 2015-10-23 23:03:14 +02:00
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