Skip to content

Commit 5b3d8df

Browse files
committed
fix some minor Compatibility verification issues by IntelliJ Plugin Verifier
1 parent 592c56b commit 5b3d8df

File tree

9 files changed

+53
-109
lines changed

9 files changed

+53
-109
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
//group 'org.example'
99

10-
version '1.0.2'
10+
version '1.0.3'
1111
sourceCompatibility = 1.8
1212

1313
repositories {

src/main/java/ai/deepcode/jbplugin/annotators/DeepCodeAnnotator.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

src/main/java/ai/deepcode/jbplugin/core/DeepCodeUtils.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import ai.deepcode.javaclient.DeepCodeRestApi;
44
import ai.deepcode.javaclient.responses.GetFiltersResponse;
55
import com.intellij.openapi.project.Project;
6+
import com.intellij.openapi.project.ProjectUtil;
67
import com.intellij.openapi.vcs.changes.ChangeListManager;
78
import com.intellij.openapi.vfs.VirtualFile;
89
import com.intellij.psi.PsiDirectory;
@@ -42,8 +43,17 @@ static List<PsiFile> getAllSupportedFilesInProject(@NotNull Project project) {
4243

4344
private static List<PsiFile> allProjectFiles(@NotNull Project project) {
4445
final PsiManager psiManager = PsiManager.getInstance(project);
45-
final PsiDirectory prjDirectory = psiManager.findDirectory(project.getBaseDir());
46-
return prjDirectory != null ? getFilesRecursively(prjDirectory) : Collections.emptyList();
46+
final VirtualFile projectDir = ProjectUtil.guessProjectDir(project);
47+
if (projectDir == null) {
48+
DCLogger.warn("Project directory not found for: " + project);
49+
return Collections.emptyList();
50+
}
51+
final PsiDirectory prjDirectory = psiManager.findDirectory(projectDir);
52+
if (prjDirectory == null) {
53+
DCLogger.warn("Project directory not found for: " + project);
54+
return Collections.emptyList();
55+
}
56+
return getFilesRecursively(prjDirectory);
4757
}
4858

4959
private static List<PsiFile> getFilesRecursively(@NotNull PsiDirectory psiDirectory) {

src/main/java/ai/deepcode/jbplugin/ui/myTodoView.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public void dispose() {
117117
public void initToolWindow(@NotNull ToolWindow toolWindow) {
118118
// Create panels
119119
ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
120-
final String projectDisplayName =
121-
IdeUICustomization.getInstance().getProjectDisplayName() + " [ " + myProject.getName() + " ]";
120+
final String projectDisplayName ="Project [ " + myProject.getName() + " ]";
122121
Content allTodosContent = contentFactory.createContent(null, projectDisplayName, false);
123122
toolWindow.setHelpId("find.todoList");
124123
myAllTodos = new TodoPanel(myProject, state.all, false, allTodosContent) {

src/main/java/ai/deepcode/jbplugin/ui/nodes/ModuleToDoNode.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
import com.intellij.openapi.module.ModuleUtilCore;
1414
import com.intellij.openapi.project.Project;
1515
import com.intellij.openapi.roots.ModuleRootManager;
16+
import com.intellij.openapi.ui.Queryable;
1617
import com.intellij.openapi.vfs.VirtualFile;
1718
import com.intellij.psi.PsiElement;
1819
import com.intellij.psi.PsiFile;
1920
import com.intellij.psi.search.TodoItem;
2021
import org.jetbrains.annotations.NotNull;
22+
import org.jetbrains.annotations.Nullable;
2123

2224
import java.util.ArrayList;
2325
import java.util.Collection;
@@ -82,10 +84,17 @@ public void update(@NotNull PresentationData presentation) {
8284
presentation.setPresentableText(newName);
8385
}
8486

87+
/*
8588
@Override
8689
public String getTestPresentation() {
8790
return "Module";
8891
}
92+
*/
93+
94+
@Override
95+
public String toTestString(@Nullable Queryable.PrintInfo printInfo) {
96+
return "Module";
97+
}
8998

9099
@Override
91100
public int getFileCount(Module module) {

src/main/java/ai/deepcode/jbplugin/ui/nodes/SummaryNode.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
import com.intellij.openapi.project.Project;
1818
import com.intellij.openapi.roots.ProjectFileIndex;
1919
import com.intellij.openapi.roots.ProjectRootManager;
20+
import com.intellij.openapi.ui.Queryable;
2021
import com.intellij.openapi.vfs.VirtualFile;
2122
import com.intellij.psi.PsiFile;
2223
import com.intellij.ui.HighlightedRegion;
2324
import com.intellij.util.containers.ContainerUtil;
2425
import org.jetbrains.annotations.NotNull;
26+
import org.jetbrains.annotations.Nullable;
2527

2628
import java.util.ArrayList;
2729
import java.util.Collection;
@@ -124,10 +126,18 @@ public void update(@NotNull PresentationData presentation) {
124126
myBuilder.expandTree(2);
125127
}
126128

129+
/*
127130
@Override
128131
public String getTestPresentation() {
129132
return "Summary";
130133
}
134+
*/
135+
136+
@Nullable
137+
@Override
138+
public String toTestString(@Nullable Queryable.PrintInfo printInfo) {
139+
return "Summary";
140+
}
131141

132142
@Override
133143
public int getFileCount(ToDoSummary summary) {

src/main/java/ai/deepcode/jbplugin/ui/nodes/ToDoRootNode.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import ai.deepcode.jbplugin.ui.TodoTreeBuilder;
88
import com.intellij.ide.util.treeView.AbstractTreeNode;
99
import com.intellij.openapi.project.Project;
10+
import com.intellij.openapi.ui.Queryable;
1011
import org.jetbrains.annotations.NotNull;
12+
import org.jetbrains.annotations.Nullable;
1113

1214
import java.util.ArrayList;
1315
import java.util.Collection;
@@ -39,10 +41,18 @@ public Object getSummaryNode() {
3941
return mySummaryNode;
4042
}
4143

44+
/*
4245
@Override
4346
public String getTestPresentation() {
4447
return "Root";
4548
}
49+
*/
50+
51+
@Nullable
52+
@Override
53+
public String toTestString(@Nullable Queryable.PrintInfo printInfo) {
54+
return "Root";
55+
}
4656

4757
@Override
4858
public int getFileCount(final Object val) {

src/main/java/ai/deepcode/jbplugin/ui/nodes/TodoItemNode.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
import com.intellij.openapi.editor.highlighter.HighlighterIterator;
1717
import com.intellij.openapi.editor.markup.TextAttributes;
1818
import com.intellij.openapi.project.Project;
19+
import com.intellij.openapi.ui.Queryable;
1920
import com.intellij.openapi.util.Comparing;
2021
import com.intellij.openapi.util.TextRange;
2122
import com.intellij.psi.search.TodoItem;
2223
import com.intellij.ui.HighlightedRegion;
2324
import com.intellij.util.containers.ContainerUtil;
2425
import com.intellij.util.text.CharArrayUtil;
2526
import org.jetbrains.annotations.NotNull;
27+
import org.jetbrains.annotations.Nullable;
2628

2729
import javax.swing.*;
2830
import java.awt.*;
@@ -194,10 +196,17 @@ public int getRowCount() {
194196
return myAdditionalLines.size() + 1;
195197
}
196198

199+
/*
197200
@Override
198201
public String getTestPresentation() {
199202
return "Item: " + getValue().getTodoItem().getTextRange();
200203
}
204+
*/
205+
206+
@Override
207+
public String toTestString(@Nullable Queryable.PrintInfo printInfo) {
208+
return "Item: " + getValue().getTodoItem().getTextRange();
209+
}
201210

202211
@Override
203212
public int getWeight() {

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,7 @@
2222
<projectService serviceImplementation="ai.deepcode.jbplugin.ui.nodes.TodoTreeHelper"/>
2323
<applicationConfigurable instance="ai.deepcode.jbplugin.ui.config.DeepCodeConfigEntry"/>
2424

25-
<!-- Add your extensions here
26-
<annotator language="TEXT"
27-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
28-
<annotator language=""
29-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
30-
<annotator language="textmate"
31-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
32-
<annotator language="JAVA"
33-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
34-
<annotator language="JavaScript"
35-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
36-
<annotator language="HTML"
37-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
38-
<annotator language="Python"
39-
implementationClass="ai.deepcode.jbplugin.annotators.DeepCodeAnnotator"/>
40-
-->
25+
<!-- Add your extensions here -->
4126

4227
<!-- For Idea CE and those that doesn't include corresponding plugin-->
4328
<!-- TODO: register annotators dynamically based on Languages provided -->

0 commit comments

Comments
 (0)