Merge pull request #162 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.3.1
+* Fix IDE hang when projects with different "Process files asynchronously" are open #160
+
 ## 1.3.0
 * Make it possible to run processors asynchronously #130
   * This way the UI should be more responsive when processing a lot of files

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'idea'
     id 'checkstyle'
     id 'pmd'
-    id 'org.jetbrains.intellij.platform' version '2.0.1'
+    id 'org.jetbrains.intellij.platform' version '2.1.0'
     id 'org.sonarqube' version '5.1.0.4882'
 }
 
@@ -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.0'),
+    testImplementation platform('org.junit:junit-bom:5.11.1'),
             'org.junit.jupiter:junit-jupiter',
             'org.junit.jupiter:junit-jupiter-engine',
             'org.assertj:assertj-core:3.26.3'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/software/xdev/saveactions/core/component/Engine.java

@@ -79,22 +79,25 @@ public void processPsiFilesIfNecessary(
 		}
 		if(!this.storage.isEnabled(this.activation))
 		{
-			LOGGER.info(String.format("Action \"%s\" not enabled on %s", this.activation.getText(), this.project));
+			LOGGER.info(String.format(
+				"Action \"%s\" not enabled on %s",
+				this.activation.getText(),
+				this.project.getName()));
 			return;
 		}
 
 		indicator.setIndeterminate(true);
 		final Set<PsiFile> psiFilesEligible = this.getEligiblePsiFiles(indicator, async);
 		if(psiFilesEligible.isEmpty())
 		{
-			LOGGER.info("No files are eligible");
+			LOGGER.info("No files are eligible - " + this.project.getName());
 			return;
 		}
 
 		final List<SaveCommand> processorsEligible = this.getEligibleProcessors(indicator, psiFilesEligible);
 		if(processorsEligible.isEmpty())
 		{
-			LOGGER.info("No processors are eligible");
+			LOGGER.info("No processors are eligible - " + this.project.getName());
 			return;
 		}
 
