You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2018/05/15 11:35:48 UTC
[incubator-netbeans] branch master updated: nb-javac jars upgrade
for NETBEANS-463 fix (#468)
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0647f35 nb-javac jars upgrade for NETBEANS-463 fix (#468)
0647f35 is described below
commit 0647f35f045bd5c9996487a4627a3c7c84faa19b
Author: Reema Taneja <32...@users.noreply.github.com>
AuthorDate: Tue May 15 17:05:46 2018 +0530
nb-javac jars upgrade for NETBEANS-463 fix (#468)
* [NETBEANS-463] Fixed illegalargexception thrown from var instance variable
* [NETBEANS-463] Fixed illegalargexception thrown from var instance variable
* [NETBEANS-463] Fixed illegalargexception thrown from var instance variable
* Testcase review comments fixes
* updated nb-javac jars
* removed unused import and extra space
---
.../api/java/source/TreePathHandleTest.java | 30 ++++++++++++++++++++++
libs.javacapi/external/binaries-list | 2 +-
libs.javacimpl/external/binaries-list | 2 +-
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java b/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java
index 5467a52..c835d33 100644
--- a/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java
@@ -29,8 +29,11 @@ import java.io.OutputStream;
import java.security.Permission;
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.junit.NbTestCase;
+import org.netbeans.modules.java.source.parsing.JavacParser;
+import org.netbeans.modules.java.source.usages.ClassFileUtil;
import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -422,6 +425,33 @@ public class TreePathHandleTest extends NbTestCase {
assertNotNull(handle.resolveElement(info));
}
+ public void testVarInstanceMember() throws Exception {
+ JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = true;
+ FileObject file = FileUtil.createData(sourceRoot, "test/Test.java"); //NOI18N
+ String code = "package test; public class Test {var v1;\n var v2=()->{}; \n public Test() {}}"; //NOI18N
+
+ writeIntoFile(file, code);
+ SourceUtilsTestUtil.setSourceLevel(file, "1.10"); //NOI18N
+ JavaSource js = JavaSource.forFileObject(file);
+
+ CompilationInfo info = SourceUtilsTestUtil.getCompilationInfo(js, Phase.RESOLVED);
+ assertTrue(info.getDiagnostics().size() > 0);
+
+ TreePath tp = info.getTreeUtilities().pathFor(code.indexOf("var v1") + 1); //NOI18N
+ VariableElement elem = (VariableElement) info.getTrees().getElement(tp);
+ ClassFileUtil.createFieldDescriptor(elem);
+ TreePathHandle handle = TreePathHandle.create(tp, info);
+ assertNotNull(handle.getElementHandle());
+
+ tp = info.getTreeUtilities().pathFor(code.indexOf("var v2") + 1); //NOI18N
+ elem = (VariableElement) info.getTrees().getElement(tp);
+ ClassFileUtil.createFieldDescriptor(elem);
+
+ handle = TreePathHandle.create(tp, info);
+ assertNotNull(handle.getElementHandle());
+ JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = false;
+ }
+
private static final class SecMan extends SecurityManager {
@Override
diff --git a/libs.javacapi/external/binaries-list b/libs.javacapi/external/binaries-list
index 8f48fab..f191d04 100644
--- a/libs.javacapi/external/binaries-list
+++ b/libs.javacapi/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-1FD58C0401F7F012CE366CFE9E1BB9DA7AB7768F nb-javac-9-api.jar
+C118C62F36DEA3EDCBC53B95DDA3275B012B4DFC nb-javac-9-api.jar
diff --git a/libs.javacimpl/external/binaries-list b/libs.javacimpl/external/binaries-list
index 0a3d590..c5db0c2 100644
--- a/libs.javacimpl/external/binaries-list
+++ b/libs.javacimpl/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-B0715954783E5F4909E329FA39E8BC50E161B1ED nb-javac-9-impl.jar
+58FB802FDDA63D542093356F44F6CC896AF109E1 nb-javac-9-impl.jar
--
To stop receiving notification emails like this one, please contact
geertjan@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists