You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/06/08 08:56:09 UTC
[GitHub] jlahoda closed pull request #563: [NETBEANS-774] Disable var hint
for anonymous type
jlahoda closed pull request #563: [NETBEANS-774] Disable var hint for anonymous type
URL: https://github.com/apache/incubator-netbeans/pull/563
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/java.hints/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayType.java b/java.hints/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayType.java
index 428cb0577..9568817dd 100644
--- a/java.hints/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayType.java
+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayType.java
@@ -96,9 +96,9 @@
TypeMirror etType = trees.getTypeMirror(new TreePath(initArrayTreePath, tree));
- //skipped fix for invalid array member and for parameterized array member.
+ //skipped fix for invalid array member, anonymous class and parameterized array member.
if (etType == null || etType.getKind() == TypeKind.ERROR || (etType.getKind() == TypeKind.DECLARED
- && !((DeclaredType) etType).getTypeArguments().isEmpty())) {
+ && !((DeclaredType) etType).getTypeArguments().isEmpty()) || Utilities.isAnonymousType(etType)) {
return null;
}
diff --git a/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java b/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
index 4fb6e5f81..414fa5f8d 100644
--- a/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
@@ -138,6 +138,7 @@
import com.sun.tools.javac.util.Log;
import java.net.URI;
import java.util.concurrent.Callable;
+import javax.lang.model.element.NestingKind;
import javax.lang.model.type.ErrorType;
import javax.lang.model.type.UnionType;
import javax.tools.Diagnostic;
@@ -2995,4 +2996,15 @@ public static FileObject getModuleInfo(CompilationInfo info) {
public static boolean isModular(CompilationInfo info) {
return getModuleInfo(info) != null;
}
+
+ public static boolean isAnonymousType(TypeMirror type) {
+ if (type.getKind() == TypeKind.DECLARED) {
+ DeclaredType dt = (DeclaredType) type;
+ TypeElement typeElem = (TypeElement) dt.asElement();
+ if (typeElem.getNestingKind() == NestingKind.ANONYMOUS) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitType.java b/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitType.java
index 9a0994580..db826e7f3 100644
--- a/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitType.java
+++ b/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitType.java
@@ -19,12 +19,12 @@
package org.netbeans.modules.java.hints.jdk;
import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePath;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.ElementKind;
+import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic;
@@ -151,17 +151,21 @@ private static boolean hasDiagnosticErrors(CompilationInfo info, Tree tree) {
//filter anonymous class and intersection types
private static boolean isValidType(HintContext ctx) {
TreePath treePath = ctx.getPath();
- TreePath initTreePath = ctx.getVariables().get("$init"); //NOI18N
+ TypeMirror variableTypeMirror = ctx.getInfo().getTrees().getElement(treePath).asType();
- if (initTreePath.getLeaf().getKind() == Tree.Kind.NEW_CLASS) {
- NewClassTree nct = ((NewClassTree) initTreePath.getLeaf());
- if (nct.getClassBody() != null) {
- return false;
+ if (Utilities.isAnonymousType(variableTypeMirror)) {
+ return false;
+ } else if (variableTypeMirror.getKind() == TypeKind.DECLARED) {
+ DeclaredType dt = (DeclaredType) variableTypeMirror;
+ if (dt.getTypeArguments().size() > 0) {
+ for (TypeMirror paramType : dt.getTypeArguments()) {
+ if (Utilities.isAnonymousType(paramType)) {
+ return false;
+ }
+ }
}
}
- TypeMirror variableTypeMirror = ctx.getInfo().getTrees().getElement(treePath).asType();
-
if (!Utilities.isValidType(variableTypeMirror) ||(variableTypeMirror.getKind() == TypeKind.INTERSECTION)) {
return false;
}
diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayTypeTest.java b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayTypeTest.java
index a36d16f36..a5d79cbee 100644
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayTypeTest.java
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/ConvertInvalidVarToExplicitArrayTypeTest.java
@@ -63,6 +63,12 @@ public void testInvalidArrayAsInitializer() throws Exception {
"package test; public class Test {{final var j = {int1,var1,\"hello\"};}}",
-1);
}
+
+ public void testAnonymousClassTypeArray() throws Exception {
+ performAnalysisTest("test/Test.java",
+ "package test; public class Test {{var j = {new Object(){}};}}",
+ -1);
+ }
public void testParameterizedElements() throws Exception {
performAnalysisTest("test/Test.java",
diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitTypeTest.java b/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitTypeTest.java
index 3942ee7f5..69bbe476f 100644
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitTypeTest.java
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertVarToExplicitTypeTest.java
@@ -350,6 +350,23 @@ public void testVarToGenericType2() throws Exception {
+ " }\n"
+ " <Z> List<Z> listOf(Z z) { return null; }\n"
+ "}");
- }
-
+ }
+
+ @Test
+ public void testNoVarHintForAnonymousType() throws Exception {
+ HintTest.create()
+ .input("package test;\n"
+ + "public class Test {\n"
+ + "void v() {\n"
+ + " var v = get(new Object(){});\n"
+ + "}\n"
+ + "\n"
+ + "<Z> Z get(Z z) {\n"
+ + " return z; \n"
+ + "}"
+ + "}")
+ .sourceLevel("1.10")
+ .run(ConvertVarToExplicitType.class)
+ .assertNotContainsWarnings(VAR_CONV_WARNING);
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists