Merge pull request #183 from xdev-software/develop

AB-xdev · web-flow · commit 81d915482f3e · 2024-11-11T09:09:07.000+01:00
Release
diff --git a/.config/pmd/ruleset.xml b/.config/pmd/ruleset.xml
@@ -151,5 +151,12 @@
 		<exclude name="UseStringBufferForStringAppends"/>
 	</rule>
 
+	<rule ref="category/java/performance.xml/TooFewBranchesForSwitch">
+		<properties>
+			<!-- If you have one case only please use a if -->
+			<property name="minimumNumberCaseForASwitch" value="2"/>
+		</properties>
+	</rule>
+
 	<rule ref="category/java/security.xml"/>
 </ruleset>
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -11,14 +11,17 @@ permissions:
 jobs:
   link-checker:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
 
       - run: mv .github/.lycheeignore .lycheeignore
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1
+        uses: lycheeverse/lychee-action@v2
+        with:
+          fail: false # Don't fail on broken links, create an issue instead
 
       - name: Find already existing issue
         id: find-issue
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
@@ -22,6 +22,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     strategy:
       matrix:
@@ -76,6 +77,7 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
@@ -98,6 +100,7 @@ jobs:
   pmd:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,9 @@ permissions:
   pull-requests: write
 
 jobs:
-  check_code: # Validates the code
+  check_code:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
       
@@ -45,6 +46,7 @@ jobs:
   prepare_release:
     runs-on: ubuntu-latest
     needs: [check_code]
+    timeout-minutes: 10
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
@@ -99,6 +101,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     needs: [prepare_release]
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
     
@@ -132,6 +135,7 @@ jobs:
   after_release:
     runs-on: ubuntu-latest
     needs: [publish]
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v4
       
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -27,6 +27,7 @@ jobs:
   token-check:
     runs-on: ubuntu-latest
     if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
+    timeout-minutes: 5
     outputs:
       hasToken: ${{ steps.check-token.outputs.has }}
     steps:
