Skip to content

Commit 9b66be6

Browse files
committed
update:优化一些报错问题
1 parent 9c810c2 commit 9b66be6

3 files changed

Lines changed: 17 additions & 13 deletions

File tree

src/com/sgaop/idea/linemarker/JavaSqlsXmlLineMarkerProvider.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.intellij.codeInsight.daemon.LineMarkerInfo;
44
import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor;
55
import com.intellij.icons.AllIcons;
6+
import com.intellij.openapi.diagnostic.Logger;
67
import com.intellij.openapi.editor.markup.GutterIconRenderer;
78
import com.intellij.psi.PsiElement;
89
import com.sgaop.idea.linemarker.navigation.SqlsXmlNavigationHandler;
@@ -11,15 +12,15 @@
1112
import org.jetbrains.annotations.Nullable;
1213

1314
import javax.swing.*;
14-
import java.util.Collection;
15-
import java.util.List;
1615

1716
/**
1817
* @author 黄川 huchuc@vip.qq.com
1918
* @date: 2019/4/2
2019
*/
2120
public class JavaSqlsXmlLineMarkerProvider extends LineMarkerProviderDescriptor {
2221

22+
private static final Logger LOG = Logger.getInstance(JavaSqlsXmlLineMarkerProvider.class);
23+
2324
@Nullable("null means disabled")
2425
@Override
2526
public String getName() {
@@ -34,10 +35,10 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
3435
Icon icon = AllIcons.FileTypes.Xml;
3536
return new LineMarkerInfo<>(psiElement, psiElement.getTextRange(), icon,
3637
new FunctionTooltip(), new SqlsXmlNavigationHandler(),
37-
GutterIconRenderer.Alignment.LEFT);
38+
GutterIconRenderer.Alignment.LEFT, this::getName);
3839
}
3940
} catch (Exception e) {
40-
e.printStackTrace();
41+
LOG.warn(e);
4142
}
4243
return null;
4344
}

src/com/sgaop/idea/linemarker/OkJsonUpdateLineMarkerProvider.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.intellij.codeInsight.daemon.LineMarkerInfo;
44
import com.intellij.codeInsight.daemon.LineMarkerProvider;
5+
import com.intellij.openapi.diagnostic.Logger;
56
import com.intellij.openapi.editor.markup.GutterIconRenderer;
67
import com.intellij.psi.PsiAnnotation;
78
import com.intellij.psi.PsiElement;
@@ -13,16 +14,14 @@
1314
import org.jetbrains.annotations.NotNull;
1415
import org.jetbrains.annotations.Nullable;
1516

16-
import java.util.Collection;
17-
import java.util.List;
18-
1917
/**
2018
* @author 黄川 huchuc@vip.qq.com
2119
* @date: 2019/5/24
2220
*/
2321
public class OkJsonUpdateLineMarkerProvider implements LineMarkerProvider {
2422

2523
static final String JSON_PREFIX = "json";
24+
private static final Logger LOG = Logger.getInstance(OkJsonUpdateLineMarkerProvider.class);
2625

2726
@Nullable
2827
@Override
@@ -33,14 +32,14 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
3332
PsiLiteralExpression literalExpression = (PsiLiteralExpression) psiAnnotation.findAttributeValue("value");
3433
String value = String.valueOf(literalExpression.getValue());
3534
if (value.startsWith(JSON_PREFIX)) {
36-
return new LineMarkerInfo<>(psiAnnotation, psiAnnotation.getTextRange(), NutzCons.NUTZ,
35+
return new LineMarkerInfo<PsiElement>(psiAnnotation, psiAnnotation.getTextRange(), NutzCons.NUTZ,
3736
new FunctionTooltip("快速配置"),
3837
new OkJsonUpdateNavigationHandler(value),
39-
GutterIconRenderer.Alignment.LEFT);
38+
GutterIconRenderer.Alignment.LEFT, () -> "json");
4039
}
4140
}
4241
} catch (Exception e) {
43-
e.printStackTrace();
42+
LOG.warn(e);
4443
}
4544
return null;
4645
}
@@ -55,4 +54,5 @@ private PsiAnnotation getPsiAnnotation(@NotNull PsiElement psiElement) {
5554
return null;
5655
}
5756

57+
5858
}

src/com/sgaop/idea/linemarker/SqlsXml2JavaLineMarkerProvider.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.intellij.codeInsight.daemon.LineMarkerInfo;
44
import com.intellij.codeInsight.daemon.LineMarkerProvider;
55
import com.intellij.icons.AllIcons;
6+
import com.intellij.openapi.diagnostic.Logger;
67
import com.intellij.openapi.editor.markup.GutterIconRenderer;
78
import com.intellij.psi.PsiElement;
89
import com.sgaop.idea.linemarker.navigation.Sqls2XmlNavigationHandler;
@@ -18,18 +19,20 @@
1819
*/
1920
public class SqlsXml2JavaLineMarkerProvider implements LineMarkerProvider {
2021

22+
private static final Logger LOG = Logger.getInstance(SqlsXml2JavaLineMarkerProvider.class);
23+
2124
@Nullable
2225
@Override
2326
public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
2427
try {
2528
if (SqlsXmlUtil.isSqsXmlFile(psiElement)) {
2629
Icon icon = AllIcons.FileTypes.Java;
27-
return new LineMarkerInfo<>(psiElement, psiElement.getTextRange(), icon,
30+
return new LineMarkerInfo<PsiElement>(psiElement, psiElement.getTextRange(), icon,
2831
new FunctionTooltip(), new Sqls2XmlNavigationHandler(),
29-
GutterIconRenderer.Alignment.LEFT);
32+
GutterIconRenderer.Alignment.LEFT, () -> "sql2xml");
3033
}
3134
} catch (Exception e) {
32-
e.printStackTrace();
35+
LOG.warn(e);
3336
}
3437
return null;
3538
}

0 commit comments

Comments
 (0)