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

4276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stefan Oehme
162420e6a9 migrate xtext.ui.wizard to new wizard/generator infrastructure 2015-08-27 15:20:40 +02:00
Miro Spönemann
9cead7434d [generator] Reviewed PR #499 and refactored generator infrastructure 
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
 2015-08-26 16:24:22 +02:00
Stefan Oehme
03231b9828 Fix tycho build for xtext.xtext.generator 2015-08-26 13:33:43 +02:00
Dennis Huebner
ba3ecbfbeb [test] Reduce log output in InternalBuilderTest 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-26 11:50:02 +02:00
Dennis Huebner
f842995ad9 [misc] Move o.e.xtext.wizard->o.e.xtext.xtext.wizard. Fixed feature.xml 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-26 11:44:16 +02:00
Stefan Oehme
20cb460d31 Merge pull request #499 from eclipse/standalone_wizard 
XtextGenerator improvements and standalone wizard
 2015-08-26 00:08:09 +02:00
Stefan Oehme
4d326c1ed6 remove usage of deprecated API 2015-08-25 18:04:07 +02:00
Stefan Oehme
c51567861a fix antlr line joining on windows 2015-08-25 12:11:08 +02:00
Stefan Oehme
191beb7fdf Improved xtext.generator2 
- Replaced static state and parameters with dependency injection
- Migrated web and idea fragments to new infrastructure
- all file system access through outlets instead of java.io
 2015-08-25 10:50:38 +02:00
Dennis Huebner
bebd1287b8 [osgi] xtext.m2e and xtend.m2e can not be started 
Package uses conflict: Require-Bundle: org.eclipse.xtext.ui;
bundle-version="0.0.0"

Because m2e.maven.runtime exports com.google.inject 1.4 and we consume
juice 3 (com.google.inject 1.3.0), both package 1.3 and 1.4 were
accessible in org.eclipse.xtext.m2e.
The uses Directive in xtext.util for com.google.inject finally causes
the 'uses' diagnosis to fail.

Fixed the issue by changing from require bundle to package import.
Instead requiring the whole huge m2e.maven.runtime we import just the
two packages we need.

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-24 16:48:31 +02:00
Dennis Huebner
8e9faf9ee8 [osgi] Do not use versioned dependency to our bundles. 
Buckminster generates the version during build. 

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-24 15:57:19 +02:00
Dennis Huebner
82df7c12ce [tests] Failing test - changed expectation needs review Bug 475692 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-24 11:36:29 +02:00
Sebastian Zarnekow
61e2651e11 [263773] Trace to the original abstract element 2015-08-21 09:11:11 +02:00
Sebastian Zarnekow
f92e0d7195 [263773] Converted flattener to Xtend 2015-08-20 15:39:13 +02:00
Sebastian Zarnekow
8dca8a0596 [263773] More work on the grammar flattener 2015-08-20 14:29:59 +02:00
Sebastian Zarnekow
c9692da216 Merge branch 'master' into sz/xtext_grammar_enhancements 2015-08-20 14:13:25 +02:00
Sebastian Zarnekow
9eed650103 Removed ParseTreeConstructorFragment from test langs 
Only kept it for the cases where the PTC was tested
explicitly
 2015-08-20 10:54:10 +02:00
Sebastian Zarnekow
70ab3b2602 [263773] Further improvements to grammar flattener 2015-08-20 08:55:31 +02:00
Sebastian Zarnekow
039a7764c3 [263773] Support parameterized entry rules 2015-08-19 16:37:59 +02:00
Sebastian Zarnekow
8e1ed7da86 [263773] Continued with flattened grammar approach 2015-08-19 16:36:46 +02:00
Sebastian Zarnekow
07e55a6800 [263773] First steps towards flattened grammar 2015-08-18 16:52:08 +02:00
Sebastian Zarnekow
e37903ecb5 [263773] Allow qualified rule calls also with predicates 2015-08-18 09:30:23 +02:00
Sebastian Zarnekow
fb519c29fe Merge branch 'sz/bug394436' into sz/xtext_grammar_enhancements 2015-08-17 16:15:32 +02:00
Sebastian Zarnekow
d52b2b2731 [394436] Fixed URIs and added unit test 2015-08-17 16:09:03 +02:00
Sebastian Zarnekow
7fd786feed [263773] Test cases for context provider 2015-08-17 13:56:20 +02:00
Sebastian Zarnekow
05d60d9c53 [263773] Regenerated all languages 2015-08-14 17:19:42 +02:00
Sebastian Zarnekow
602e351922 [263773] Fixed bug related to fragments in OverriddenValueInspector 2015-08-14 16:05:52 +02:00
Dennis Huebner
2dcb254f50 [xtext][args] Added some helpful error messages 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-14 15:44:39 +02:00
Sebastian Zarnekow
a8df070d27 Merge pull request #473 from eclipse/sz/xtext_grammar_enhancements 
[263773] Xtext grammar enhancements
 2015-08-13 18:11:54 +02:00