@@ -105,7 +108,7 @@ public void processPsiFilesIfNecessary(
 
 	private Set<PsiFile> getEligiblePsiFiles(final @NotNull ProgressIndicator indicator, final boolean async)
 	{
-		LOGGER.info(String.format("Processing %s files %s mode %s", this.project, this.psiFiles, this.mode));
+		LOGGER.info(String.format("Processing %s files %s mode %s", this.project.getName(), this.psiFiles, this.mode));
 		indicator.checkCanceled();
 		indicator.setText2("Collecting files to process");
 
@@ -124,7 +127,7 @@ private Set<PsiFile> getEligiblePsiFiles(final @NotNull ProgressIndicator indica
 		final @NotNull ProgressIndicator indicator,
 		final Set<PsiFile> psiFilesEligible)
 	{
-		LOGGER.info(String.format("Start processors (%d)", this.processors.size()));
+		LOGGER.info(String.format("Start processors (%d) - %s", this.processors.size(), this.project.getName()));
 		indicator.checkCanceled();
 		indicator.setText2("Collecting processors");
 
@@ -142,7 +145,7 @@ private void flushPsiFiles(
 		final boolean async,
 		final Set<PsiFile> psiFilesEligible)
 	{
-		LOGGER.info(String.format("Flushing files (%d)", psiFilesEligible.size()));
+		LOGGER.info(String.format("Flushing files (%d) - %s", psiFilesEligible.size(), this.project.getName()));
 		indicator.checkCanceled();
 		indicator.setText2("Flushing files");
 
@@ -176,7 +179,11 @@ private void execute(
 		final AtomicInteger executedCount = new AtomicInteger();
 		final List<SimpleEntry<Action, Result<ResultCode>>> results = saveCommands.stream()
 			.map(command -> {
-				LOGGER.info(String.format("Execute command %s on %d files", command, psiFilesEligible.size()));
+				LOGGER.info(String.format(
+					"Execute command %s on %d files - %s",
+					command,
+					psiFilesEligible.size(),
+					this.project.getName()));
 
 				indicator.checkCanceled();
 				indicator.setText2("Executing '" + command.getAction().getText() + "'");
@@ -189,9 +196,12 @@ private void execute(
 				return entry;
 			})
 			.toList();
-		LOGGER.info(String.format("Exit engine with results %s", results.stream()
-			.map(entry -> entry.getKey() + ":" + entry.getValue())
-			.toList()));
+		LOGGER.info(String.format(
+			"Exit engine with results %s - %s",
+			results.stream()
+				.map(entry -> entry.getKey() + ":" + entry.getValue())
+				.toList(),
+			this.project.getName()));
 	}
 
 	private boolean isPsiFileEligible(final Project project, final PsiFile psiFile)
@@ -211,7 +221,7 @@ private boolean isProjectValid(final Project project)
 		final boolean valid = project.isInitialized() && !project.isDisposed();
 		if(!valid)
 		{
-			LOGGER.info("Project invalid. Either not initialized or disposed.");
+			LOGGER.info(String.format("Project %s invalid. Either not initialized or disposed", project.getName()));
 		}
 		return valid;
 	}
@@ -260,7 +270,7 @@ private boolean isPsiFileFresh(final PsiFile psiFile)
 		final boolean isFresh = psiFile.getModificationStamp() != 0;
 		if(!isFresh)
 		{
-			LOGGER.info(String.format("File %s is not fresh.", psiFile));
+			LOGGER.info(String.format("File %s is not fresh", psiFile));
 		}
 		return isFresh;
 	}
@@ -270,7 +280,7 @@ private boolean isPsiFileValid(final PsiFile psiFile)
 		final boolean valid = psiFile.isValid();
 		if(!valid)
 		{
-			LOGGER.info(String.format("File %s is not valid.", psiFile));
+			LOGGER.info(String.format("File %s is not valid", psiFile));
 		}
 		return valid;
 	}
@@ -280,7 +290,7 @@ private boolean hasPsiFileText(final PsiFile psiFile)
 		final boolean valid = psiFile.getTextRange() != null;
 		if(!valid)
 		{
-			LOGGER.info(String.format("File %s has no text.", psiFile));
+			LOGGER.info(String.format("File %s has no text", psiFile));
 		}
 		return valid;
 	}

src/main/java/software/xdev/saveactions/core/service/impl/AbstractSaveActionsService.java

@@ -1,17 +1,18 @@
 package software.xdev.saveactions.core.service.impl;
 
 import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static software.xdev.saveactions.model.StorageFactory.JAVA;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Stream;
 
@@ -59,7 +60,8 @@ abstract class AbstractSaveActionsService implements SaveActionsService
 	private final boolean javaAvailable;
 	private final boolean compilingAvailable;
 
-	private final ReentrantLock guardedProcessPsiFilesLock = new ReentrantLock();
+	private final Map<Project, ReentrantLock> guardedProcessPsiFilesLocks =
+		Collections.synchronizedMap(new WeakHashMap<>());
 
 	protected AbstractSaveActionsService(final StorageFactory storageFactory)
 	{
@@ -100,20 +102,31 @@ public void guardedProcessPsiFiles(
 				@Override
 				public void run(@NotNull final ProgressIndicator indicator)
 				{
-					AbstractSaveActionsService.this.processPsiFilesIfNecessaryWithLock(engine, indicator);
+					AbstractSaveActionsService.this.processPsiFilesIfNecessaryWithLock(project, engine, indicator);
 				}
 			}.queue();
 			return;
 		}
 
-		this.processPsiFilesIfNecessaryWithLock(engine, null);
+		this.processPsiFilesIfNecessaryWithLock(project, engine, null);
 	}
 
