Skip to content

Fixed plugin crash and add libraries #117

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ private void setFile(@Nullable PsiFile psiFile) {
mainPanel.remove(previewComponent);
previewComponent = null;
}
if (weavePreviewComponent.isDisposed()) {
weavePreviewComponent = new WeavePreviewComponent(myProject);
}
previewComponent = weavePreviewComponent.createComponent();
mainPanel.add(previewComponent, PREVIEW_EDITOR);
weavePreviewComponent.open(psiFile);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class WeavePreviewComponent implements Disposable {
private WeaveTreeChangeListener listener;

private boolean pinned = false;
private boolean disposed = false;

public WeavePreviewComponent(Project project) {
inputsComponent = new InputsComponent();
Expand Down Expand Up @@ -268,6 +269,11 @@ public void dispose() {
outputComponent.dispose();
previewLogsViewer.dispose();
PsiManager.getInstance(myProject).removePsiTreeChangeListener(listener);
disposed = true;
}

public boolean isDisposed() {
return disposed;
}

public void runPreview() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,11 @@ public String[] getClasspath(Project project) {
}

public void loadClasspathInto(Module module, PathsList pathsList) {
final OrderEnumerator orderEnumerator = OrderEnumerator.orderEntries(module).withoutLibraries().withoutSdk();
final OrderEnumerator orderEnumerator = OrderEnumerator.orderEntries(module).withoutSdk();
//We add sources too as we don't compile the we want to have the weave files up to date
pathsList.addVirtualFiles(orderEnumerator.getSourceRoots());
pathsList.addVirtualFiles(orderEnumerator.getClassesRoots());
pathsList.addVirtualFiles(orderEnumerator.getAllLibrariesAndSdkClassesRoots());
}

public void checkClientConnected(Runnable onConnected) {
Expand Down
Loading