This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 0d85660 Exported more packages to allow transformation loading, prevents LinkageErrors. new 74b9e17 Merge pull request #3027 from sdedic/groovy/classloading-fixes 0d85660 is described below commit 0d856604d00b330f39a39c25fdb860ddb5565f66 Author: Svata Dedic <svatopluk.de...@oracle.com> AuthorDate: Wed Jun 30 10:39:39 2021 +0200 Exported more packages to allow transformation loading, prevents LinkageErrors. --- groovy/groovy.editor/nbproject/project.xml | 2 +- .../org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java | 6 ------ groovy/libs.groovy/manifest.mf | 2 +- groovy/libs.groovy/nbproject/project.xml | 7 +++++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/groovy/groovy.editor/nbproject/project.xml b/groovy/groovy.editor/nbproject/project.xml index 1aeea86..e77eb00 100644 --- a/groovy/groovy.editor/nbproject/project.xml +++ b/groovy/groovy.editor/nbproject/project.xml @@ -258,7 +258,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>2.11</specification-version> + <specification-version>2.12</specification-version> </run-dependency> </dependency> <dependency> diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java index b53c49e..65a05b9 100644 --- a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java +++ b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java @@ -260,13 +260,7 @@ public class PathFinderVisitor extends ClassCodeVisitorSupport { @Override public void visitMethodCallExpression(MethodCallExpression node) { if (isInside(node, line, column)) { - // FIXME http://jira.codehaus.org/browse/GROOVY-3263 - if (node.isImplicitThis()) { - node.getMethod().visit(this); - node.getArguments().visit(this); - } else { super.visitMethodCallExpression(node); - } } } diff --git a/groovy/libs.groovy/manifest.mf b/groovy/libs.groovy/manifest.mf index e28f718..6ce61d5 100644 --- a/groovy/libs.groovy/manifest.mf +++ b/groovy/libs.groovy/manifest.mf @@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.libs.groovy OpenIDE-Module-Layer: org/netbeans/modules/libs/groovy/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/groovy/Bundle.properties -OpenIDE-Module-Specification-Version: 2.11 +OpenIDE-Module-Specification-Version: 2.12 diff --git a/groovy/libs.groovy/nbproject/project.xml b/groovy/libs.groovy/nbproject/project.xml index 2ec959d..6e04e95 100644 --- a/groovy/libs.groovy/nbproject/project.xml +++ b/groovy/libs.groovy/nbproject/project.xml @@ -29,8 +29,7 @@ <friend>org.netbeans.modules.groovy.editor</friend> <friend>org.netbeans.modules.groovy.refactoring</friend> <friend>org.netbeans.modules.groovy.support</friend> - <package>groovy.lang</package> - <package>groovy.lang.groovydoc</package> + <subpackages>groovy</subpackages> <package>groovyjarjarantlr</package> <package>groovyjarjarasm.asm</package> <package>org.codehaus.groovy</package> @@ -41,15 +40,19 @@ <package>org.codehaus.groovy.ast.stmt</package> <package>org.codehaus.groovy.ast.tools</package> <package>org.codehaus.groovy.classgen</package> + <package>org.codehaus.groovy.classgen.asm</package> <package>org.codehaus.groovy.control</package> <package>org.codehaus.groovy.control.customizers</package> <package>org.codehaus.groovy.control.customizers.builder</package> + <package>org.codehaus.groovy.control.io</package> <package>org.codehaus.groovy.control.messages</package> <package>org.codehaus.groovy.reflection</package> <package>org.codehaus.groovy.runtime</package> <package>org.codehaus.groovy.runtime.callsite</package> <package>org.codehaus.groovy.syntax</package> <package>org.codehaus.groovy.transform</package> + <package>org.codehaus.groovy.transform.sc</package> + <package>org.codehaus.groovy.transform.trait</package> <package>org.codehaus.groovy.transform.stc</package> </friend-packages> <class-path-extension> --------------------------------------------------------------------- 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