From 64feb9f897ee39de9d59afc62cbbc8126439009c Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 23 Oct 2013 12:27:54 +0200 Subject: [PATCH] plugin advertiser: do not suggest to enable by already ignored facets --- .../src/com/intellij/facet/FacetManagerImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java index ad7ee68ebe69..c72f9fe8d0ee 100644 --- a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java @@ -176,8 +176,7 @@ public class FacetManagerImpl extends FacetManager implements ModuleComponent, P final FacetType type = myFacetTypeRegistry.findFacetType(typeId); if (type == null) { - addInvalidFacet(child, model, underlyingFacet, ProjectBundle.message("error.message.unknown.facet.type.0", typeId)); - UnknownFeaturesCollector.getInstance(myModule.getProject()).registerUnknownFeature("com.intellij.facetType", typeId); + addInvalidFacet(child, model, underlyingFacet, ProjectBundle.message("error.message.unknown.facet.type.0", typeId), typeId); continue; } @@ -222,6 +221,14 @@ public class FacetManagerImpl extends FacetManager implements ModuleComponent, P ModifiableFacetModel model, final Facet underlyingFacet, final String errorMessage) { + addInvalidFacet(state, model, underlyingFacet, errorMessage, null); + } + + private void addInvalidFacet(final FacetState state, + ModifiableFacetModel model, + final Facet underlyingFacet, + final String errorMessage, + final String typeId) { final InvalidFacetManager invalidFacetManager = InvalidFacetManager.getInstance(myModule.getProject()); final InvalidFacetType type = InvalidFacetType.getInstance(); final InvalidFacetConfiguration configuration = new InvalidFacetConfiguration(state, errorMessage); @@ -230,6 +237,7 @@ public class FacetManagerImpl extends FacetManager implements ModuleComponent, P if (!invalidFacetManager.isIgnored(facet)) { FacetLoadingErrorDescription description = new FacetLoadingErrorDescription(facet); ProjectLoadingErrorsNotifier.getInstance(myModule.getProject()).registerError(description); + UnknownFeaturesCollector.getInstance(myModule.getProject()).registerUnknownFeature("com.intellij.facetType", typeId); } }