attempt to fix disabled highlighting in liveplugins

dkandalov · Feb 20, 2023 · 6d619d9 · 6d619d9
1 parent 191c255
commit 6d619d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/liveplugin/implementation/LivePlugin.kt b/src/main/liveplugin/implementation/LivePlugin.kt
@@ -29,6 +29,9 @@ fun List<FilePath>.toLivePlugins() =
 private tailrec fun FilePath.findParentPluginFolder(): FilePath? =
     if (isPluginFolder()) this else parent?.findParentPluginFolder()
 
+fun FilePath.isPartOfPlugin(): Boolean =
+    findParentPluginFolder() != null
+
 fun FilePath.isPluginFolder(): Boolean {
     if (!isDirectory && exists()) return false
     val parentPath = parent ?: return false

diff --git a/src/main/liveplugin/implementation/ide-extensions.kt b/src/main/liveplugin/implementation/ide-extensions.kt
@@ -78,12 +78,12 @@ class LivePluginDirectoryCompletionContributor : CreateDirectoryCompletionContri
 
 // Workaround for https://youtrack.jetbrains.com/issue/IDEA-125379
 class MakePluginFilesAlwaysEditable : NonProjectFileWritingAccessExtension {
-    override fun isWritable(file: VirtualFile) = file.toFilePath().isPluginFolder()
+    override fun isWritable(file: VirtualFile) = file.toFilePath().isPartOfPlugin()
 }
 
 class EnableSyntaxHighlighterInLivePlugins : SyntaxHighlighterProvider {
     override fun create(fileType: FileType, project: Project?, file: VirtualFile?): SyntaxHighlighter? {
-        if (project == null || file == null || !file.toFilePath().isPluginFolder()) return null
+        if (project == null || file == null || !file.toFilePath().isPartOfPlugin()) return null
         val language = LanguageUtil.getLanguageForPsi(project, file) ?: return null
         return SyntaxHighlighterFactory.getSyntaxHighlighter(language, project, file)
     }
@@ -94,7 +94,7 @@ object FindUsageInLivePlugin {
     class UsageTypeExtension : UsageTypeProvider {
         override fun getUsageType(element: PsiElement): UsageType? {
             val file = PsiUtilCore.getVirtualFile(element)
-            return if (file == null || !file.toFilePath().isPluginFolder()) null
+            return if (file == null || !file.toFilePath().isPartOfPlugin()) null
             else UsageType { "Usage in liveplugin" }
         }
     }