Merge pull request #12 from Deftu/main

Fix reported issues

Author: Wyvest

src/main/kotlin/org/polyfrost/intelliprocessor/editor/PreprocessorNewLineHandler.kt

@@ -44,6 +44,10 @@ class PreprocessorNewLineHandler : EnterHandlerDelegateAdapter(), DumbAware {
         }
 
         val conditionals = findEnclosingConditionalBlock(comment)
+        if (conditionals.isEmpty()) {
+            return Result.Continue
+        }
+
         val currentVersion = MainProject.comparable(file)
         if (currentVersion != null && isInsideActiveBlock(conditionals, currentVersion)) {
             return Result.Continue
@@ -126,7 +130,6 @@ class PreprocessorNewLineHandler : EnterHandlerDelegateAdapter(), DumbAware {
                     is PreprocessorDirective.If, is PreprocessorDirective.IfDef -> {
                         if (nesting == 0) {
                             block.add(0, directive)
-                            return block
                         } else {
                             nesting--
                         }
@@ -143,7 +146,7 @@ class PreprocessorNewLineHandler : EnterHandlerDelegateAdapter(), DumbAware {
             sibling = sibling.prevSibling
         }
 
-        return emptyList()
+        return block
     }
 
 }

src/main/kotlin/org/polyfrost/intelliprocessor/editor/PreprocessorSyntaxHighlight.kt

@@ -17,11 +17,11 @@ import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiRecursiveElementWalkingVisitor
 import com.intellij.psi.impl.source.tree.PsiCommentImpl
 import org.polyfrost.intelliprocessor.ALLOWED_FILE_TYPES
 import org.polyfrost.intelliprocessor.Scope
 import java.util.ArrayDeque
-import java.util.Deque
 import java.util.Locale
 
 val BOLD_ATTRIBUTE = TextAttributes(null, null, null, null, java.awt.Font.BOLD)
@@ -68,7 +68,13 @@ class PreprocessorSyntaxHighlight(private val project: Project) : HighlightVisit
         this.commenter = LanguageCommenters.INSTANCE.forLanguage(file.language)
         this.highlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(file.language, file.project, file.virtualFile)
         this.stack = ArrayDeque()
-        action.run()
+        file.accept(object : PsiRecursiveElementWalkingVisitor() {
+            override fun visitElement(element: PsiElement) {
+                visit(element)
+                super.visitElement(element)
+            }
+        })
+
         return true
     }
 

src/main/resources/META-INF/java-plugin.xml

@@ -0,0 +1,20 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <lang.foldingBuilder
+            language="JAVA"
+            implementationClass="org.polyfrost.intelliprocessor.editor.PreprocessorFolding"
+            order="first"
+        />
+
+        <completion.contributor
+            language="JAVA"
+            implementationClass="org.polyfrost.intelliprocessor.editor.PreprocessorKeywordCompletion"
+        />
+
+        <lang.importOptimizer
+            language="JAVA"
+            implementationClass="org.polyfrost.intelliprocessor.PreprocessorImport"
+            order="first"
+        />
+    </extensions>
+</idea-plugin>

src/main/resources/META-INF/kotlin-plugin.xml

@@ -1,4 +1,9 @@
 <idea-plugin>
+    <!-- Tell the IDE that we support Kotlin K2 mode -->
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <supportsKotlinPluginMode supportsK2="true" />
+    </extensions>
+
     <extensions defaultExtensionNs="com.intellij">
         <lang.foldingBuilder
             language="kotlin"
@@ -11,8 +16,4 @@
             implementationClass="org.polyfrost.intelliprocessor.editor.PreprocessorKeywordCompletion"
         />
     </extensions>
-
-    <extensions defaultExtensionNs="org.jetbrains.kotlin">
-        <supportsKotlinPluginMode supportsK2="true" />
-    </extensions>
 </idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -4,35 +4,17 @@
     <vendor url="https://github.com/Polyfrost">Polyfrost</vendor>
 
     <depends>com.intellij.modules.platform</depends>
-    <depends>com.intellij.modules.java</depends>
+    <depends optional="true" config-file="java-plugin.xml">com.intellij.modules.java</depends>
     <depends optional="true" config-file="kotlin-plugin.xml">org.jetbrains.kotlin</depends>
     <depends>com.intellij.gradle</depends>
 
+    <!-- General editor additions -->
     <extensions defaultExtensionNs="com.intellij">
-        <lang.foldingBuilder
-            language="JAVA"
-            implementationClass="org.polyfrost.intelliprocessor.editor.PreprocessorFolding"
-            order="first"
-        />
-
         <highlightVisitor implementation="org.polyfrost.intelliprocessor.editor.PreprocessorSyntaxHighlight" />
-
-        <completion.contributor
-            language="JAVA"
-            implementationClass="org.polyfrost.intelliprocessor.editor.PreprocessorKeywordCompletion"
-        />
-
         <enterHandlerDelegate implementation="org.polyfrost.intelliprocessor.editor.PreprocessorNewLineHandler" />
 
-        <lang.importOptimizer
-            language="JAVA"
-            implementationClass="org.polyfrost.intelliprocessor.PreprocessorImport"
-            order="first"
-        />
-
-		<defaultLiveTemplates file="/liveTemplates/Preprocessor.xml" />
-
-		<notificationGroup displayType="BALLOON" id="Jump Failure" />
+        <defaultLiveTemplates file="/liveTemplates/Preprocessor.xml" />
+        <notificationGroup displayType="BALLOON" id="Jump Failure" />
     </extensions>
 
 	<actions>