Skip to content

Commit 1640289

Browse files
committed
feat: add mybatis-sql-viewer svg and fix FunctionTooltip bug
1 parent 273a98e commit 1640289

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

src/main/java/io/github/linyimin/plugin/provider/generate/FunctionTooltip.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package io.github.linyimin.plugin.provider.generate;
22

3+
import com.intellij.openapi.wm.ToolWindowManager;
34
import com.intellij.psi.PsiElement;
5+
import com.intellij.psi.PsiIdentifier;
46
import com.intellij.psi.PsiMethod;
57
import com.intellij.psi.xml.XmlTag;
68
import com.intellij.util.Function;
9+
import com.intellij.util.xml.DomElement;
10+
import com.intellij.util.xml.DomUtil;
11+
import io.github.linyimin.plugin.dom.model.IdDomElement;
12+
13+
import java.util.Objects;
714

815

916
/**
@@ -23,13 +30,17 @@ public FunctionTooltip(PsiElement psiElement) {
2330

2431
@Override
2532
public String fun(PsiElement psiElement) {
26-
if (psiElement instanceof PsiMethod) {
27-
PsiMethod psiMethod = (PsiMethod) psiElement;
33+
if (psiElement instanceof PsiIdentifier && psiElement.getParent() instanceof PsiMethod) {
34+
PsiMethod psiMethod = (PsiMethod) psiElement.getParent();
2835
return msg + psiMethod.getName();
2936
}
3037
if (psiElement instanceof XmlTag) {
31-
XmlTag xmlTag = (XmlTag) psiElement;
32-
return msg + xmlTag.getName();
38+
DomElement domElement = DomUtil.getDomElement(psiElement);
39+
if (Objects.isNull(domElement)) {
40+
return null;
41+
}
42+
String id = ((IdDomElement)domElement).getId().getRawText();
43+
return msg + id;
3344
}
3445
return null;
3546
}

src/main/java/io/github/linyimin/plugin/utils/IconUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
public interface IconUtils {
1313
Icon JAVA_TO_XML_ICON = IconLoader.getIcon("/images/java_to_xml.svg", IconUtils.class);
1414
Icon XML_TO_JAVA_ICON = IconLoader.getIcon("/images/xml_to_java.svg", IconUtils.class);
15-
Icon GENERATE_ICON = IconLoader.getIcon("/images/generate.svg", IconUtils.class);
15+
Icon GENERATE_ICON = IconLoader.getIcon("/images/mybatis-sql-viewer.svg", IconUtils.class);
1616
}

src/main/resources/images/generate.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)