Skip to content

Commit e4891c2

Browse files
committed
fix runtime issues
1 parent a25dd48 commit e4891c2

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

python-impl/src/main/java/com/jetbrains/python/impl/inspections/quickfix/ReformatFix.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,22 @@
1616

1717
package com.jetbrains.python.impl.inspections.quickfix;
1818

19-
import jakarta.annotation.Nonnull;
20-
19+
import consulo.codeEditor.Editor;
20+
import consulo.language.codeStyle.CodeStyleManager;
2121
import consulo.language.editor.FileModificationService;
22-
import consulo.language.editor.intention.HighPriorityAction;
23-
import consulo.language.editor.intention.IntentionAction;
2422
import consulo.language.editor.inspection.LocalQuickFix;
2523
import consulo.language.editor.inspection.ProblemDescriptor;
26-
import consulo.codeEditor.Editor;
27-
import consulo.project.Project;
24+
import consulo.language.editor.intention.HighPriorityAction;
25+
import consulo.language.editor.intention.SyntheticIntentionAction;
2826
import consulo.language.psi.PsiFile;
29-
import consulo.language.codeStyle.CodeStyleManager;
3027
import consulo.language.util.IncorrectOperationException;
28+
import consulo.project.Project;
29+
import jakarta.annotation.Nonnull;
3130

3231
/**
3332
* @author yole
3433
*/
35-
public class ReformatFix implements IntentionAction, LocalQuickFix, HighPriorityAction {
34+
public class ReformatFix implements SyntheticIntentionAction, LocalQuickFix, HighPriorityAction {
3635
@Nonnull
3736
@Override
3837
public String getText() {

python-impl/src/main/java/com/jetbrains/python/impl/run/PythonRunConfigurationProducer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.jetbrains.python.psi.types.TypeEvalContext;
2020
import consulo.annotation.access.RequiredReadAction;
2121
import consulo.annotation.component.ExtensionImpl;
22+
import consulo.application.ReadAction;
2223
import consulo.execution.action.ConfigurationContext;
2324
import consulo.execution.action.ConfigurationFromContext;
2425
import consulo.execution.action.Location;
@@ -55,7 +56,7 @@ protected boolean setupConfigurationFromContext(
5556
return false;
5657
}
5758
PsiFile script = location.getPsiElement().getContainingFile();
58-
if (!isAvailable(location, script)) {
59+
if (!ReadAction.compute(() -> isAvailable(location, script))) {
5960
return false;
6061
}
6162

@@ -78,14 +79,13 @@ protected boolean setupConfigurationFromContext(
7879
}
7980

8081
@Override
81-
@RequiredReadAction
8282
public boolean isConfigurationFromContext(PythonRunConfiguration configuration, ConfigurationContext context) {
8383
Location location = context.getLocation();
8484
if (location == null) {
8585
return false;
8686
}
8787
PsiFile script = location.getPsiElement().getContainingFile();
88-
if (!isAvailable(location, script)) {
88+
if (!ReadAction.compute(() -> isAvailable(location, script))) {
8989
return false;
9090
}
9191
VirtualFile virtualFile = script.getVirtualFile();

python-impl/src/main/java/com/jetbrains/python/impl/testing/PythonTestConfigurationProducer.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.jetbrains.python.psi.*;
2323
import com.jetbrains.python.psi.types.TypeEvalContext;
2424
import consulo.annotation.access.RequiredReadAction;
25-
import consulo.annotation.access.RequiredWriteAction;
25+
import consulo.application.ReadAction;
2626
import consulo.execution.action.ConfigurationContext;
2727
import consulo.execution.action.ConfigurationFromContext;
2828
import consulo.execution.action.Location;
@@ -111,7 +111,6 @@ public boolean isConfigurationFromContext(AbstractPythonTestRunConfiguration con
111111
}
112112

113113
@Override
114-
@RequiredWriteAction
115114
protected boolean setupConfigurationFromContext(
116115
AbstractPythonTestRunConfiguration configuration,
117116
ConfigurationContext context,
@@ -121,7 +120,7 @@ protected boolean setupConfigurationFromContext(
121120
return false;
122121
}
123122
Location location = context.getLocation();
124-
if (location == null || !isAvailable(location)) {
123+
if (location == null || !ReadAction.compute(() -> isAvailable(location))) {
125124
return false;
126125
}
127126
PsiElement element = location.getPsiElement();
@@ -160,7 +159,6 @@ protected boolean setupConfigurationFromContext(
160159
return file instanceof PyFile pyFile && isTestFile(pyFile) && setupConfigurationFromFile(pyFile, configuration);
161160
}
162161

163-
@RequiredWriteAction
164162
private boolean setupConfigurationFromFolder(@Nonnull PsiDirectory element, @Nonnull AbstractPythonTestRunConfiguration configuration) {
165163
VirtualFile virtualFile = element.getVirtualFile();
166164
if (!isTestFolder(virtualFile, element.getProject())) {
@@ -176,13 +174,11 @@ private boolean setupConfigurationFromFolder(@Nonnull PsiDirectory element, @Non
176174
return true;
177175
}
178176

179-
@RequiredWriteAction
180177
private static void setModuleSdk(@Nonnull PsiElement element, @Nonnull AbstractPythonTestRunConfiguration configuration) {
181178
configuration.setUseModuleSdk(true);
182179
configuration.setModule(element.getModule());
183180
}
184181

185-
@RequiredWriteAction
186182
protected boolean setupConfigurationFromFunction(
187183
@Nonnull PyFunction pyFunction,
188184
@Nonnull AbstractPythonTestRunConfiguration configuration
@@ -200,7 +196,6 @@ protected boolean setupConfigurationFromFunction(
200196
return setupConfigurationScript(configuration, pyFunction);
201197
}
202198

203-
@RequiredWriteAction
204199
protected boolean setupConfigurationFromClass(
205200
@Nonnull PyClass pyClass,
206201
@Nonnull AbstractPythonTestRunConfiguration configuration
@@ -210,7 +205,6 @@ protected boolean setupConfigurationFromClass(
210205
return setupConfigurationScript(configuration, pyClass);
211206
}
212207

213-
@RequiredWriteAction
214208
protected boolean setupConfigurationFromFile(
215209
@Nonnull PyFile pyFile,
216210
@Nonnull AbstractPythonTestRunConfiguration configuration
@@ -219,7 +213,6 @@ protected boolean setupConfigurationFromFile(
219213
return setupConfigurationScript(configuration, pyFile);
220214
}
221215

222-
@RequiredWriteAction
223216
protected static boolean setupConfigurationScript(
224217
@Nonnull AbstractPythonTestRunConfiguration cfg,
225218
@Nonnull PyElement element
@@ -259,6 +252,7 @@ protected boolean isTestFolder(@Nonnull VirtualFile virtualFile, @Nonnull Projec
259252
return name.toLowerCase().contains("test") || roots.contains(virtualFile);
260253
}
261254

255+
@RequiredReadAction
262256
protected boolean isAvailable(@Nonnull Location location) {
263257
return false;
264258
}

python-impl/src/main/java/consulo/python/impl/PythonDarkAdditionalTextAttributesProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class PythonDarkAdditionalTextAttributesProvider implements EditorColorSc
1818
@Nonnull
1919
@Override
2020
public String getColorSchemeId() {
21-
return EditorColorsScheme.DEFAULT_SCHEME_NAME;
21+
return EditorColorsScheme.DARCULA_SCHEME_NAME;
2222
}
2323

2424
@Override

0 commit comments

Comments
 (0)