Show menu entry "Refresh Gradle Project" for Kotlin DSL scripts (#1287)

As for Groovy DSL scripts show the "Refresh Gradle Project" action when a .gradle.kts file is selected in the Package/Project Explorer or opened in an editor. The common property tests have been refactored out into a separate expression definition.
eclipse-buildship · Jan 11, 2024 · 0800e1c · 0800e1c
1 parent 3803896
commit 0800e1c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 29 deletions.
diff --git a/...src/main/java/org/eclipse/buildship/core/internal/configuration/GradleResourceTester.java b/...src/main/java/org/eclipse/buildship/core/internal/configuration/GradleResourceTester.java
@@ -19,6 +19,7 @@
  * <ul>
  *  <li>a Gradle project</li>
  *  <li>a .gradle file</li>
+ *  <li>a .gradle.kts file</li>
  *  <li>a gradle.properties file</li>
  * </ul>
  * @author Stefan Oehme
@@ -32,7 +33,7 @@ public boolean test(Object receiver, String property, Object[] args, Object expe
             IResource resource = (IResource) receiver;
             IProject project = resource.getProject();
             if (GradleProjectNature.isPresentOn(project)) {
-                return resource instanceof IProject || "gradle".equals(resource.getFileExtension()) || "gradle.properties".equals(resource.getName());
+                return resource instanceof IProject || "gradle".equals(resource.getFileExtension()) || resource.getName().endsWith(".gradle.kts") || "gradle.properties".equals(resource.getName());
             }
         }
         return false;

diff --git a/org.eclipse.buildship.ui/plugin.xml b/org.eclipse.buildship.ui/plugin.xml
@@ -201,21 +201,16 @@
                 <iterate
                         operator="or"
                         ifEmpty="false">
-                    <adapt
-                            type="org.eclipse.core.resources.IResource">
-                        <and>
-                            <test
-                                    forcePluginActivation="true"
-                                    property="org.eclipse.core.resources.projectNature"
-                                    value="org.eclipse.buildship.core.gradleprojectnature">
-                            </test>
-                            <test
-                                    forcePluginActivation="true"
-                                    property="org.eclipse.buildship.core.isGradleResource">
-                            </test>
-                         </and>
-                    </adapt>
+                   <reference
+                         definitionId="org.eclipse.buildship.ui.GradleResourceInGradleProject">
+                   </reference>
                 </iterate>
+                <with
+                      variable="activeEditorInput">
+                   <reference
+                         definitionId="org.eclipse.buildship.ui.GradleResourceInGradleProject">
+                   </reference>
+                </with>
             </or>
          </activeWhen>
       </handler>
@@ -455,22 +450,17 @@
                             <iterate
                                     operator="or"
                                     ifEmpty="false">
-                                 <adapt
-                                            type="org.eclipse.core.resources.IResource">
-                                         <and>
-                                            <test
-                                                    forcePluginActivation="true"
-                                                    property="org.eclipse.core.resources.projectNature"
-                                                    value="org.eclipse.buildship.core.gradleprojectnature">
-                                            </test>
-                                            <test
-                                                    forcePluginActivation="true"
-                                                    property="org.eclipse.buildship.core.isGradleResource">
-                                            </test>
-                                         </and>
-                                </adapt>
+                               <reference
+                                     definitionId="org.eclipse.buildship.ui.GradleResourceInGradleProject">
+                               </reference>
                             </iterate>
                         </with>
+                        <with
+                              variable="activeEditorInput">
+                           <reference
+                                 definitionId="org.eclipse.buildship.ui.GradleResourceInGradleProject">
+                           </reference>
+                        </with>
                     </or>
                 </visibleWhen>
             </menu>
@@ -665,4 +655,24 @@
           </part>
        </actionSetPartAssociation>
     </extension>
+    <extension
+          point="org.eclipse.core.expressions.definitions">
+       <definition
+             id="org.eclipse.buildship.ui.GradleResourceInGradleProject">
+          <adapt
+                type="org.eclipse.core.resources.IResource">
+             <and>
+                <test
+                      forcePluginActivation="true"
+                      property="org.eclipse.core.resources.projectNature"
+                      value="org.eclipse.buildship.core.gradleprojectnature">
+                </test>
+                <test
+                      forcePluginActivation="true"
+                      property="org.eclipse.buildship.core.isGradleResource">
+                </test>
+             </and>
+          </adapt>
+       </definition>
+    </extension>
 </plugin>