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

DSGN-2319 Run and test result icons for left gutter: double triangle for classes

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-11-26 13:26:23 +03:00
parent b7156505e7
commit fd51bbbc13
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/testIntegration/TestRunLineMarkerProvider.java
+6 -6
View File
@@ -55,7 +55,7 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor {
TestFramework framework = TestFrameworks.detectFramework((PsiClass)element);
if (framework != null && framework.isTestClass(element)) {
String url = "java:suite://" + ((PsiClass)element).getQualifiedName();
return getInfo(url, e.getProject());
return getInfo(url, e.getProject(), true);
}
}
if (element instanceof PsiMethod) {
@@ -64,7 +64,7 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor {
TestFramework framework = TestFrameworks.detectFramework(psiClass);
if (framework != null && framework.isTestMethod(element)) {
String url = "java:test://" + psiClass.getQualifiedName() + "." + ((PsiMethod)element).getName();
return getInfo(url, e.getProject());
return getInfo(url, e.getProject(), false);
}
}
}
@@ -73,8 +73,8 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor {
}
@NotNull
private static Info getInfo(String url, Project project) {
Icon icon = getTestStateIcon(url, project);
private static Info getInfo(String url, Project project, boolean isClass) {
Icon icon = getTestStateIcon(url, project, isClass);
return new Info(icon, TOOLTIP_PROVIDER, ExecutorAction.getActions(1));
}
@@ -82,7 +82,7 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor {
return e instanceof PsiIdentifier;
}
private static Icon getTestStateIcon(String url, Project project) {
private static Icon getTestStateIcon(String url, Project project, boolean isClass) {
TestStateStorage.Record state = TestStateStorage.getInstance(project).getState(url);
if (state != null) {
TestStateInfo.Magnitude magnitude = TestIconMapper.getMagnitude(state.magnitude);
@@ -97,6 +97,6 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor {
}
}
return AllIcons.RunConfigurations.TestState.Run;
return isClass ? AllIcons.RunConfigurations.TestState.Run_run : AllIcons.RunConfigurations.TestState.Run;
}
}
platform/icons/src/runConfigurations/testState/run_run.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 163 B

platform/icons/src/runConfigurations/testState/run_run@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 270 B

platform/util/src/com/intellij/icons/AllIcons.java
+2
View File
@@ -1089,6 +1089,7 @@ public class AllIcons {
public static final Icon Green2 = IconLoader.getIcon("/runConfigurations/testState/green2.png"); // 12x12
public static final Icon Red2 = IconLoader.getIcon("/runConfigurations/testState/red2.png"); // 12x12
public static final Icon Run = IconLoader.getIcon("/runConfigurations/testState/run.png"); // 12x12
public static final Icon Run_run = IconLoader.getIcon("/runConfigurations/testState/run_run.png"); // 12x12
public static final Icon Yellow2 = IconLoader.getIcon("/runConfigurations/testState/yellow2.png"); // 12x12
}
@@ -1220,6 +1221,7 @@ public class AllIcons {
}
public static class Windows {
public static final Icon AppIconOk512 = IconLoader.getIcon("/windows/appIconOk512.png"); // 55x55
public static final Icon Close = IconLoader.getIcon("/windows/close.png"); // 16x16
public static final Icon Iconify = IconLoader.getIcon("/windows/iconify.png"); // 16x16
public static final Icon Maximize = IconLoader.getIcon("/windows/maximize.png"); // 16x16