Commit graph

1532 commits

Author SHA1 Message Date
Moritz Eysholdt
fde04fa884 [formatter] fixed broken test
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-05-01 11:17:41 +02:00
Moritz Eysholdt
2ef30dd4a7 [formatter] made TextRegionAccessToString's output more readable
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-30 17:43:26 +02:00
Moritz Eysholdt
1910d44964 Merge pull request #188 from eclipse/me/formatter4
[formatter] made mechanism for finding text regions more powerful
2015-04-24 14:02:05 +02:00
Stefan Oehme
283a6f783e Merge pull request #190 from eclipse/maintenance
Merge maintenance
2015-04-24 10:52:00 +02:00
Moritz Eysholdt
ad6ba6d606 [formatter] made mechanism for finding text regions more powerful
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-24 10:33:17 +02:00
Stefan Oehme
ec0370152a [jenkins] disable m2e indexing 2015-04-24 09:57:05 +02:00
Moritz Eysholdt
7dc4339d7f [464867] fixed 'ITextRegionAccess cannot handle duplicate keywords'
https://bugs.eclipse.org/bugs/show_bug.cgi?id=464867

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-21 16:17:53 +02:00
Moritz Eysholdt
4296349f3e [465003] fixed 'ITextRegionAccess cannot handle duplicate terminal rule'
https://bugs.eclipse.org/bugs/show_bug.cgi?id=465003

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-21 16:17:51 +02:00
Moritz Eysholdt
fe2d242e2e [regionAccess] implemented regionsForFeatures()
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-21 16:17:48 +02:00
Moritz Eysholdt
303287508f [formatter] renamed test
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-21 16:17:45 +02:00
Moritz Eysholdt
0025d38d88 [formatter] fix ITextRegionAccess#getInvokingGrammarElement(EObject)
Make sure this method returns the same grammar element, no matter
whether the text region access has been constructid via 
serializer or node model.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-20 15:42:33 +02:00
Sebastian Zarnekow
794ac2268e Merge pull request #12 from kthoms/bug443574-fsa-exists
[bug 443574] Added interface IFileSystemAccessExtension4
2015-04-20 08:29:42 +02:00
Sebastian Zarnekow
148c248c78 Merge pull request #162 from eclipse/sz/mergeaction
Merge fixes from maintenance into master
2015-04-17 13:53:34 +02:00
Sebastian Zarnekow
d58b8213f9 Merge branch 'maintenance' 2015-04-17 11:09:19 +02:00
Moritz Eysholdt
30a3737871 [formatter/serializer] added integration test
This particularly tests the changes introduced by 
37ab5c4965c9920dd625dee77b4a6d5a64bf7638

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-04-17 09:54:07 +02:00
Stefan Oehme
cf31de0cce [idea] mavenized the projects needed to compile&test idea 2015-04-16 13:47:54 +02:00
Karsten Thoms
deb0d72a67 [443574] Add IFileSystemAccessExtension4 with method isFile
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2015-04-16 08:25:29 +02:00
Dennis Huebner
8e042ce1a8 [mvn] Fixed test projects versions
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-04-13 18:39:35 +02:00
Stefan Oehme
99b3a3120e [idea] turn on gradle dependency management 2015-04-13 10:31:21 +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
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
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
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
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
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
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
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
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
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
7d84411ed3 [serializer] excluded tests from old GenericSemanticSequencer
...because BacktrackingSemanticSequencer can handle them

Change-Id: I83ac829a43a5623dbb38e8086ab462c89e7e0a2d
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-19 10:21:51 +01:00
Dennis Huebner
fb28728774 [gradle] Incremented gradle build version. Fixed test projets versions
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 16:53:54 +01:00
Dennis Huebner
5fd1c8ce5a [releng] Increase version to 2.9.0
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 14:14:58 +01:00
Dennis Huebner
4fb78f56a3 [releng] increase version to 2.8.0 -> 2.8.1
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-18 11:59:35 +01:00
Sebastian Zarnekow
c3d3682f50 [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-17 16:17:47 +01:00
Moritz Eysholdt
7c13f76a91 [serializer] bugfix: never break datatype rules into individual tokens
Change-Id: I25a55027dc588b41b70a4cb94ca2b81282c31f4e
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-03-16 11:03:17 +01:00
Dennis Huebner
ed8d51db6f [emf] More changes for switching from 2.11 to 2.10.2 2015-03-05 10:24:50 +01:00
Dennis Huebner
7039180d89 [emf] Set lower bound for EMF to 2.10.2
Change-Id: I5254556239ae64241d4b06f90db546dad03f95bd
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-03-04 16:32:45 +01:00
akosyakov
54792b4bf7 [intellij] Added parsing tests based on Xtext grammar language
Change-Id: Ie2b07846e80deb7385093aa4278e20d7df8a3ecb
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-03-02 16:55:13 +01:00
akosyakov
1b413152e9 [intellij] Added assignments, antlr and datatypesrules parsing tests
Change-Id: I60d75f6e3d4271bda840daff6ff1735e7874edc6
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-03-02 16:55:13 +01:00
Stefan Oehme
a1191fd1ed improved LoggingTester API, implement without reflection
Change-Id: Ic955ad5c8d614b9f079da026aa1017593f26cf68
2015-02-27 11:43:57 +01:00
Sebastian Zarnekow
17cf59cd85 [xbase][resources] Rename method to avoid ambiguities
Renamed newly introduced method load(ResourceStorageLoadable)
to loadFromStorage to avoid ambiguity with load(null)

Change-Id: If1f14b018b246968e576bb690be2417f771fd923
2015-02-26 17:45:41 +01:00
Miro Spönemann
f01f6a9712 Fixed links to documentation according to renaming of Markdown files
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-02-26 09:36:40 +01:00
Jan Koehnlein
c410c8857d Bug 460269 [editor] open generated file doesn't work for multi-type Xtend files with comment as first statement
Trace merger tests and minor fix

Change-Id: I4d9403787c7799ac10241c6595b8d92c7494c183
2015-02-24 13:30:19 +01:00