#32989: Merged main into branch

tiobe · Nov 30, 2023 · b8e2f2a · b8e2f2a
2 parents 0675dac + 4318fb3
commit b8e2f2a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeAction.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeAction.kt
@@ -41,12 +41,18 @@ abstract class AnalyzeAction : AbstractAction() {
     }
 
     private fun analyze(context: DataContext, project: Project) {
-        // try to get the file/folder from context, otherwise check if they can be retrieved from the opened editor
-        val file: VirtualFile? = PlatformDataKeys.VIRTUAL_FILE.getData(context).let {
-            it ?: project.let { it1 ->
-                FileEditorManager.getInstance(it1).selectedEditor?.file
+        // If analyzeFileOpenedInEditor is true, use the file opened in the editor. Else it will try to
+        // get the file/folder from context, otherwise check if they can be retrieved from the opened editor.
+        val file: VirtualFile? = analyzeFileOpenedInEditor().let {
+            if (it) {
+                FileEditorManager.getInstance(project).selectedEditor?.file
+            } else {
+                PlatformDataKeys.VIRTUAL_FILE.getData(context).let {virtualFile ->
+                    virtualFile ?: FileEditorManager.getInstance(project).selectedEditor?.file
+                }
             }
         }
+
         if (isFileRequired() && file == null) {
             showErrorMessageDialog(
                 ErrorMessages.NO_ACTIVE_FILE
@@ -88,4 +94,6 @@ abstract class AnalyzeAction : AbstractAction() {
     protected abstract fun getTicsCommand(file: VirtualFile?, project: Project?): GeneralCommandLine
 
     protected abstract fun isFileRequired(): Boolean
+
+    protected abstract fun analyzeFileOpenedInEditor(): Boolean
 }
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFile.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFile.kt
@@ -23,4 +23,8 @@ open class AnalyzeFile : AnalyzeAction() {
     override fun isFileRequired(): Boolean {
         return true
     }
+
+    override fun analyzeFileOpenedInEditor(): Boolean {
+        return true
+    }
 }
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFileOrFolder.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFileOrFolder.kt
@@ -18,4 +18,8 @@ class AnalyzeFileOrFolder : AnalyzeFile() {
 
         super.update(e)
     }
+
+    override fun analyzeFileOpenedInEditor(): Boolean {
+        return false
+    }
 }
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeProject.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeProject.kt
@@ -24,4 +24,8 @@ class AnalyzeProject : AnalyzeAction() {
     override fun isFileRequired(): Boolean {
         return false
     }
+
+    override fun analyzeFileOpenedInEditor(): Boolean {
+        return false
+    }
 }