Commit graph

4058 commits

Author SHA1 Message Date
Sebastian Zarnekow
912ac3b94c Merge branch 'master' into sz/ide_semantic_highlighting 2015-06-30 10:02:51 +02:00
Sebastian Zarnekow
4f7c158c3d Merge branch 'maintenance' 2015-06-30 09:12:37 +02:00
Sebastian Zarnekow
b95181bc3d Increase version number to 2.8.4 2015-06-29 23:36:11 +02:00
Sebastian Zarnekow
a28347cab6 Merge branch 'maintenance' into sz/merge_from_maintenance 2015-06-29 17:51:26 +02:00
akosyakov
0ceeea8e00 Merge remote-tracking branch 'origin/master' into
ak/removed_exported_objects_stub_based_index
2015-06-29 11:17:48 +02:00
Sven Efftinge
74d20c9542 Merge pull request #298 from eclipse/se/should_generate
Introduced IShouldGenerate as a platform independent hook, to suppress code generation.
2015-06-29 10:17:57 +02:00
akosyakov
1d08c9e7c4 Merge remote-tracking branch 'origin/master' into
ak/removed_exported_objects_stub_based_index

Conflicts:
	intellij/org.eclipse.xtend.idea/META-INF/plugin.xml
2015-06-29 10:12:04 +02:00
Sebastian Zarnekow
01b4dec328 [xtext][ide] Extract semantic highlighting to xtext.ide 2015-06-26 18:28:36 +02:00
Stefan Oehme
bcad9c649e Merge pull request #296 from eclipse/so_simpler_build_request
simplified build request by removing previousState
2015-06-26 11:06:33 +02:00
Stefan Oehme
a2ee57cfef Merge pull request #295 from eclipse/so_uri_util
add createFileUri(File) helper method
2015-06-26 11:06:22 +02:00
Sven Efftinge
933ab310cb Introduced IShouldGenerate as a platform independent hook, to suppress code generation. 2015-06-26 09:24:43 +02:00
Stefan Oehme
e74f62c48d Revert "[ide] moved semantic highlighting classes to IDE plug-in"
This reverts commit c1988552a5dfccfe44c4e9225bd1f9898fc3c05e.

Conflicts:
	plugins/org.eclipse.xtext.xbase.ui/build.properties
	plugins/org.eclipse.xtext.xbase.ui/src/org/eclipse/xtext/xbase/ui/DefaultXbaseUiModule.java
2015-06-26 09:22:07 +02:00
akosyakov
e4c37f91a2 [idea] Clean up, removed exported objects intellij based index
Change-Id: I7f314b7c9616f16c38af3c391b3f4c7d769d5215
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-06-25 16:47:37 +02:00
Stefan Oehme
c2b5d3affa add createFolderUri(File) helper method
makes sure that folder URIs end with a trailing slash, so that they can
be used with isPrefix(), resolve() and deresolve()
2015-06-25 15:56:38 +02:00
Stefan Oehme
34c4c0adac simplified build request by removing previousState 2015-06-25 15:43:37 +02:00
Jan Koehnlein
777d4d3100 [ide] moved semantic highlighting classes to IDE plug-in
Change-Id: I5be08fc0c9e7dd7222e47e8c74264060a28c3eaa
2015-06-25 15:23:12 +02:00
Sven Efftinge
799aa05e46 fixed failing test 2015-06-25 15:11:21 +02:00
Sven Efftinge
8e8a92deb1 fixed failing test 2015-06-25 15:07:56 +02:00
Sven Efftinge
83273f14ba [idea] fixed exceptions in parser tests 2015-06-25 14:30:24 +02:00
Sven Efftinge
21575e09ef [fix] for something I broke before… 2015-06-25 13:52:20 +02:00
Sven Efftinge
8029860e5a Make obtaining and creation of ChunkedResourceDescription with ResourceSet simpler and less prone to errors. 2015-06-25 11:57:12 +02:00
Sven Efftinge
f5e0c495fa Merge pull request #293 from eclipse/se/move_builder
moved incremental builder to org.eclipse.xtext.build
2015-06-25 11:46:35 +02:00
Sven Efftinge
7c4685aca6 moved incremental builder to org.eclipse.xtext.build
moved chunked resource descriptions to org.eclipse.xtext.resource
made container manager impls aware of projectdescription
2015-06-25 09:30:59 +02:00
akosyakov
96f531cad9 [idea] Added extensions points to register packages, resource factories
and resource service providers

Change-Id: I92c6072f2853ee546e04e0bf8129e17caf7959c0
Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
2015-06-24 14:22:37 +02:00
Sven Efftinge
f97ea455ac [builder] introduced chunked resource descriptions
ChunkedResourceDescriptions allow to hold, persist and update ResourceDescriptions on a per project/library basis. 

