MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 02:09:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

framework detection: @NotNull and assertions added to find problematic plugin which incorrectly returns null from FacetBasedFrameworkDetector#getFacetType (EA-78816)

Browse Source
This commit is contained in:
nik
2016-10-07 10:07:07 +03:00
parent 2352e05560
commit 7b20b02967
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/lang-api/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java
View File

@@ -17,6 +17,7 @@ package com.intellij.framework.detection;
import com.intellij.facet.*;
import com.intellij.framework.FrameworkType;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
@@ -36,6 +37,8 @@ import java.util.Set;
* @author nik
*/
public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends FacetConfiguration> extends FrameworkDetector {
private static final Logger LOG = Logger.getInstance(FacetBasedFrameworkDetector.class);
protected FacetBasedFrameworkDetector(String detectorId) {
super(detectorId);
}
@@ -44,6 +47,7 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
super(detectorId, detectorVersion);
}
@NotNull
public abstract FacetType<F, C> getFacetType();
/**
@@ -83,7 +87,10 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
@Override
public FrameworkType getFrameworkType() {
return createFrameworkType(getFacetType());
FacetType<F, C> type = getFacetType();
//noinspection ConstantConditions todo[nik] remove later: this is added to find implementations which incorrectly return 'null' from 'getFacetType'
LOG.assertTrue(type != null, "'getFacetType' returns 'null' in " + getClass());
return createFrameworkType(type);
}
static FrameworkType createFrameworkType(final FacetType<?, ?> facetType) {
@@ -104,7 +111,7 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
private final FacetType<?, ?> myFacetType;
private final Icon myIcon;
public FacetBasedFrameworkType(FacetType<?, ?> facetType) {
public FacetBasedFrameworkType(@NotNull FacetType<?, ?> facetType) {
super(facetType.getStringId());
myFacetType = facetType;
final Icon icon = myFacetType.getIcon();

1
plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFrameworkDetector.java
View File

@@ -39,6 +39,7 @@ public class AppEngineFrameworkDetector extends FacetBasedFrameworkDetector<AppE
super("appengine-java");
}
@NotNull
@Override
public FacetType<AppEngineFacet, AppEngineFacetConfiguration> getFacetType() {
return FacetType.findInstance(AppEngineFacetType.class);

1
python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java
View File

@@ -80,6 +80,7 @@ public class PythonFacetType extends FacetType<PythonFacet, PythonFacetConfigura
super("python");
}
@NotNull
@Override
public FacetType<PythonFacet, PythonFacetConfiguration> getFacetType() {
return PythonFacetType.getInstance();

1
python/src/com/jetbrains/python/buildout/BuildoutFrameworkDetector.java
View File

@@ -42,6 +42,7 @@ public class BuildoutFrameworkDetector extends FacetBasedFrameworkDetector<Build
super("buildout-python");
}
@NotNull
@Override
public FacetType<BuildoutFacet, BuildoutFacetConfiguration> getFacetType() {
return BuildoutFacetType.getInstance();