Fix for #1393: restrict scope of isGroovyProject expression definition

groovy · Sep 21, 2022 · 8883c57 · 8883c57
1 parent f803eda
commit 8883c57
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/base/org.eclipse.jdt.groovy.core/plugin.xml b/base/org.eclipse.jdt.groovy.core/plugin.xml
@@ -32,7 +32,8 @@
    <extension point="org.eclipse.core.expressions.definitions">
       <definition
             id="org.eclipse.jdt.groovy.core.isGroovyProject">
-         <adapt type="org.eclipse.core.resources.IProject">
+         <adapt type="org.eclipse.core.resources.IResource">
+            <instanceof value="org.eclipse.core.resources.IProject"/>
             <test
                   property="org.eclipse.core.resources.projectNature"
                   value="org.eclipse.jdt.groovy.core.groovyNature">
@@ -43,14 +44,14 @@
             id="org.eclipse.jdt.groovy.core.isGroovySource">
          <adapt type="org.eclipse.core.resources.IResource">
             <instanceof value="org.eclipse.core.resources.IFile"/>
-            <test
-                  property="org.eclipse.core.resources.projectNature"
-                  value="org.eclipse.jdt.groovy.core.groovyNature">
-            </test>
             <test
                   property="org.eclipse.core.resources.contentTypeId"
                   value="org.eclipse.jdt.groovy.core.groovySource">
             </test>
+            <test
+                  property="org.eclipse.core.resources.projectNature"
+                  value="org.eclipse.jdt.groovy.core.groovyNature">
+            </test>
          </adapt>
       </definition>
    </extension>