[incubator-netbeans] 02/05: Changes to help java.completion to pass on JDK 11.

[jlahoda]

This is an automated email from the ASF dual-hosted git repository.

jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 849532e5c18d091c15eda86ed60189ac1788a1c0
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Tue Jun 19 20:17:42 2018 +0200

    Changes to help java.completion to pass on JDK 11.
---
 .../src/org/netbeans/modules/java/completion/JavaCompletionTask.java  | 3 ++-
 .../src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
 
b/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
index ccd90c8..24c1223 100644
--- 
a/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
+++ 
b/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
@@ -20,6 +20,7 @@
 package org.netbeans.modules.java.completion;
 
 import com.sun.source.tree.*;
+import com.sun.source.tree.Tree.Kind;
 import com.sun.source.util.*;
 
 import java.io.IOException;
@@ -4839,7 +4840,7 @@ public final class JavaCompletionTask<T> extends BaseTask 
{
                 }
             }
         }
-        return false;
+        return tree.getKind() == Kind.COMPILATION_UNIT;
     }
 
     private static boolean isAnnonInner(ElementHandle<TypeElement> elem) {
diff --git 
a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java 
b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
index c15d91c..258059c 100644
--- 
a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
+++ 
b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
@@ -20,6 +20,7 @@ package org.netbeans.lib.nbjavac.services;
 
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.comp.MemberEnter;
 import com.sun.tools.javac.tree.JCTree.JCBlock;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
@@ -92,6 +93,9 @@ public class NBJavadocMemberEnter extends JavadocMemberEnter {
         } finally {
             //reinstall init:
             tree.init = init;
+            if (init != null) {
+                tree.sym.flags_field |= Flags.HASINIT; //XXX: hack
+            }
         }
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists