Skip to content

fix: keep parse result set while loading node model. #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewL-avlq merged 1 commit into from
Dec 19, 2025
Merged

fix: keep parse result set while loading node model. #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.eclipse.xtext.nodemodel.impl.SerializableNodeModel;
import org.eclipse.xtext.nodemodel.serialization.DeserializationConversionContext;
import org.eclipse.xtext.parser.ParseResult;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.resource.persistence.ResourceStorageLoadable;
import org.eclipse.xtext.resource.persistence.StorageAwareResource;

Expand Down Expand Up @@ -322,7 +323,8 @@ private void addFakeModel(final StorageAwareResource resource) {
protected void readNodeModel(final StorageAwareResource resource, final InputStream inputStream, final String content) throws IOException {
DeserializationConversionContext deserializationContext = new ProxyAwareDeserializationConversionContext(resource, content);
DataInputStream dataIn = new DataInputStream(inputStream);
SerializableNodeModel serializableNodeModel = new SerializableNodeModel(resource);
// use empty resource here so that we can leave the proxy node in place right up until the loaded model is set below.
SerializableNodeModel serializableNodeModel = new SerializableNodeModel(new XtextResource());
serializableNodeModel.readObjectData(dataIn, deserializationContext);
resource.setParseResult(new ParseResult(resource.getContents().get(0), serializableNodeModel.root, deserializationContext.hasErrors()));
}
Expand Down
4 changes: 0 additions & 4 deletions ...ols.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@ static List<EObject> uninstallProxyNodeModel(final Resource resource) {
result = proxyNode.idToEObjectMap;
}
}

if (resource instanceof XtextResource) {
((XtextResource) resource).setParseResult(null);
}
return result;
}

Expand Down