Commit graph

3830 commits

Author SHA1 Message Date
Dennis Huebner
f706946f5c [mvn] add some more modules
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-04-10 17:50:50 +02:00
Moritz Eysholdt
63c142641e Merge pull request #146 from eclipse/mey/text_region_access_improvements
text region access improvements
2015-04-10 17:25:09 +02:00
Dennis Huebner
3a1b714dd8 Merge branch 'maintenance' 2015-04-10 16:13:52 +02:00
Dennis Huebner
6ee253a101 [releng] increased version 2.8.2 -> 2.8.3
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-04-10 16:08:46 +02:00
Moritz Eysholdt
d3747b982f [formatter] allow access to regions representing EObjects
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-10 16:06:56 +02:00
Moritz Eysholdt
c5b88abc30 [formatter] avoid names such as 'gap' and 'token'
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-10 16:06:53 +02:00
Moritz Eysholdt
3a220ef882 [formatter] treat grammar elements as EObjects
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-10 16:06:51 +02:00
Moritz Eysholdt
9c351f2c74 [formatter] moved IText[Segment|Replacement] to package regionaccess
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-10 16:06:48 +02:00
Moritz Eysholdt
bf0b1e1927 [formatter] moved static methods into interface
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-10 16:06:45 +02:00
Moritz Eysholdt
e2d7b87c25 [formatter] introduce API to construct ITextRegionAccess instances
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-10 16:06:43 +02:00
Dennis Huebner
a9c98c1acc [mvn] Added first tycho configurations
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-04-10 11:08:29 +02:00
Moritz Eysholdt
4b53996015 [453440][formatter2] hook up serializer
https://bugs.eclipse.org/bugs/show_bug.cgi?id=453440


Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-09 15:31:02 +02:00
Moritz Eysholdt
258912951a [serializer] exclude leading whitespace/comments from datatype tokens
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-09 15:28:01 +02:00
Sebastian Zarnekow
7b26ff4c25 Merge pull request #131 from eclipse/maintenance
Merge fixes from maintenance into master
2015-04-08 13:22:00 +02:00
Moritz Eysholdt
c9358c68c0 [formatter] more preconditions to track down AFE in TextEdit.<init>
https://bugs.eclipse.org/bugs/show_bug.cgi?id=461966


Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-08 10:14:08 +02:00
Sebastian Zarnekow
3df741e5d5 Merge pull request #129 from eclipse/sz/bug462917
[462917]: Removed broken template var resolver for Xtend
2015-04-08 08:33:40 +02:00
Sebastian Zarnekow
37e5776ebf Merge remote-tracking branch 'origin/maintenance'
Conflicts:
	features/org.eclipse.xtext.ui.feature/feature.xml
	plugins/org.eclipse.xtext.common.types.ui/.settings/.api_filters
	plugins/org.eclipse.xtext.ui/.settings/.api_filters
