Skip to content
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

Fixing executing things on the right thread #122

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Fixing executing things on the right thread #122

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
9 changes: 6 additions & 3 deletions ...eave-plugin/src/main/java/org/mule/tooling/lang/dw/annotator/WeaveValidatorAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.mule.tooling.lang.dw.annotator;

import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.AnnotationBuilder;
import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.ExternalAnnotator;
import com.intellij.lang.annotation.HighlightSeverity;
Expand Down Expand Up @@ -88,11 +88,14 @@ public void apply(@NotNull AnnotationHolder holder, ValidationMessage[] errorMes
final WeaveLocation location = validationMessage.location();
final int startIndex = getValidIndex(location.startPosition());
final int endIndex = getValidIndex(location.endPosition());
final Annotation annotation = holder.createAnnotation(severity, new TextRange(startIndex, endIndex), validationMessage.message().message(), WeaveToolingService.toHtml(validationMessage.message().message()));
@NotNull AnnotationBuilder annotationBuilder = holder.newAnnotation(severity, validationMessage.message().message())
.range(new TextRange(startIndex, endIndex))
.tooltip(WeaveToolingService.toHtml(validationMessage.message().message()));
final QuickFix[] quickFixes = validationMessage.quickFix();
for (QuickFix quickFix : quickFixes) {
annotation.registerFix(new WeaveIntentionAction(quickFix));
annotationBuilder = annotationBuilder.withFix(new WeaveIntentionAction(quickFix));
}
annotationBuilder.create();

}
}
Expand Down
48 changes: 30 additions & 18 deletions data-weave-plugin/src/main/java/org/mule/tooling/lang/dw/preview/InputsComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.intellij.navigation.ItemPresentation;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
Expand All @@ -13,13 +14,17 @@
import com.intellij.psi.PsiManager;
import com.intellij.ui.JBTabsPaneImpl;
import com.intellij.ui.tabs.TabInfo;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.intellij.util.ui.components.BorderLayoutPanel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.concurrency.CancellablePromise;

import javax.swing.*;
import java.util.ArrayList;
import java.util.List;

import static com.intellij.openapi.application.ReadAction.nonBlocking;

