Upgrade the project to IntelliJ 2018.1.6 (build 181.5540.7) and ignored a Runtime Exception from the Code Smell Detector if it is due to ‘cannot run under write acction’

Author: schaefa

AEM IDE Tooling 4 IntelliJ.iml

@@ -11,7 +11,7 @@
       <excludeFolder url="file://$MODULE_DIR$/eclipse.aem.tooling.generatedd.test.project" />
       <excludeFolder url="file://$MODULE_DIR$/src/main/java/com/headwire/aem/tooling/intellij/console/intellij" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-181.5540.7" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault.rcp:3.1.38" level="project" />
     <orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.1.38" level="project" />

META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.headwire.aem.tooling.intellij</id>
     <name>AEM IDE Tooling 4 IntelliJ</name>
-    <version>1.0.3.4-beta1</version>
+    <version>1.0.3.4-beta2</version>
     <vendor email="aemintellijplugin@headwire.com" url="https://www.headwire.com/aemintellijplugin">headwire.com Inc</vendor>
 
     <description><![CDATA[
@@ -16,12 +16,16 @@
 
     <change-notes><![CDATA[
         <ul>
-            <li>1.0.3.4-beta1:
+            <li>1.0.3.4-beta2:
                 <ol>
                     <li>
                         Added a fix of a threading issue inside the Import From action. IntelliJ does not permit (anymore)
                         to write in an User Action.
                     </li>
+                    <li>
+                        An exception during code change from the Code Smell Detector is ignored if it is based on
+                        the 'cannot run under write action' failure. There is not fix in sight from JetBrains or
+                        help on how to make this work so for now it is just ignored.
                 </ol>
             </li>
             <li>1.0.3.3:

Readme.md

@@ -47,10 +47,13 @@ The **master** is the latest release code and it the same as the highest
 
 #### Updates:
 
-**1.0.3.4-beta1**:
+**1.0.3.4-beta2**:
 * A fix for the Import From User Action that fails because I cannot write from a
   User Action.
-
+* An exception during code change from the Code Smell Detector is ignored if it is based on
+  the 'cannot run under write action' failure. There is not fix in sight from JetBrains or
+  help on how to make this work so for now it is just ignored.
+  
 **1.0.3.3**:
 * Working on issues with latest IntelliJ Releases.
 * All threading is centralized in single class and with it fixed some issues with threading

src/main/java/com/headwire/aem/tooling/intellij/communication/ContentResourceChangeListener.java

@@ -31,6 +31,7 @@
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileStatusNotification;
 import com.intellij.openapi.compiler.CompilerManager;
@@ -271,13 +272,8 @@ private void executeMake(final VirtualFileEvent event) {
             VirtualFile file = event.getFile();
             if("java".equalsIgnoreCase(file.getExtension())) {
                 //AS TODO: In order to use the Code Snell Detector this needs to be invoked in a Read Only Thread but part of the Dispatcher Thread
-                invokeAndWait(
-                    new InvokableRunner() {
-                        @Override
-                        public void run() {
-                            executeMakeInUIThread(event);
-                        }
-                    }
+                ReadAction.run(() ->
+                    executeMakeInUIThread(event)
                 );
             }
         }
@@ -293,12 +289,24 @@ private void executeMakeInUIThread(final VirtualFileEvent event) {
                 CodeSmellDetector codeSmellDetector = CodeSmellDetector.getInstance(project);
                 boolean isOk = true;
                 if(codeSmellDetector != null) {
-                    List<CodeSmellInfo> codeSmellInfoList = codeSmellDetector.findCodeSmells(Arrays.asList(event.getFile()));
-                    for(CodeSmellInfo codeSmellInfo: codeSmellInfoList) {
-                        if(codeSmellInfo.getSeverity() == HighlightSeverity.ERROR) {
-                            isOk = false;
-                            break;
+                    try {
+                        List<CodeSmellInfo> codeSmellInfoList = codeSmellDetector.findCodeSmells(Arrays.asList(event.getFile()));
+                        for (CodeSmellInfo codeSmellInfo : codeSmellInfoList) {
+                            if (codeSmellInfo.getSeverity() == HighlightSeverity.ERROR) {
+                                isOk = false;
+                                break;
+                            }
+                        }
+                    } catch(RuntimeException e) {
+                        // Swallow the exception if this is due to the Cannot Run Under Write Action issue
+                        if(!e.getMessage().contains("run under write action")) {
+                            throw e;
                         }
+                        else {
+                            Logger.getInstance(ContentResourceChangeListener.class).info(
+                                "Found 'cannot run under write action -> ignored"
+                            );
+                         }
                     }
                 }
                 if(isOk) {