This commit is contained in:
Alexey Kudravtsev
2013-09-12 15:08:21 +04:00
parent 754959ac4e
commit 840d7aae93
3 changed files with 9 additions and 9 deletions
@@ -461,7 +461,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
}
protected HighlightInfoHolder createInfoHolder(final PsiFile file) {
final HighlightInfoFilter[] filters = ApplicationManager.getApplication().getExtensions(HighlightInfoFilter.EXTENSION_POINT_NAME);
final HighlightInfoFilter[] filters = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensions();
return new CustomHighlightInfoHolder(file, getColorsScheme(), filters);
}
@@ -16,24 +16,26 @@
package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.codeInsight.daemon.HighlightDisplayKey;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.intention.IntentionManager;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.actions.CleanupInspectionIntention;
import com.intellij.codeInspection.ex.*;
import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper;
import com.intellij.codeInspection.ex.InspectionToolWrapper;
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
import com.intellij.codeInspection.ex.QuickFixWrapper;
import com.intellij.lang.ASTNode;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.lang.annotation.ProblemGroup;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.colors.*;
import com.intellij.openapi.editor.ex.RangeHighlighterEx;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.text.StringUtil;
@@ -256,9 +258,7 @@ public class HighlightInfo implements Segment {
}
@NotNull
private static final HighlightInfoFilter[] FILTERS =
ApplicationManager.getApplication().getExtensions(HighlightInfoFilter.EXTENSION_POINT_NAME);
private static final HighlightInfoFilter[] FILTERS = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensions();
public boolean needUpdateOnTyping() {
return isFlagSet(NEEDS_UPDATE_ON_TYPING_FLAG);
@@ -77,7 +77,7 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager
@NotNull
public List<NamedScope> getPredefinedScopes() {
final List<NamedScope> predefinedScopes = new ArrayList<NamedScope>();
final CustomScopesProvider[] scopesProviders = myProject.getExtensions(CustomScopesProvider.CUSTOM_SCOPES_PROVIDER);
final CustomScopesProvider[] scopesProviders = CustomScopesProvider.CUSTOM_SCOPES_PROVIDER.getExtensions(myProject);
for (CustomScopesProvider scopesProvider : scopesProviders) {
predefinedScopes.addAll(scopesProvider.getCustomScopes());
}
@@ -86,7 +86,7 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager
@Override
public NamedScope getPredefinedScope(String name) {
final CustomScopesProvider[] scopesProviders = myProject.getExtensions(CustomScopesProvider.CUSTOM_SCOPES_PROVIDER);
final CustomScopesProvider[] scopesProviders = CustomScopesProvider.CUSTOM_SCOPES_PROVIDER.getExtensions(myProject);
for (CustomScopesProvider scopesProvider : scopesProviders) {
final NamedScope scope = scopesProvider instanceof CustomScopesProviderEx
? ((CustomScopesProviderEx)scopesProvider).getCustomScope(name)