public class InputsComponent implements Disposable {

private List<Editor> editors = new ArrayList<>();
Expand Down Expand Up @@ -49,26 +54,33 @@ private JComponent createInputsPanel() {

public void loadInputFiles(VirtualFile inputsFolder) {
closeAllInputs();
List<VirtualFile> children = VfsUtil.collectChildrenRecursively(inputsFolder);
for (VirtualFile input : children) {
if (input.isDirectory()) {
continue;
}
PsiFile file = PsiManager.getInstance(myProject).findFile(input);
if (file == null) {
continue;
CancellablePromise<List<PsiFile>> documents = nonBlocking(() -> {
List<VirtualFile> children = VfsUtil.collectChildrenRecursively(inputsFolder);
return children.stream().map((input) -> {
if (input.isDirectory()) {
return null;
}
return PsiManager.getInstance(myProject).findFile(input);
}).toList();
}).submit(AppExecutorUtil.getAppExecutorService());
documents.onSuccess((documentList) -> {
for (PsiFile file : documentList) {
if (file != null) {
final VirtualFile input = file.getVirtualFile();
final Document document = file.getViewProvider().getDocument();
if (document != null) {
ApplicationManager.getApplication().invokeLater(() -> {
Editor editor = EditorFactory.getInstance().createEditor(document, myProject, input, false);
editors.add(editor);
TabInfo tabInfo = createTabInfo(inputsFolder, input, file, editor);
inputTabs.getTabs().addTab(tabInfo);
inputTabs.setSelectedIndex(0);
});
}
}
}
});

Document document = file.getViewProvider().getDocument();
if (document == null) {
continue;
}
Editor editor = EditorFactory.getInstance().createEditor(document, myProject, input, false);
editors.add(editor);
TabInfo tabInfo = createTabInfo(inputsFolder, input, file, editor);
inputTabs.getTabs().addTab(tabInfo);
inputTabs.setSelectedIndex(0);
}
}

@NotNull
Expand Down
13 changes: 11 additions & 2 deletions data-weave-plugin/src/main/java/org/mule/tooling/lang/dw/preview/PreviewToolWindowPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ public void fileOpened(@NotNull FileEditorManager source, @NotNull VirtualFile f
final PsiFile psiFile = file.isValid() ? PsiManager.getInstance(myProject).findFile(file) : null;
// This invokeLater is required. The problem is open does a commit to PSI, but open is
// invoked inside PSI change event. It causes an Exception like "Changes to PSI are not allowed inside event processing"
DumbService.getInstance(myProject).smartInvokeLater(() -> setFile(psiFile));
DumbService.getInstance(myProject).smartInvokeLater(() -> {
ApplicationManager.getApplication().invokeLater(() -> {
setFile(psiFile);
});
});
}
}

Expand Down Expand Up @@ -141,7 +145,12 @@ private void showFile(@NotNull FileEditorManagerEvent e) {
final PsiFile psiFile = ReadAction.compute(() -> file != null && file.isValid() ? PsiManager.getInstance(myProject).findFile(file) : null);
// This invokeLater is required. The problem is open does a commit to PSI, but open is
// invoked inside PSI change event. It causes an Exception like "Changes to PSI are not allowed inside event processing"
DumbService.getInstance(myProject).smartInvokeLater(() -> setFile(psiFile));
DumbService.getInstance(myProject).smartInvokeLater(() -> {
ApplicationManager.getApplication().invokeLater(() -> {
setFile(psiFile);
});

});
}
}

Expand Down
59 changes: 37 additions & 22 deletions data-weave-plugin/src/main/java/org/mule/tooling/lang/dw/preview/WeavePreviewComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.ComponentWithActions;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.ui.content.Content;
import com.intellij.util.Alarm;
import com.intellij.util.concurrency.AppExecutorUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.concurrency.CancellablePromise;
import org.mule.tooling.lang.dw.WeaveConstants;
import org.mule.tooling.lang.dw.WeaveFileType;
import org.mule.tooling.lang.dw.parser.psi.WeaveDocument;
Expand All @@ -44,6 +47,8 @@
import java.util.List;
import java.util.Objects;

import static com.intellij.openapi.application.ReadAction.nonBlocking;

public class WeavePreviewComponent implements Disposable {

private final Project myProject;
Expand Down Expand Up @@ -244,18 +249,19 @@ public void open(@Nullable PsiFile psiFile) {
WeaveDocument weaveDocument = WeavePsiUtils.getWeaveDocument(psiFile);
if (weaveDocument != null) {
WeaveRuntimeService instance = getScenariosManager();
List<Scenario> scenarios = instance.getScenariosFor(weaveDocument);

if (scenarios.isEmpty()) {
listener.doRunPreviewWithoutScenario();
} else {
//Load first scenario
Scenario currentScenarioFor = instance.getCurrentScenarioFor(weaveDocument);
if (currentScenarioFor == null) {
return;
}
loadScenario(currentScenarioFor);
}
CancellablePromise<Scenario> selectedFilePromise = nonBlocking(() -> {
return instance.getCurrentScenarioFor(weaveDocument);
}).submit(AppExecutorUtil.getAppExecutorService());
selectedFilePromise
.onSuccess((currentScenarioFor) -> {
ApplicationManager.getApplication().invokeLater(() -> {
if (currentScenarioFor == null) {
listener.doRunPreviewWithoutScenario();
} else {
loadScenario(currentScenarioFor);
}
});
});
}
}

Expand All @@ -275,7 +281,9 @@ public void loadScenario(Scenario scenario) {
} else {
inputsComponent.closeAllInputs();
}
listener.doRunPreview();
nonBlocking(() -> {
listener.doRunPreview();
}).submit(AppExecutorUtil.getAppExecutorService());
}

public void clearScenario() {
Expand Down Expand Up @@ -554,19 +562,26 @@ private class MyRunPreviewCallback implements RunPreviewCallback {

@Override
public void onPreviewSuccessful(PreviewExecutedSuccessfulEvent result, long duration) {
Scenario scenario = getCurrentScenario();
final VirtualFile file = getOutputFile(scenario);
outputComponent.onPreviewResult(result, file, duration);
previewLogsViewer.clear();
previewLogsViewer.logInfo(ScalaUtils.toList(result.messages()));
VirtualFile vFile = ApplicationManager.getApplication().runReadAction((Computable<VirtualFile>) () -> {
Scenario scenario = getCurrentScenario();
return getOutputFile(scenario);
});

ApplicationManager.getApplication().invokeLater(() -> {
outputComponent.onPreviewResult(result, vFile, duration);
previewLogsViewer.clear();
previewLogsViewer.logInfo(ScalaUtils.toList(result.messages()));
});
}

@Override
public void onPreviewFailed(PreviewExecutedFailedEvent message) {
outputComponent.onPreviewResultFailed();
previewLogsViewer.clear();
previewLogsViewer.logInfo(ScalaUtils.toList(message.messages()));
previewLogsViewer.logError(message.message());
ApplicationManager.getApplication().invokeLater(() -> {
outputComponent.onPreviewResultFailed();
previewLogsViewer.clear();
previewLogsViewer.logInfo(ScalaUtils.toList(message.messages()));
previewLogsViewer.logError(message.message());
});
}
}

Expand Down
12 changes: 5 additions & 7 deletions ...-weave-plugin/src/main/java/org/mule/tooling/lang/dw/service/agent/WeaveAgentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,11 @@ public void runPreview(String inputsPath, String script, String identifier, Stri
@Override
public void onPreviewExecuted(PreviewExecutedEvent result) {
long duration = System.currentTimeMillis() - startTime;
ApplicationManager.getApplication().invokeLater(() -> {
if (result instanceof PreviewExecutedSuccessfulEvent successfulEvent) {
callback.onPreviewSuccessful(successfulEvent, duration);
} else if (result instanceof PreviewExecutedFailedEvent) {
callback.onPreviewFailed((PreviewExecutedFailedEvent) result);
}
});
if (result instanceof PreviewExecutedSuccessfulEvent successfulEvent) {
callback.onPreviewSuccessful(successfulEvent, duration);
} else if (result instanceof PreviewExecutedFailedEvent) {
callback.onPreviewFailed((PreviewExecutedFailedEvent) result);
}
}

@Override
Expand Down
Loading