Dennis Huebner
258476916e Merge pull request #475 from eclipse/dh-390789 
[tests][misc] Fixed remove Export Package. Reduced test execution time.
 2015-08-13 14:50:14 +02:00
Sebastian Zarnekow
98ee036c02 [263773] Validate rule names and discourage ‘super’ as a name for rules 2015-08-13 14:21:51 +02:00
Dennis Huebner
51feb032ba [tests][misc] Fixed remove Export Package. Reduced test execution time. 
ActiveAnnotationsProcessingInIDETest from 280s to 30s

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-13 13:46:27 +02:00
Sebastian Zarnekow
800c35080a [263773] Adjust named arguments in case of overrides 2015-08-13 13:22:54 +02:00
Sebastian Zarnekow
daada4dd08 [263773] Incorporated more review comments 2015-08-13 11:36:02 +02:00
Sebastian Zarnekow
fd0cf968e7 [263773] Removed unused rule from Xtext.xtext, made guards ‘usual’ expression 2015-08-13 11:28:42 +02:00
Sebastian Zarnekow
6627e289a7 [263773] Incorporated review comments 2015-08-13 11:28:40 +02:00
Sebastian Zarnekow
9572595662 [263773] Adjusted Xtext grammar content assist to support fragments and params 
Also fixed validation for wildcard fragment overrides
 2015-08-13 10:05:00 +02:00
Sebastian Zarnekow
5746bbb063 [263773] Fixed NodeModelUtils and XtextProposalProvider 2015-08-12 20:38:15 +02:00
Sebastian Zarnekow
7dc12ffa66 [263773] Regenerated xbase 2015-08-12 20:38:12 +02:00
Sebastian Zarnekow
d8bcdc40b0 [263773] Xtext grammar enhancements (tests src-gen) 
This commit contains the generated code for the tests.
 2015-08-12 17:51:07 +02:00
Sebastian Zarnekow
e6d3807b94 [263773] Xtext grammar enhancements (tests) 
This commit contains the test code for the
the new features without generated code
 2015-08-12 17:51:05 +02:00
Sebastian Zarnekow
9185cb9cca [263773] Xtext grammar enhancements (src) 
- Explicit rule calls and super rule calls
  - name=super::ID
  - name=Terminals::ID
  - feature=com::acme::MyLang::SomeRule
- Parser rule fragments
  - fragment DeclarationOwner:
      declarations+=Declaration+;
- Parameterized rule calls:
  - IdOrKeyword<AllowKeyword>:
      <AllowKeyword> ‘keyword’ | ID;

This commit contains the changes to the Xtext core
plugins without any changes to generated code.
 2015-08-12 17:51:00 +02:00
Sven Efftinge
1607cbf27f [idea] unify how we obtain virtual files for psi elements plus some other minor changes 2015-08-12 16:14:45 +02:00
Sven Efftinge
1f642242c2 [473621] IDEA / fix breakpoint behavior - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=473621 2015-08-12 11:33:03 +02:00
Dennis Huebner
c216c609ff [validation] Some minor fixes regarding PR #440 
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
 2015-08-12 10:07:21 +02:00
Sven Efftinge
2bb7fa7f6f Merge pull request #461 from eclipse/se/idea_builder_fixes 
[idea] fixed problem with deletion of folders not triggering events for its children, registered IndexedJvmTypeAccess for auto builder
 2015-08-07 18:45:52 +02:00
Sven Efftinge
6c42b0f6c4 [idea] fixed problem with deletion of folders not triggering events for its children, registered IndexedJvmTypeAccess for auto builder 2015-08-07 17:48:40 +02:00
Moritz Eysholdt
bba77e5591 [472592][idea] Implement DocumentationProvider 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-08-07 16:47:41 +02:00
Moritz Eysholdt
1ff3694546 [idea] fix IdeaGrammarSerializerTest 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
 2015-08-07 09:32:30 +02:00
Moritz Eysholdt
2d80c45669 Merge pull request #457 from eclipse/me/xtext_xtext_scoping 
[xtext.xtext] use IResourceDescription.Manager for scoping
 2015-08-06 15:52:53 +02:00