sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ls/resourceAccess] fail if the resource set is null

Browse source 
Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>
This commit is contained in:
Anton Kosiakov 2017-06-18 12:03:17 +02:00
parent 2cfbea4021
commit 2782bd4e8c
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.xtend
View file

@ -25,11 +25,10 @@ class WorkspaceResourceAccess implements IResourceAccess {
override <R> readOnly(URI targetURI, IUnitOfWork<R, ResourceSet> work) {
return workspaceManager.doRead(targetURI) [ document, resource |
val resourceSet = resource?.resourceSet
if (resourceSet === null) {
if (resource === null) {
return null
}
return work.exec(resourceSet)
return work.exec(resource.resourceSet)
]
}

9
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/findReferences/WorkspaceResourceAccess.java
View file

@ -31,15 +31,10 @@ public class WorkspaceResourceAccess implements IReferenceFinder.IResourceAccess
public <R extends Object> R readOnly(final URI targetURI, final IUnitOfWork<R, ResourceSet> work) {
final Function2<Document, XtextResource, R> _function = (Document document, XtextResource resource) -> {
try {
ResourceSet _resourceSet = null;
if (resource!=null) {
_resourceSet=resource.getResourceSet();
}
final ResourceSet resourceSet = _resourceSet;
if ((resourceSet == null)) {
if ((resource == null)) {
return null;
}
return work.exec(resourceSet);
return work.exec(resource.getResourceSet());
} catch (Throwable _e) {
throw Exceptions.sneakyThrow(_e);
}

2
org.eclipse.xtext/src/org/eclipse/xtext/findReferences/IReferenceFinder.java
View file

@ -45,7 +45,7 @@ public interface IReferenceFinder {
* Provides safe read access to a resource set for searching local references or references in a demand-created or
* shared resource set.
*
* Return `null` if a resource set cannot be provided for the given target URI.
* Return <code>null</code> if a resource set cannot be provided for the given target URI.
*/
interface IResourceAccess {
<R> R readOnly(URI targetURI, IUnitOfWork<R, ResourceSet> work);