[GitHub] geertjanw closed pull request #389: [NETBEANS-299] Fixing parser over classfiles, tested by java.source.b?

[GitBox <gi...@apache.org>]

geertjanw closed pull request #389: [NETBEANS-299] Fixing parser over classfiles, tested by java.source.b?
URL: https://github.com/apache/incubator-netbeans/pull/389
 
 
   

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.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java b/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
index c3fb0e960..baa350827 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
@@ -66,6 +66,7 @@
 import javax.swing.text.Document;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
 
 import org.netbeans.api.annotations.common.NonNull;
 import org.netbeans.api.annotations.common.NullAllowed;
@@ -724,8 +725,14 @@ static JavacTaskImpl createJavacTask(
                 compilerOptions = null;
                 sourceLevel = null;
             }
-            final JavacTaskImpl javacTask = createJavacTask(
-                    cpInfo,
+            AbstractSourceFileObject source = null;
+            if (file != null) {
+                source = FileObjects.sourceFileObject(file, root);
+                if (source.getKind() != Kind.SOURCE) {
+                    source = null;
+                }
+            }
+            final JavacTaskImpl javacTask = createJavacTask(cpInfo,
                     diagnosticListener,
                     sourceLevel != null ? sourceLevel.getSourceLevel() : null,
                     sourceLevel != null ? sourceLevel.getProfile() : null,
@@ -735,7 +742,7 @@ static JavacTaskImpl createJavacTask(
                     APTUtils.get(root),
                     compilerOptions,
                     additionalModules,
-                    file != null ? Arrays.asList(FileObjects.sourceFileObject(file, root)) : Collections.emptyList());
+                    source != null ? Arrays.asList(source) : Collections.emptyList());
             Lookup.getDefault()
                   .lookupAll(TreeLoaderRegistry.class)
                   .stream()


 

----------------------------------------------------------------
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