A corresponding project config and container manager allow to use this structure for scoping purposes.
2015-06-23 17:12:10 +02:00
Stefan Oehme
aa6e71a3c8 fixed types, removed API only used in tests 2015-06-23 09:46:35 +02:00
Stefan Oehme
4f4f445dd6 simplified DefaultTraceURIConverter 2015-06-23 07:58:06 +02:00
Stefan Oehme
181fbfc055 Merge remote-tracking branch 'origin/master' into so/incremental_build
Conflicts:
	intellij/org.eclipse.xtend.idea.tests/src/org/eclipse/xtend/idea/autobuild/MultiModuleTest.xtend
2015-06-22 15:12:43 +02:00
Stefan Oehme
d6e434a67a WorkspaceConfigProvider continued 2015-06-22 15:07:32 +02:00
Miro Spönemann
28f1dacd21 [web] Bug 470517: don't create proposals for unassigned terminal rules
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-06-22 11:44:56 +02:00
Miro Spönemann
186c83e84c [web] Wrote comments, improved UpdateDocumentService API
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-06-22 11:01:20 +02:00
Stefan Oehme
7b1f77a597 Merge remote-tracking branch 'origin/master' into so/incremental_build
Conflicts:
	plugins/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF
2015-06-22 10:37:43 +02:00
Stefan Oehme
2c95fb52f9 Introduce WorkspaceConfig as a top level concept
- Xtend no longer needs special handling in the standalone compiler
- Standalone Singletons (WorkspaceConfigProvider, OutputConfigurationProvider) replaced with ResourceSet adapters
- Tracing Infrastructure uses the new source folder information instead of relying on platform:/resource URIs
2015-06-22 10:33:33 +02:00
Sebastian Zarnekow
aafad628c2 Regenerated testlanguages 2015-06-19 11:18:22 +02:00
Sebastian Zarnekow
aa18dadaf8 Merge branch 'master' into jk/idea_autobuild 2015-06-19 11:06:49 +02:00
Jan Koehnlein
c13cb800f4 [ide] added IImageDescription/Provider APIs
Change-Id: I099a4bdcd1236f2e8637571478c3df39a57c0f75
2015-06-18 11:05:38 +02:00
Sven Efftinge
99176b03bc [builder] moved AbstractIncrementalBuilder test to xtext.junit4 2015-06-16 15:52:16 +02:00
Sven Efftinge
0e1357e592 [builder] removed unused properties 2015-06-16 15:20:49 +02:00
Sven Efftinge
a0e90526e0 [incremental builder / idea] several changes (see below)
- moved StubBasedJvmTypeProvider to xtext.idea, 
- added support for handling java changes, 
- removed usage of LanguageAccess (deleted XtextLanguages), 
- [incremental builder] added externalDeltas to process but not load, changes from upstream modules or java changes.
- [java-lang] added ISetup
2015-06-16 11:48:39 +02:00
Sven Efftinge
d5a2c348c2 [java lang] fixed junit deps 2015-06-15 14:36:25 +02:00
Miro Spönemann
40002ebf74 [web] Moved generic content assist implementation to xtext.ide project and created xbase.ide project
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-06-15 10:29:29 +02:00
Sven Efftinge
86c4ca76ff [builder] some more tests which now use in-memory file system. Some refactorings and simplifications of indexer. 2015-06-11 17:17:13 +02:00
Sebastian Zarnekow
b3797850bf Code clean-up 2015-06-10 17:16:55 +02:00
Sebastian Zarnekow
8c5985ea29 Refined IGenerator infrastructure:
- Introduced IGenerator2 with proper before / after contracts
  Clients of the IGenerator may process the code gen in parallel
  and need before and after to prepare the resource set
- Introduced IFileSystemAccess2 which implements all existing
  extension intf of IFileSystemAccess and is documented to be
  not an API that is to-be-implemented but provided thus new
  methods can be added later.

Eliminated most of the code from XtendParallelBuilderParticipant.
2015-06-10 17:16:53 +02:00
Moritz Eysholdt
6aa392bf19 [serilizer] fixed two bugs spotted by findbugs
- fixed GenericSyntacticSequencer
- didn't modify behaviour of GrammarConstraintProvider to avoid 
  regressions; I'd rather deprecate the GrammarConstraintProvider.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-06-10 15:54:07 +02:00
Sven Efftinge
f8a5ca0f6d [idea] auto builder exposes resourceDescriptions 2015-06-05 10:22:06 +02:00
Karsten Thoms
6892cd7b5d Update DefaultDeclarativeQualifiedNameProvider.java
Typo
2015-06-05 09:55:22 +02:00
Sven Efftinge
1ca974821f [idea] introduced URIHandler that works with VirtualFileSystem and Documents 2015-06-04 15:07:20 +02:00
Sven Efftinge
26675d73e7 [idea / builder] refactorings in incremental builder, and idea.
- made standalone builder agnostic of java.io.File (not finished),
- introduced URI based File system access
- changed how resourcesets are created, they use module as classpathuricontext

Signed-off-by: Sven Efftinge <sven.efftinge@itemis.de>
2015-06-03 10:28:49 +02:00
Sven Efftinge
68c559e7e4 Merge pull request #262 from eclipse/se/bug469069
[469069] fixed NPE
2015-06-02 10:36:40 +02:00