MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-18 20:41:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into amakeev/gradle

Browse Source 
# Conflicts:
#	community/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java

GitOrigin-RevId: d931e798108685731bf185f7c2e3221680b8e5a2
This commit is contained in:
Anton Makeev
2019-05-15 13:31:00 +02:00
committed by intellij-monorepo-bot
parent 1e05aec13b
commit aa103fd53c
1434 changed files with 11443 additions and 7847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsConfigurationProducer.java
View File

@@ -78,7 +78,7 @@ public class DocutilsConfigurationProducer extends RuntimeConfigurationProducer
@Nullable
@Override
protected RunnerAndConfigurationSettings findExistingByElement(Location location,
@NotNull List<RunnerAndConfigurationSettings> existingConfigurations,
@NotNull List<? extends RunnerAndConfigurationSettings> existingConfigurations,
ConfigurationContext context) {
PsiFile script = location.getPsiElement().getContainingFile();
if (script == null) {

2
python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java
View File

@@ -76,7 +76,7 @@ public class SphinxConfigurationProducer extends RuntimeConfigurationProducer im
@Nullable
@Override
protected RunnerAndConfigurationSettings findExistingByElement(Location location,
@NotNull List<RunnerAndConfigurationSettings> existingConfigurations,
@NotNull List<? extends RunnerAndConfigurationSettings> existingConfigurations,
ConfigurationContext context) {
PsiElement element = location.getPsiElement();
if (!(element instanceof PsiDirectory)) return null;