Skip to content

fix: load model when loading model associations. #1120

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
Apr 29, 2025
Merged

fix: load model when loading model associations. #1120

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
3 changes: 3 additions & 0 deletions ...xt/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyModelAssociationsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.eclipse.xtext.resource.persistence.StorageAwareResource;

import com.avaloq.tools.ddk.xtext.modelinference.InferredModelAssociator;
import com.avaloq.tools.ddk.xtext.resource.ResourceSetOptions;


/**
Expand Down Expand Up @@ -69,6 +70,8 @@ private void ensureAssociationsLoaded() {
if (resource.eAdapters().remove(this)) {
DirectLinkingResourceStorageLoadable loadable = (DirectLinkingResourceStorageLoadable) ((DirectLinkingResourceStorageFacade) resource.getResourceStorageFacade()).getOrCreateResourceStorageLoadable(resource);
try {
// the associations are mappings from AST model elements to inferred model elements (and back) so we cannot skip loading the model.
ResourceSetOptions.setSkipModel(resource.getResourceSet(), false);
Copy link
Copy Markdown
Member

@rubenporras rubenporras Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we log a warning?

Copy link
Copy Markdown
Collaborator Author

@andrewL-avlq andrewL-avlq Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. Isn't this just a load that was missed when the 'skipModel' option was added?

Copy link
Copy Markdown
Member

@rubenporras rubenporras Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but that is a programming error, isn't it?

loadable.loadIntoResource(resource, ResourceLoadMode.ONLY_ASSOCIATIONS);
} catch (IOException e) {
throw new WrappedException(e);
Expand Down