@@ -40,6 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: token-check
     if: ${{ needs.token-check.outputs.hasToken }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:
@@ -67,7 +69,7 @@ jobs:
 
       - name: Build
         run: |
-          ./gradlew build sonarqube --info \
+          ./gradlew build sonarqube -x test --info \
             -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
             -Dsonar.organization=${{ env.SONARCLOUD_ORG }} \
             -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -14,6 +14,7 @@ permissions:
 jobs:
   labels:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
@@ -31,6 +31,7 @@ permissions:
 jobs:
   update:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     outputs:
       update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
       create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
@@ -180,6 +181,7 @@ jobs:
     needs: [update]
     if: needs.update.outputs.create_update_branch_merged_pr == 1
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ plugins {
 }
 
 ext {
-    checkstyleVersion = '10.18.1'
-    pmdVersion = '7.5.0'
+    checkstyleVersion = '10.20.1'
+    pmdVersion = '7.7.0'
 }
 
 def properties(String key) {
@@ -58,7 +58,7 @@ dependencies {
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
     pmd "net.sourceforge.pmd:pmd-ant:${pmdVersion}",
             "net.sourceforge.pmd:pmd-java:${pmdVersion}"
-    testImplementation platform('org.junit:junit-bom:5.11.1'),
+    testImplementation platform('org.junit:junit-bom:5.11.3'),
             'org.junit.jupiter:junit-jupiter',
             'org.junit.jupiter:junit-jupiter-engine',
             'org.assertj:assertj-core:3.26.3'
diff --git a/gradle.properties b/gradle.properties
@@ -2,11 +2,11 @@
 pluginGroup=software.xdev.saveactions
 pluginName=Save Actions X
 # SemVer format -> https://semver.org
-pluginVersion=1.3.2-SNAPSHOT
+pluginVersion=1.4.0-SNAPSHOT
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IC
-platformVersion=2024.2.2
-platformSinceBuild=242
+platformVersion=243.21565.23
+platformSinceBuild=243
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformBundledPlugins=com.intellij.java
diff --git a/src/main/java/software/xdev/saveactions/core/listener/SaveActionsDocumentManagerListener.java b/src/main/java/software/xdev/saveactions/core/listener/SaveActionsDocumentManagerListener.java
@@ -5,9 +5,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -43,12 +41,6 @@ public void beforeAllDocumentsSaving()
 		LOGGER.debug(
 			"[+] Start SaveActionsDocumentManagerListener#beforeAllDocumentsSaving, " + this.project.getName());
 		
-		if(REQUIRES_PROJECT_LOAD_IGNORE_WORKAROUND && isInvokedFromProjectLoadBefore243())
-		{
-			LOGGER.debug("Ignoring due to PROJECT_LOAD_IGNORE_WORKAROUND");
-			return;
-		}
-		
 		final List<Document> unsavedDocuments = Arrays.asList(FileDocumentManager.getInstance().getUnsavedDocuments());
 		if(!unsavedDocuments.isEmpty())
 		{
@@ -83,38 +75,4 @@ private synchronized void initPsiDocManager()
 			this.psiDocumentManager = PsiDocumentManager.getInstance(this.project);
 		}
 	}
-	
-	// region PROJECT_LOAD_IGNORE_WORKAROUND
-	// https://github.com/xdev-software/intellij-plugin-save-actions/issues/145
-	private static final boolean REQUIRES_PROJECT_LOAD_IGNORE_WORKAROUND =
-		determineIfRequiresProjectLoadIgnoreWorkaround();
-	
-	@SuppressWarnings("checkstyle:MagicNumber")
-	static boolean determineIfRequiresProjectLoadIgnoreWorkaround()
-	{
-		try
-		{
-			// Problem was fixed in 2024.3
-			return ApplicationInfo.getInstance().getBuild().getBaselineVersion() < 243;
-		}
-		catch(final Exception ex)
-		{
-			LOGGER.warn("Failed to determine IDE version", ex);
-			return false;
-		}
-	}
-	
-	@SuppressWarnings("checkstyle:MagicNumber")
-	static boolean isInvokedFromProjectLoadBefore243()
-	{
-		// The invoking method ProjectSettingsTracker$submitSettingsFilesRefresh is usually at index 17 and 18
-		return Stream.of(Thread.currentThread().getStackTrace())
-			.map(StackTraceElement::getClassName)
-			.skip(16)
-			.limit(5)
-			.anyMatch(s -> s.startsWith(
-				"com.intellij.openapi.externalSystem.autoimport.ProjectSettingsTracker$submitSettingsFilesRefresh"));
-	}
-	
-	// endregion
 }
diff --git a/src/main/java/software/xdev/saveactions/core/service/impl/AbstractSaveActionsService.java b/src/main/java/software/xdev/saveactions/core/service/impl/AbstractSaveActionsService.java
@@ -48,8 +48,6 @@
  * The psi files are ide wide, that means they are shared between projects (and editor windows), so we need to check if
  * the file is physically in that project before reformatting, or else the file is formatted twice and intellij will ask
  * to confirm unlocking of non-project file in the other project, see {@link Engine} for more details.
- *
- * @since 2.4.0
  */
 abstract class AbstractSaveActionsService implements SaveActionsService
 {
diff --git a/src/main/java/software/xdev/saveactions/core/service/impl/SaveActionsDefaultService.java b/src/main/java/software/xdev/saveactions/core/service/impl/SaveActionsDefaultService.java
@@ -17,7 +17,6 @@
  * <p/>
  *
  * @see AbstractSaveActionsService
- * @since 2.4.0
  */
 public final class SaveActionsDefaultService extends AbstractSaveActionsService
 {
diff --git a/src/main/java/software/xdev/saveactions/core/service/impl/SaveActionsJavaService.java b/src/main/java/software/xdev/saveactions/core/service/impl/SaveActionsJavaService.java
@@ -18,7 +18,6 @@
  * <p/>
  *
  * @see AbstractSaveActionsService
- * @since 2.4.0
  */
 public final class SaveActionsJavaService extends AbstractSaveActionsService
 {
diff --git a/src/main/java/software/xdev/saveactions/processors/BuildProcessor.java b/src/main/java/software/xdev/saveactions/processors/BuildProcessor.java
@@ -17,10 +17,13 @@
 import com.intellij.debugger.impl.DebuggerSession;
 import com.intellij.debugger.ui.HotSwapUI;
 import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionUiKind;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
@@ -83,8 +86,16 @@ public enum BuildProcessor implements Processor
 					.add(EDITOR, FileEditorManager.getInstance(project).getSelectedTextEditor())
 					.setParent(null)
 					.build();
-				AnActionEvent event = AnActionEvent.createFromAnAction(anAction, null, UNKNOWN, dataContext);
-				anAction.actionPerformed(event);
+				AnActionEvent event = AnActionEvent.createEvent(
+					dataContext,
+					anAction.getTemplatePresentation().clone(),
+					UNKNOWN,
+					ActionUiKind.NONE,
+					null);
+				
+				// Run Action on EDT thread
+				ApplicationManager.getApplication().invokeLater(() ->
+					ActionUtil.performActionDumbAwareWithCallbacks(anAction, event));
 			}
 		})
 		{
diff --git a/src/main/java/software/xdev/saveactions/ui/java/IdeSupportPanel.java b/src/main/java/software/xdev/saveactions/ui/java/IdeSupportPanel.java
@@ -78,7 +78,7 @@ private TextFieldWithBrowseButton getPath(final String configurationPath)
 		field.getField().setEnabled(false);
 		field.getField().setText(configurationPath);
 		final TextFieldWithBrowseButton resultPath = new TextFieldWithBrowseButton(field.getField());
-		resultPath.addBrowseFolderListener(null, null, null, descriptor, TEXT_FIELD_WHOLE_TEXT);
+		resultPath.addBrowseFolderListener(null, descriptor, TEXT_FIELD_WHOLE_TEXT);
 		return resultPath;
 	}
 	
diff --git a/src/test/java/software/xdev/saveactions/core/action/ShortcutActionConstants.java b/src/test/java/software/xdev/saveactions/core/action/ShortcutActionConstants.java
@@ -6,6 +6,7 @@
 import java.util.function.Consumer;
 
 import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionUiKind;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
@@ -16,26 +17,31 @@
 
 public interface ShortcutActionConstants
 {
-	
-	Consumer<CodeInsightTestFixture> SAVE_ACTION_SHORTCUT_MANAGER = (fixture) ->
+	Consumer<CodeInsightTestFixture> SAVE_ACTION_SHORTCUT_MANAGER = fixture ->
 		WriteCommandAction.writeCommandAction(fixture.getProject()).run(() -> runFixure(fixture));
 	
-	static void runFixure(CodeInsightTestFixture fixture)
+	static void runFixure(final CodeInsightTestFixture fixture)
 	{
 		// set modification timestamp ++
 		fixture.getFile().clearCaches();
 		
-		ActionManager actionManager = ActionManager.getInstance();
-		AnAction action = actionManager.getAction(ShortcutAction.class.getName());
+		final ActionManager actionManager = ActionManager.getInstance();
+		final AnAction action = actionManager.getAction(ShortcutAction.class.getName());
 		
-		DataContext dataContext = SimpleDataContext.builder()
+		final DataContext dataContext = SimpleDataContext.builder()
 			.add(PROJECT, fixture.getProject())
 			.add(PSI_FILE, fixture.getFile())
 			.setParent(null)
 			.build();
 		
 		// call plugin on document
-		AnActionEvent event = AnActionEvent.createFromAnAction(action, null, "save-actions", dataContext);
+		final AnActionEvent event = AnActionEvent.createEvent(
+			dataContext,
+			action.getTemplatePresentation().clone(),
+			"save-actions",
+			ActionUiKind.NONE,
+			null);
+		
 		new ShortcutAction().actionPerformed(event);
 	}
 }
