MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2010-02-17 16:53:19 +03:00
parent a145915abe
commit b32acd226a
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class HighlightSuppressedWarningsHandler extends HighlightUsagesHandlerBa
final GlobalInspectionContextImpl context = managerEx.createNewGlobalContext(false);
tool.initialize(context);
((RefManagerImpl)context.getRefManager()).inspectionReadActionStarted();
pass.doInspectInBatch(managerEx, new InspectionProfileEntry[]{tool}, false);
pass.doInspectInBatch(managerEx, Collections.<InspectionProfileEntry>singletonList(tool), false);
for (HighlightInfo info : pass.getInfos()) {
final PsiElement element = CollectHighlightsUtil.findCommonParent(myFile, info.startOffset, info.endOffset);
if (element != null) {
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+2 -2
View File
@@ -118,12 +118,12 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
inspect(tools, iManager, true, true);
}
public void doInspectInBatch(final InspectionManagerEx iManager, InspectionProfileEntry[] toolWrappers, boolean ignoreSuppressed) {
public void doInspectInBatch(final InspectionManagerEx iManager, List<InspectionProfileEntry> toolWrappers, boolean ignoreSuppressed) {
myDescriptors = new ArrayList<ProblemDescriptor>();
myLevels = new ArrayList<HighlightInfoType>();
myTools = new ArrayList<LocalInspectionTool>();
Map<LocalInspectionTool, LocalInspectionToolWrapper> tool2Wrapper = new THashMap<LocalInspectionTool, LocalInspectionToolWrapper>(toolWrappers.length);
Map<LocalInspectionTool, LocalInspectionToolWrapper> tool2Wrapper = new THashMap<LocalInspectionTool, LocalInspectionToolWrapper>(toolWrappers.size());
for (InspectionProfileEntry toolWrapper : toolWrappers) {
tool2Wrapper.put(((LocalInspectionToolWrapper)toolWrapper).getTool(), (LocalInspectionToolWrapper)toolWrapper);
}
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+9 -10
View File
@@ -420,7 +420,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
public void run() {
LOG.info("Code inspection finished");
final InspectionResultsView view = new InspectionResultsView(myProject, getCurrentProfile(),
InspectionResultsView view = new InspectionResultsView(myProject, getCurrentProfile(),
scope, GlobalInspectionContextImpl.this,
new InspectionRVContentProviderImpl(myProject));
if (!view.update() && !getUIOptions().SHOW_ONLY_DIFF) {
@@ -469,11 +469,11 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
}
private void runTools(final List<InspectionProfileEntry> needRepeatSearchRequest, final AnalysisScope scope, final InspectionManager manager) {
final List<Tools> usedTools = new ArrayList<Tools>();
final List<Tools> globalTools = new ArrayList<Tools>();
final List<Tools> localTools = new ArrayList<Tools>();
initializeTools(usedTools, localTools);
initializeTools(globalTools, localTools);
((RefManagerImpl)getRefManager()).initializeAnnotators();
for (Tools tools : usedTools) {
for (Tools tools : globalTools) {
for (ScopeToolState state : tools.getTools()) {
final InspectionTool tool = (InspectionTool)state.getTool();
try {
@@ -510,14 +510,13 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
scope.accept(new PsiRecursiveElementVisitor() {
@Override
public void visitFile(PsiFile file) {
final VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile != null) {
incrementJobDoneAmount(LOCAL_ANALYSIS, ProjectUtil.calcRelativeToProjectPath(virtualFile, myProject));
}
final FileViewProvider viewProvider = psiManager.findViewProvider(virtualFile);
final com.intellij.openapi.editor.Document document = viewProvider != null ? viewProvider.getDocument() : null;
final com.intellij.openapi.editor.Document document = viewProvider == null ? null : viewProvider.getDocument();
if (document == null || virtualFile.getFileType().isBinary()) return; //do not inspect binary files
final LocalInspectionsPass pass = new LocalInspectionsPass(file, document, 0, file.getTextLength());
try {
@@ -528,7 +527,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
lTools.add(enabledTool);
}
}
pass.doInspectInBatch((InspectionManagerEx)manager, lTools.toArray(new InspectionProfileEntry[lTools.size()]), true);
pass.doInspectInBatch((InspectionManagerEx)manager, lTools, true);
}
catch (ProcessCanceledException e) {
throw e;
@@ -540,7 +539,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
});
}
public void initializeTools(List<Tools> tools, List<Tools> localTools) {
public void initializeTools(List<Tools> globalTools, List<Tools> localTools) {
myJobDescriptors = new ArrayList<JobDescriptor>();
final InspectionProfileImpl profile = new InspectionProfileImpl((InspectionProfileImpl)getCurrentProfile());
final List<ToolsImpl> usedTools = profile.getAllEnabledInspectionTools();
@@ -553,7 +552,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
appendJobDescriptor(LOCAL_ANALYSIS);
}
else {
tools.add(currentTools);
globalTools.add(currentTools);
JobDescriptor[] jobDescriptors = tool.getJobDescriptors();
for (JobDescriptor jobDescriptor : jobDescriptors) {
appendJobDescriptor(jobDescriptor);
@@ -565,7 +564,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
}
}
for (GlobalInspectionContextExtension extension : myExtensions.values()) {
extension.performPreRunActivities(tools, localTools, this);
extension.performPreRunActivities(globalTools, localTools, this);
}
}