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
4595 commits 41 branches 98 tags 41 MiB
Commit graph

4595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sven Efftinge
7b45c20a69 [builder] IShouldGenerate uses ProjectConfig 2015-10-20 13:52:13 +02:00
Sebastian Zarnekow
2f14516fad [479400] Fixed broken tests and improved Xtext serializer 2015-10-20 13:48:56 +02:00
Stefan Oehme
16fe7c487d mark MweIssues package private 2015-10-20 13:43:42 +02:00
Stefan Oehme
2451062e0b split SubProjectConfig classes into separate files 2015-10-20 12:10:12 +02:00
Sven Efftinge
c0102a3b3d [480136] generated proposal provider should inherit from TerminalsProposalProvider 2015-10-20 12:06:14 +02:00
Stefan Oehme
498ad15dae move project config to its own package 2015-10-20 12:04:19 +02:00
Stefan Oehme
99c0195998 more consistent naming of Generator2 concepts 2015-10-20 11:49:05 +02:00
Sebastian Zarnekow
36c8bbaa8e Merge branch 'master' into me/serializer 2015-10-20 11:38:12 +02:00
Christian Schneider
9b91477282 [antlr grammar comparator] renamed error handler's method 'handleUnexpectedCharSequence' into 'handleInvalidGrammarFile' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-20 11:35:46 +02:00
Stefan Oehme
8898f31ae5 Merge pull request #701 from sailingKieler/aa/validatorNaming 
[xtext generator] Extracted the composition of the generated validator classes' names
 2015-10-20 10:32:37 +02:00
Stefan Oehme
0d01cdead3 add return type on public signatures 
Hotfix for failing job at
https://hudson.eclipse.org/xtext/job/xtext-xtend/2846/
 2015-10-20 10:31:35 +02:00
Christian Schneider
eb50e1a6c4 [xtext generator] Extracted the composition of the generated validator classes' names from 'ValidatorFragment2' to 'ValidatorNaming', updated 'QuickfixProviderFragment2' correspondingly. 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-20 10:19:37 +02:00
Christian Schneider
3ce87a3372 [xtext generator] fixed mistakes caused by the merge and in logic of 'AntlrGrammarComparator', comparisonFragment, and 'AntlrGrammarComparatorTest' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-20 10:01:06 +02:00
Sebastian Zarnekow
51bf8f2298 Merge pull request #704 from eclipse/sz/bug480118 
[480118] Fixed regression in new grammar access fragment
 2015-10-20 09:54:38 +02:00
Stefan Oehme
095ea42b64 [wizard] fix UI tests on mac 2015-10-20 09:23:47 +02:00
Sven Efftinge
fc402980e4 Merge pull request #703 from eclipse/se/removed_workspace_config 
removed the concept of a workspace config. A resource set is always built from the scope of a project (module in IDEA)
 2015-10-20 09:12:15 +02:00
Moritz Eysholdt
7cfe0838fc Fixed serialization problem of Xtext.xtext grammar 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-20 00:57:58 +02:00
Moritz Eysholdt
ba31590e76 [serializer] several fixes 
- pass ParserRule-Parameters to Action-based contexts
- fixed an issue with constraint names that could cause duplicate 
  Java method names in the Semanitc Sequencer
- improved names of serialization contexts

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-19 23:55:47 +02:00
Sebastian Zarnekow
b870a30ae6 [480118] Fixed regression in new grammar access fragment 
Not all valid java identifiers are valid in Antlr
action contexts.
 2015-10-19 18:25:30 +02:00
Stefan Oehme
5f28f53828 fix exported packages for content assist parser 2015-10-19 17:18:51 +02:00
Stefan Oehme
1c750ea53e [wizard] fix test expectations 2015-10-19 17:13:13 +02:00
Stefan Oehme
fce22b4f4f [wizard] removed the need for auto-inject in generated workflows 2015-10-19 17:10:06 +02:00
Stefan Oehme
5fdafadfb8 infer grammarUri from language name 
This removes the need to repeat the project name and src folder path in
the mwe2 workflow
 2015-10-19 17:08:38 +02:00
Stefan Oehme
702cc44d92 [wizard] remove old AntlrUiGeneratorFragment 2015-10-19 16:51:35 +02:00
Stefan Oehme
8e0e6dfe88 only tycho builds need generator dependencies in the exec-plugin 2015-10-19 16:49:18 +02:00
Sven Efftinge
3b0a871218 renamed some more workspaceConfig variables 2015-10-19 16:43:56 +02:00
Sven Efftinge
df6c204eb6 removed the concept of a workspace config. A resource set is always built from the scope of a project (module in IDEA) 2015-10-19 16:43:56 +02:00
Stefan Oehme
5d4ffe26ab [wizard] ecore model is always in model/generated 2015-10-19 16:35:50 +02:00
Christian Schneider
5106898fb2 Merge remote-tracking branch 'origin/master' into genFrag/grammarComparison 
Conflicts:
	plugins/org.eclipse.xtend.core/src/org/eclipse/xtend/core/GenerateXtend.mwe2
	plugins/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java

