You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2017/10/22 19:30:17 UTC

[incubator-netbeans] branch jdk-javac updated (b09c3b0 -> 44f8c1d)

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

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


    from b09c3b0  Fixing NBScope handling - it is no longer a subclass of JavacScope.
     new 9d4759c  Fixing end positions returned by the parser.
     new 44f8c1d  Temporary workaround for newly added JavaFileManager.contains.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../netbeans/modules/java/source/parsing/ProxyFileManager.java    | 3 +++
 .../src/org/netbeans/lib/nbjavac/services/NBParserFactory.java    | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].

[incubator-netbeans] 02/02: Temporary workaround for newly added JavaFileManager.contains.

Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 44f8c1dfc24a980fec4642a992c380e3d1f27ab6
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Sun Oct 22 21:23:31 2017 +0200

    Temporary workaround for newly added JavaFileManager.contains.
---
 .../src/org/netbeans/modules/java/source/parsing/ProxyFileManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java.source.base/src/org/netbeans/modules/java/source/parsing/ProxyFileManager.java b/java.source.base/src/org/netbeans/modules/java/source/parsing/ProxyFileManager.java
index b3aef87..aef096d 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/parsing/ProxyFileManager.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/parsing/ProxyFileManager.java
@@ -1068,4 +1068,7 @@ public final class ProxyFileManager implements JavaFileManager {
             }
         }
     }
+    public boolean contains(Location l, FileObject f) {
+        return true;
+    }
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.

[incubator-netbeans] 01/02: Fixing end positions returned by the parser.

Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9d4759c97ab2e91514ab020e0320f6992748e83e
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Tue Oct 17 21:34:58 2017 +0200

    Fixing end positions returned by the parser.
---
 .../src/org/netbeans/lib/nbjavac/services/NBParserFactory.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBParserFactory.java b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBParserFactory.java
index ee294de..c658c52 100644
--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBParserFactory.java
+++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBParserFactory.java
@@ -33,6 +33,7 @@ import com.sun.tools.javac.tree.JCTree.JCExpression;
 import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
 import com.sun.tools.javac.tree.JCTree.JCModifiers;
 import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
+import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.List;
@@ -136,7 +137,12 @@ public class NBParserFactory extends ParserFactory {
             assignAnonymousClassIndices(names, toplevel, null, -1);
             return toplevel;
         }
-        
+
+        @Override
+        public int getEndPos(JCTree jctree) {
+            return TreeInfo.getEndPos(jctree, endPosTable);
+        }
+
         public final class EndPosTableImpl extends AbstractEndPosTable {
             
             private final Lexer lexer;

-- 
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.