Commit graph

522 commits

Author SHA1 Message Date
Lieven Lemiengre
522fbcfca6 Allow customisation of allRules creation in AbstractInternalAntlrParser
Signed-off-by: Lieven Lemiengre <lieven.lemiengre@sigasi.com>
2016-12-14 11:45:51 +01:00
Karsten Thoms
365e8b8def Merge pull request #192 from eclipse/kth/refactorings
Some minor refactorings
2016-12-12 15:02:39 +01:00
Karsten Thoms
b7ec4d2584 Use ToStringBuilder for toString
Objects#toStringBuilder is marked for removal and its replacement
MoreObjects#toStringBuilder is only available from Guava 18+

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-12 13:17:04 +01:00
Miro Spönemann
ca592b03ac Merge pull request #178 from tivervac/patch-1
Fixed #177: typo in AbstractFormatter2.java
2016-12-06 12:13:23 +01:00
Karsten Thoms
5c04979dd2 Replace deprecated Objects.ToStringHelper by MoreObjects.ToStringHelper
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-06 00:19:33 +01:00
Karsten Thoms
79c3eab77c [#5] Changes to .classpath generated by Buildship import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-30 10:00:21 +01:00
Karsten Thoms
13ba597bc4 Merge branch 'master' of git@github.com:eclipse/xtext-core 2016-11-29 15:33:08 +01:00
Karsten Thoms
c4ba710623 Classpath inclusion/exclusion rules changed by buildship import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-29 15:32:57 +01:00
Christian Dietrich
7377d51f13 Merge pull request #182 from eclipse/kth/umbrella-issue3-gradle-composite
Gradle composite
2016-11-29 11:37:19 +01:00
Karsten Thoms
8c381f8d59 Gradle composite
see https://github.com/eclipse/xtext-umbrella/issues/3

Remove org.eclipse.buildship.core.prefs
Files are generated on Gradle project import or by Oomph setup

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-28 14:41:08 +01:00
Karsten Thoms
c637df9451 Gradle composite
connection.project.dir changed to composite build location in new
umbrella project
value 'containers' added by Buildship

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-25 08:49:49 +01:00
Akos Kitta
64010edcfc Fixed issue in URI based file system access when checking missing files.
A FNFE was thrown instead of returning with false.

Signed-off-by: Akos Kitta <kittaakos@gmail.com>
2016-11-21 23:04:27 +01:00
Titouan Vervack
8d2529dc82 Fixed typo in AbstractFormatter2
Signed-off-by: Titouan Vervack <tivervac@gmail.com>
2016-11-20 12:55:56 +01:00
Moritz Eysholdt
fa6b2f5849 make DefaultLinkingService#getLinkedObjects() easier to debug
To set a breakpoint that hits when a cross reference can not be resolved
it should not be necessary to use a conditional breakpoint. A regular
breakpoint should be enough.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-11-09 17:33:21 +01:00
Christian Dietrich
072bf6ecbb [#170] [Formatter2] Typo in the AbstractEObjectRegion class
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-11-09 08:22:32 +01:00
Sven Efftinge
b97a5ed574 Get rid of some warnings 💄 2016-11-08 11:52:48 +01:00
Miro Spönemann
b92f63bc54 eclipse/xtext#1080: Add name and description to generated poms
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-23 13:36:04 +02:00
Christian Schneider
5d472b86ca [xtext validation] added checks for missing or invalid '@Override' annotations in 'XtextValidator' as desired by #121, put the issue codes to 'XtextConfigurableIssueCodes' although the severity is not configurable (yet), added a corresponding test to 'XtextValidatorTest'
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-10-18 09:54:44 +02:00
Christian Schneider
eba5492719 [grammar] introduced annotations to parser, terminal, and enum rules paving the way for @Override annotations as desired by #121, updated generated + affected artifacts and tests
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-10-18 09:54:44 +02:00
Moritz Eysholdt
db03d9f7b8 [serializer/perf] produce diagnostics only on error
Don't always run the old ConcreteSyntaxValidator before serialization.
Instead, create diagnostics in the serializer only when serialization
fails.

see https://github.com/eclipse/xtext-core/issues/48

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-14 12:22:40 +02:00
Moritz Eysholdt
66b8ace522 [GrammarUtil/perf] make containing*() fast for misses
containingAssignment() and containingCrossReference() should return
null as fast as possible when there is no Assignemnt/CrossReference

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-14 12:22:13 +02:00
Moritz Eysholdt
d7f9373b95 [textRegionAccess/perf] don't call getLength() on ICompositeNodes
because on them it's a derived (expensive) value

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-14 12:22:13 +02:00
Moritz Eysholdt
d2bc2f52f1 [serializer/perf] don't generate events for unassigned parser rules
Because they're neither consumed by the old- nor the new formatter.
And they are not needed to generate text.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-13 19:30:55 +02:00
Moritz Eysholdt
053a1c5069 revert ef25bcbe4c, no performance increase 2016-10-13 19:30:55 +02:00
Moritz Eysholdt
bff7b4ec65 [serializer/perf] avoid redundant calls to .distanceToFinalStateMap()
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-13 19:30:55 +02:00
Miro Spönemann
bbda47b341 Fixed #122: Change default binding of IReferableElementsUnloader to GenericUnloader
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-13 11:21:04 +02:00
Miro Spönemann
e8682fbfd3 [serializer] Improved performance of bounds computation
Implemented new algorithms for computing upper and lower bounds in GrammarConstraintProvider

Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-11 15:38:09 +02:00
Moritz Eysholdt
ef25bcbe4c [serializer/performance] use an identity string to compare NFAs/PDAs. 2016-10-11 13:54:46 +02:00
Moritz Eysholdt
6c71e90449 [serializer/performance] use ArrayListMultimap
This avoids calls to hashCode() .equals() on values.
2016-10-11 13:54:46 +02:00
Moritz Eysholdt
80a6f9fcf8 [serializer/performance] avoid redundant grammar analysis 2016-10-11 08:49:25 +02:00
Moritz Eysholdt
e90d21797e fixed eclipse/xtext-eclipse#100 serializer/performance fix regression
This disables a check with a legacy impl. 
The check should never be active at runtime.
Unfortunately, the legacy impl has a bug when a node's parent is null.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 20:33:52 +02:00
Moritz Eysholdt
d59869f704 [serializer/performance] avoid redundant traversal of node model
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 20:18:44 +02:00
Moritz Eysholdt
c683d48d8b [serializer/performance] never resolve cross references
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 20:16:47 +02:00
Moritz Eysholdt
88b34d57c8 [serializer] fixed a NPE
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 15:26:40 +02:00
Moritz Eysholdt
423780cf3e fix eclipse/xtext-extras#63 broken serializer tests
this is a fixup for cb9981d14cc279cb0433b63c9c88f8ebf20ba739

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-07 14:21:12 +02:00
Moritz Eysholdt
93ca0d1487 [serializer/performance] fixed broken hashCode() function
'parameterValues' was usually emptySet() 
so parameterValues.hashCode() returned 0 
which caused this hashCode() method to return 0

nothing but collisions when used as key in maps! duh!

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-06 23:30:40 +02:00
Moritz Eysholdt
17a85f155d [serializer/performance] improved performance of node model traversal
this change deprecates EmitterNodeIterator since it relies on 
expensive calls to iNode.getOffset(). 

Furthermore, it simplifies the implementation because 
- lazy behavior does not provide advantages here
- 'allowHidden' and 'passAbsorber' were always false.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-10-06 16:46:52 +02:00
Sven Efftinge
7c51af4e58 [lsp] use language specific proposal acceptor, added SerializableEObjectDescriptionProvider hook 2016-09-27 01:17:00 +02:00
Moritz Eysholdt
6bbad4f142 fixed #14: [formatter2] honor FormatterRequest.allowIdentityEdits
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-09-25 23:15:59 +02:00
Moritz Eysholdt
7c7e1f88b7 fixed #97 [Formatting2/auto-wrap] never wrap preceding lines
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-09-25 22:50:45 +02:00
Lorenzo Bettini
4de451dd36 Merge pull request #104 from kthoms/kth/issue5
[#5] Ignore optional compile problems on *-gen source folders
2016-09-23 17:15:56 +02:00
Karsten Thoms
312e0af4d6 [#5] Ignore optional compile problems on *-gen source folders
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-09-23 15:51:18 +02:00
Karsten Thoms
9b0947fe62 [format] Streamlined whitespaces
Consistent use of tabs instead of spaces
Use single whitespace between brackets

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-09-14 16:00:10 +02:00
Christian Dietrich
73fd155426 [445175] Missing error message on invalid alternative assignments with cross references
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-09-08 07:57:30 +02:00
Sven Efftinge
1da41dec11 More stable ordering for ResourcedescriptionData 2016-09-01 08:19:22 +02:00
Sven Efftinge
1c120fb1a0 Stable ordering for Resourcedescriptiondata’s resourcedecriptions 2016-08-30 23:04:43 +02:00
Christian Dietrich
07d3a5a73b readded accidentally removed constructor (this time with correct behaviour)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-29 21:24:40 +02:00
Sven Efftinge
1cf171157a readded accidentally removed constructor 2016-08-29 08:48:14 +02:00
Sven Efftinge
6ab778f839 restored accidentally removed constructor 2016-08-26 14:49:09 +02:00
Sven Efftinge
9b9537b4b6 [LSP] fixed some issue with URI normalization 2016-08-26 12:02:25 +02:00
Christian Dietrich
6858354b19 [482110] fixed AbstractFormatter2.shouldFormat
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-18 14:51:14 +02:00
Karsten Thoms
d7efc23796 [478377] Add null guard
Test call findNodesForFeature with null feature

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-16 22:21:44 +02:00
Moritz Eysholdt
79118e564d Merge pull request #72 from eclipse/me_xtextresource
introduce XtextResource#setEntryPoint(ParserRule)
2016-08-12 13:46:25 +02:00
Christian Dietrich
625803b3c9 [435441] Added JavaDoc to CheckType Enum
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-12 13:40:49 +02:00
Moritz Eysholdt
0745d5a43d [#16, XtextResource] introduce setEntryPoint(ParserRule)
This change allows to specify on XtextResource what ParserRule the
parser should be using as the entry point.

see https://github.com/eclipse/xtext-core/issues/16

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:49 +02:00
Moritz Eysholdt
927d574d96 [#16, partial-parser] On fully re-parse, keep the entry parser rule
When the partial parser does a full re-parse, it should use the same
entry parser rule that has been used during the last parse.

see https://github.com/eclipse/xtext-core/issues/16

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:48 +02:00
Moritz Eysholdt
9b43417e24 make grammar GrammarElementTitleSwitch more robust
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2016-08-11 15:35:46 +02:00
Christian Dietrich
49b9ff4e55 Do not collect EObjects in transient Features when calculating IdToEObjectMap for Serialization. Fixes #65
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-08-03 08:16:44 +02:00
Jan Koehnlein
c70555edd9 [ls] make ResourceServiceProviderServiceLoader non-static 2016-07-20 13:44:13 +02:00
akosyakov
9e5a63dfba [incremenalBuilder] filter URIs which are not handled by a corresponding
resourceServiceProivder
2016-07-12 16:11:43 +02:00
Christian Dietrich
db0c4628c0 fixed broken manifests
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-07-07 13:47:21 +02:00
Sven Efftinge
24dad56ff4 made testlanguages project generator work again 2016-07-07 11:31:14 +02:00
Miro Spönemann
950eb8ae74 Removed old Gradle integration prefs 2016-07-07 11:22:13 +02:00
Miro Spönemann
decf9b22aa Checked in project metadata based on Buildship 2016-07-07 10:19:04 +02:00
Christian Dietrich
f8e2ceabc2 fixed typo Errorneous Erroneous
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-06-23 09:18:19 +02:00
Sven Efftinge
2a2f5bec3e added empty TraceAsSmapInstaller back 2016-06-20 09:08:08 +02:00
Miro Spönemann
8ef5376742 Fixed some JavaDoc warnings 2016-06-15 16:39:35 +02:00
Miro Spönemann
0bc7f1fd20 Remove redundant .gitignore rules 2016-06-14 15:31:26 +02:00
Miro Spönemann
b612f2d437 Added generated code for package org.eclipse.xtext.build 2016-06-14 15:25:07 +02:00
Miro Spönemann
e1a4782403 Generated code 2016-06-14 09:45:31 +02:00
Miro Spönemann
96edcf48ae Removed buildship.core.prefs 2016-06-14 09:44:34 +02:00
Miro Spönemann
4270986cba Moved projects to root of repository 2016-06-14 08:30:25 +02:00