2015-04-07 18:11:11 +02:00
Sebastian Zarnekow
bffb8a494f [462917]: Removed broken template var resolver for Xtend
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=462917

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-04-07 17:58:51 +02:00
Sebastian Zarnekow
1d433e0997 [464029]: Fixed NPE in grammar editor
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=464029

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-04-07 15:45:38 +02:00
Jan Koehnlein
6ba8886988 [idea][builder] First shot at builder daemon
Change-Id: Ife8b7764ef64165d06172e779108bc6f68c661ba
Signed-off-by: Jan Koehnlein <jan.koehnlein@itemis.de>
2015-04-02 17:30:09 +02:00
Dennis Huebner
e10c7267dd Merge pull request #118 from eclipse/dh/Bug463794
[xtext] Moved copy fully initialized flag logic to EcoreUtil2
2015-04-02 16:58:47 +02:00
Dennis Huebner
2bcadf1893 [xtext] Moved copy fully initialized flag logic to EcoreUtil2
https://bugs.eclipse.org/bugs/show_bug.cgi?id=463794

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-04-02 15:54:20 +02:00
Sven Efftinge
8c7a132629 Derived state error handling
don’t recomputed on error, but store exception in diagnostic (see also https://bugs.eclipse.org/bugs/show_bug.cgi?id=458620#c2)

Signed-off-by: Sven Efftinge <sven.efftinge@itemis.de>
2015-04-02 14:55:20 +02:00
Sebastian Zarnekow
4d4242890f [460696]: Fixed genmodel references in workflow files
Change-Id: Ie1e66ce29feebfe9bfbfecf1f479f2b7701f6e2f
2015-03-31 14:55:06 +02:00
Sebastian Zarnekow
f0845522a1 [460696]: Fixed erroneous genmodel declaration
Moved Xtext.ecore and Xtext.genmodel to a folder
org/eclipse/xtext which is not a source folder but
a model folder.

Change-Id: I6e5fea5f34bf3e52a36c59099162e20e1783fb38
Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-29 14:48:02 +02:00
Stefan Oehme
4c165cf94a [gradle] don't skip optional dependencies for maven central 2015-03-27 21:07:28 +01:00
Moritz Eysholdt
51aa2d4c5d [formatter] improved fix for bug 461033: CFE in HiddenRegionFormatting
The original fix
https://github.com/eclipse/xtext/commit/9f4514d13120df237e0accf42924c
resolved the symptomps of the problem, but the actual cause was a
wrongly constructed TextRegionAccess.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=461033

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-26 18:17:44 +01:00
Moritz Eysholdt
caef8f0574 Merge pull request #93 from eclipse/maintenance
Merge all fixes from 'maintenance' into 'master'
2015-03-26 18:11:54 +01:00
Moritz Eysholdt
61b5fb8b24 Merge pull request #88 from eclipse/mey/maintenance_serializer_node_model
[serializer] use node model even for rules without assignment
2015-03-26 16:37:59 +01:00
Sebastian Zarnekow
97d3db2c43 Merge pull request #83 from eclipse/sz/bug463095
[463095]: Fixed accidentally ignored OperationCancelErrors
2015-03-26 13:45:03 +01:00
Moritz Eysholdt
d1fa1237b6 [serializer/bug463196] use node model even for rules without assignment
This fixes a bug that caused the SyntacticSequencer to not consult the
node model if a serialized rule doesn't have any assignments but only an
action.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=463196

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-26 13:43:54 +01:00
Sebastian Zarnekow
c999e65666 [462486]: Fixed bogus grammar validation
Terminal fragments cannot shadow keywords

see https://bugs.eclipse.org/bugs/show_bug.cgi?id=462486

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-26 09:27:38 +01:00
Stefan Oehme
f44134a9e8 [gradle] infer some external dependencies from manifest
can now replace most dependencies in the intellij projects with plugin
project dependencies
2015-03-25 17:29:41 +01:00
Sebastian Zarnekow
69cfb5b65a [463095]: Fixed accidentally ignored OperationCancelErrors
Active annotation processors used to swallow all cancellation
information.

see https://bugs.eclipse.org/bugs/show_bug.cgi?id=463095

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-25 16:24:48 +01:00
Dennis Huebner
ebfb139a23 [misc] Removed deprecated junit3 bundles
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-25 08:37:28 +01:00
Dennis Huebner
5d4ad53ade Merge branch 'maintenance' 2015-03-24 15:10:02 +01:00
Dennis Huebner
56b19a80f0 [releng] Version update: 2.8.1 -> 2.8.2
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-24 14:58:44 +01:00
szarnekow
72f9e1c9e9 [461764]: Fixed wrongly propagated exception
The IResourceValidator is not supposed to throw a platform
specific cancellation exception but should wrap it in an
OperationCanceledError instead.

see https://bugs.eclipse.org/bugs/show_bug.cgi?id=461764

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-23 10:44:28 +01:00
szarnekow
3203c40ef2 [461764]: Fixed wrongly propagated exception
The IResourceValidator is not supposed to throw a platform
specific cancellation exception but should wrap it in an
OperationCanceledError instead.

see https://bugs.eclipse.org/bugs/show_bug.cgi?id=461764

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-23 09:13:36 +01:00
Moritz Eysholdt
a0c761ede8 Merge pull request #65 from eclipse/mey/bug461966
[formatter] more preconditions to track down AFE in TextEdit.<init>
2015-03-20 14:20:53 +01:00
Moritz Eysholdt
bf5b94fe66 [serializer] fixed Bug 461470: IAE in TextReplacerContext.withReplacer
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-20 11:50:45 +01:00
Moritz Eysholdt
241c48e413 [formatter] more preconditions to track down AFE in TextEdit.<init>
https://bugs.eclipse.org/bugs/show_bug.cgi?id=461966


Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-20 11:34:26 +01:00
Miro Spönemann
b580bfa3d4 [xbase] Bug 462172: Use IContextualOutputConfigurationProvider to include project-specific settings
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-03-20 11:21:51 +01:00
Moritz Eysholdt
e9f7ebde5f [serializer] bug 462536: deprecate GenericSemanticSequencer
This also changes the just-in-time-binding for ISemanticSequencer from
GenericSemanticSequencer to BacktrackingSemanticSequencer. I'm not
expecting this it have an impact because the RuntimeModule overrides
this binding for ISemanticSequencer

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-20 11:21:41 +01:00
Dennis Huebner
d2c97c1038 [releng] Prepared local build ant script for public usage
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-20 11:20:24 +01:00
Sven Efftinge
4ea2f15991 [bug 461761] fixes for storage loaded resources:
1) don't collect imported constants
2) don't use conrreteSyntaxName for operators

Signed-off-by: Sven Efftinge <sven.efftinge@itemis.de>
2015-03-20 11:18:55 +01:00
Sebastian Zarnekow
0a9f666a88 [461939]: Fixed performance problem with Strings.countLines
Instead of using countLines with a substring, the start and endOffset
an be passed as an argument to the methods that deal with line
counting.

Signed-off-by: szarnekow <Sebastian.Zarnekow@itemis.de>
2015-03-20 11:17:38 +01:00
Moritz Eysholdt
dbc9d8f003 [serializer] fixed Bug 461470: IAE in TextReplacerContext.withReplacer
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-20 11:13:45 +01:00
Miro Spönemann
814b12daca Merge pull request #59 from eclipse/msp/bug462172
[xbase] Bug 462172: Avoid "Type is already defined" errors
2015-03-19 16:50:36 +01:00
Miro Spönemann
03e68ce930 [xbase] Bug 462172: Use IContextualOutputConfigurationProvider to include project-specific settings
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-03-19 14:16:28 +01:00