manually fixed
 2015-10-19 16:11:54 +02:00
Christian Schneider
fd63485f22 [xtext generator] refactored 'XtextAntlrGeneratorComparisonFragment' as requested in review 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-19 16:04:06 +02:00
Sven Efftinge
af23cd11aa Merge pull request #646 from eclipse/sz/idea_tests 
Updated IDEA version and fixed a issues in tests
 2015-10-19 15:18:09 +02:00
akosyakov
26f1003d38 Merge remote-tracking branch 'origin/master' into sz/idea_tests 
Conflicts:
	intellij/org.eclipse.xtext.core.idea.tests/src-gen/org/eclipse/xtext/serializer/idea/lang/SequencerTestLanguageElementTypeProvider.java
	intellij/org.eclipse.xtext.core.idea.tests/src-gen/org/eclipse/xtext/serializer/idea/parser/antlr/internal/PsiInternalSequencerTestLanguage.g
	intellij/org.eclipse.xtext.core.idea.tests/src-gen/org/eclipse/xtext/serializer/idea/parser/antlr/internal/PsiInternalSequencerTestLanguage.tokens
	intellij/org.eclipse.xtext.core.idea.tests/src-gen/org/eclipse/xtext/serializer/idea/parser/antlr/internal/PsiInternalSequencerTestLanguageLexer.java
	intellij/org.eclipse.xtext.core.idea.tests/src-gen/org/eclipse/xtext/serializer/idea/parser/antlr/internal/PsiInternalSequencerTestLanguageParser.java
 2015-10-19 13:04:12 +02:00
Christian Schneider
c1c81484b6 [xtext tests] Contributed initial draft of 'XtextAntlrGeneratorComparisonFragmentTest' 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>

Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
 2015-10-19 10:29:45 +02:00
Stefan Oehme
074aeaa4e9 reenable formatter for xbase/xtend 2015-10-19 10:08:36 +02:00
Stefan Oehme
b965158ac4 fix machine relative paths in parser/lexer 2015-10-19 09:52:48 +02:00
Stefan Oehme
36e5a95590 Merge remote-tracking branch 'origin/master' into so_ex_grammar_option 
Conflicts:
	plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend
	plugins/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.java
 2015-10-19 09:39:46 +02:00
Stefan Oehme
6b09a7c384 fix windows newline bug in code quality helper 2015-10-19 09:34:24 +02:00
Moritz Eysholdt
b76dcad4c4 Added a test case for a problem when serializing Xtext.xtext 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 18:34:34 +02:00
Moritz Eysholdt
c5f8c186e8 [serializer] improve support for parameterized rule calls 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:30:59 +02:00
Moritz Eysholdt
c3ddd09442 [serializer] removed non-API-methods from ISerializationContext 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
2ee177b976 [Serializer] renamed IContext to ISerializationContext and made it API 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
839ef90393 [JavaFormatting] set max line width to 140 chars 2015-10-16 17:02:56 +02:00
Moritz Eysholdt
d86e9e6442 hooked the FlattenedGrammarAccess before the serializer 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
4a27b82568 Added support for IContext to SerializerFragment2 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
cc3936bcf5 Migrate SerializerFragment2 to changes in serializer.analysis 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:54 +02:00
Moritz Eysholdt
8e07bfdca6 [serializer] introduce IContext 
Previously, the context was of type EObject which actually was a
ParserRule or assigned Action. 

This refactoring paves the road for more advanced contexts, such
as ParserRules with parameter values.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-10-16 17:02:53 +02:00
Stefan Oehme
68ccd1da1a migrate Xtend to new content assist generator 2015-10-16 16:51:25 +02:00
Stefan Oehme
42d984cc35 fixed merge issues 2015-10-16 16:30:56 +02:00
Stefan Oehme
6147a7b1ab Merge remote-tracking branch 'origin/master' into so_ex_grammar_option 
Conflicts:
	plugins/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
 2015-10-16 16:28:39 +02:00
akosyakov
d0900cbb24 Merge remote-tracking branch 'origin/master' into sz/idea_tests 
Conflicts:
	intellij/org.eclipse.xtext.idea/src/org/eclipse/xtext/idea/resource/VirtualFileURIUtil.xtend
	intellij/org.eclipse.xtext.idea/xtend-gen/org/eclipse/xtext/idea/resource/VirtualFileURIUtil.java
 2015-10-16 15:51:15 +02:00