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

IDEA-66222 USE at com.intellij.ide.todo.CustomChangelistTodosTreeBuilder$1.getTodoItemsCount

Browse Source
This commit is contained in:
irengrig
2011-03-09 15:32:19 +03:00
parent 562a2b0145
commit b84f7d0463
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/todo/CustomChangelistTodosTreeBuilder.java
+25 -26
View File
@@ -105,23 +105,7 @@ public class CustomChangelistTodosTreeBuilder extends TodoTreeBuilder {
@NotNull
@Override
public TodoItem[] findTodoItems(@NotNull PsiFile file) {
if (! myIncludedFiles.contains(file)) return EMPTY_ITEMS;
if (myDirtyFileSet.contains(file.getVirtualFile())) {
myMap.remove(file);
final Change change = myChangeListManager.getChange(file.getVirtualFile());
if (change != null) {
final TodoCheckinHandlerWorker worker = new TodoCheckinHandlerWorker(myProject, Collections.singletonList(change), getTodoTreeStructure().getTodoFilter(), true);
worker.execute();
final List<TodoItem> todoItems = worker.inOneList();
if (todoItems != null && ! todoItems.isEmpty()) {
for (TodoItem todoItem : todoItems) {
myMap.putValue(file, todoItem);
}
}
}
}
final Collection<TodoItem> todoItems = myMap.get(file);
return todoItems == null || todoItems.isEmpty() ? EMPTY_ITEMS : todoItems.toArray(new TodoItem[todoItems.size()]);
return findPatternedTodoItems(file, getTodoTreeStructure().getTodoFilter());
}
@NotNull
@@ -148,19 +132,34 @@ public class CustomChangelistTodosTreeBuilder extends TodoTreeBuilder {
@Override
public int getTodoItemsCount(@NotNull PsiFile file, @NotNull TodoPattern pattern) {
throw new UnsupportedOperationException();
// just would not work while implemented like that
/*final TodoItem[] todoItems = findTodoItems(file);
if (todoItems.length == 0) return 0;
int cnt = 0;
for (TodoItem todoItem : todoItems) {
if (todoItem.getPattern().equals(pattern)) ++ cnt;
}
return cnt;*/
final TodoFilter filter = new TodoFilter();
filter.addTodoPattern(pattern);
return findPatternedTodoItems(file, filter).length;
}
};
}
private TodoItem[] findPatternedTodoItems(PsiFile file, final TodoFilter todoFilter) {
if (! myIncludedFiles.contains(file)) return EMPTY_ITEMS;
if (myDirtyFileSet.contains(file.getVirtualFile())) {
myMap.remove(file);
final Change change = myChangeListManager.getChange(file.getVirtualFile());
if (change != null) {
final TodoCheckinHandlerWorker
worker = new TodoCheckinHandlerWorker(myProject, Collections.singletonList(change), todoFilter, true);
worker.execute();
final List<TodoItem> todoItems = worker.inOneList();
if (todoItems != null && ! todoItems.isEmpty()) {
for (TodoItem todoItem : todoItems) {
myMap.putValue(file, todoItem);
}
}
}
}
final Collection<TodoItem> todoItems = myMap.get(file);
return todoItems == null || todoItems.isEmpty() ? EMPTY_ITEMS : todoItems.toArray(new TodoItem[todoItems.size()]);
}
@Override
protected TodoTreeStructure createTreeStructure() {
return new CustomChangelistTodoTreeStructure(myProject, myPsiTodoSearchHelper);