-	private void processPsiFilesIfNecessaryWithLock(final Engine engine, final ProgressIndicator indicator)
+	private void processPsiFilesIfNecessaryWithLock(
+		final Project project,
+		final Engine engine,
+		final ProgressIndicator indicator)
 	{
-		LOGGER.trace("Getting lock");
-		this.guardedProcessPsiFilesLock.lock();
-		LOGGER.trace("Got lock");
+		if(LOGGER.isTraceEnabled())
+		{
+			LOGGER.trace("Getting lock - " + project.getName());
+		}
+		final ReentrantLock lock =
+			this.guardedProcessPsiFilesLocks.computeIfAbsent(project, ignored -> new ReentrantLock());
+		lock.lock();
+		if(LOGGER.isTraceEnabled())
+		{
+			LOGGER.trace("Got lock - " + project.getName());
+		}
 		try
 		{
 			engine.processPsiFilesIfNecessary(
@@ -122,8 +135,11 @@ private void processPsiFilesIfNecessaryWithLock(final Engine engine, final Progr
 		}
 		finally
 		{
-			this.guardedProcessPsiFilesLock.unlock();
-			LOGGER.trace("Released lock");
+			lock.unlock();
+			if(LOGGER.isTraceEnabled())
+			{
+				LOGGER.trace("Released lock - " + project.getName());
+			}
 		}
 	}
 
@@ -151,8 +167,8 @@ public List<QuickList> getQuickLists(final Project project)
 				.map(Integer::valueOf)
 				.map(quickListsIds::get)
 				.filter(Objects::nonNull)
-				.collect(toList()))
-			.orElse(new ArrayList<>());
+				.toList())
+			.orElseGet(List::of);
 	}
 
 	protected SaveActionsService addProcessors(final Stream<Processor> processors)

src/main/java/software/xdev/saveactions/core/service/impl/SaveActionsDefaultService.java

@@ -21,11 +21,10 @@
  */
 public final class SaveActionsDefaultService extends AbstractSaveActionsService
 {
-	
 	public SaveActionsDefaultService()
 	{
 		super(DEFAULT);
-		addProcessors(BuildProcessor.stream());
-		addProcessors(GlobalProcessor.stream());
+		this.addProcessors(BuildProcessor.stream());
+		this.addProcessors(GlobalProcessor.stream());
 	}
 }

src/main/java/software/xdev/saveactions/core/service/impl/SaveActionsJavaService.java

@@ -22,12 +22,11 @@
  */
 public final class SaveActionsJavaService extends AbstractSaveActionsService
 {
-	
 	public SaveActionsJavaService()
 	{
 		super(JAVA);
-		addProcessors(BuildProcessor.stream());
-		addProcessors(GlobalProcessor.stream());
-		addProcessors(JavaProcessor.stream());
+		this.addProcessors(BuildProcessor.stream());
+		this.addProcessors(GlobalProcessor.stream());
+		this.addProcessors(JavaProcessor.stream());
 	}
 }

src/main/java/software/xdev/saveactions/processors/java/InspectionRunnable.java

@@ -40,7 +40,7 @@ class InspectionRunnable implements Runnable
 		this.project = project;
 		this.psiFiles = psiFiles;
 		this.toolWrapper = new LocalInspectionToolWrapper(inspectionTool);
-		LOGGER.info(String.format("Running inspection for %s", inspectionTool.getShortName()));
+		LOGGER.info(String.format("Running inspection for %s - %s", inspectionTool.getShortName(), project.getName()));
 	}
 
 	@Override

src/main/java/software/xdev/saveactions/processors/java/inspection/CustomSerializableHasSerialVersionUidFieldInspection.java

@@ -36,14 +36,12 @@ public CustomSerializableHasSerialVersionUidFieldInspection()
 	@Override
 	public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getDisplayName()
 	{
-		
 		return this.getClass().getSimpleName();
 	}
 
 	@Override
 	public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getGroupDisplayName()
 	{
-		
 		return "SaveActionsInternal";
 	}