From 285e0d3cbfd2011c56f8c0c65ba409459afeaa0a Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Tue, 23 Feb 2021 20:39:28 +0200
Subject: [PATCH 1/7] drop SwingInspector - Not support

---
 build.gradle.kts                              | 18 ++++++++--------
 .../TornadoFXSettingsEditor.form              | 21 +++----------------
 .../TornadoFXSettingsEditor.java              | 16 --------------
 .../idea/actions/InjectComponentAction.kt     |  2 +-
 4 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 261f8b4..eec0805 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,14 +4,14 @@ import org.jetbrains.intellij.tasks.PatchPluginXmlTask
 import org.jetbrains.intellij.tasks.PublishTask
 
 plugins {
-    idea apply true
+    idea
     java
-    kotlin("jvm") version "1.4.0"
-    id("org.jetbrains.intellij") version "0.4.21"
+    kotlin("jvm") version "1.4.30"
+    id("org.jetbrains.intellij") version "0.7.2"
 }
 
 group = "no.tornado"
-version = "1.7.20"
+version = "1.7.20-1-dev"
 
 val publishUsername: String by rootProject.extra
 val publishPassword: String by rootProject.extra
@@ -21,9 +21,9 @@ repositories {
 }
 
 intellij {
-    version = "2020.2"
+    version = "2020.3.1"
     //updateSinceUntilBuild = false
-    setPlugins("java", "properties", "org.jetbrains.kotlin:1.4.0-release-IJ2020.2-1")
+    setPlugins("java", "properties", "Kotlin")
 }
 
 tasks {
@@ -35,12 +35,12 @@ tasks {
     }
 
     withType<JavaCompile> {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
+        sourceCompatibility = "11"
+        targetCompatibility = "11"
     }
 
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.jvmTarget = "11"
     }
 }
 
diff --git a/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.form b/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.form
index 592319a..b5d47e7 100644
--- a/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.form
+++ b/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.form
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="no.tornado.tornadofx.idea.configurations.TornadoFXSettingsEditor">
-  <grid id="93687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="11" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="93687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="53" y="36" width="708" height="374"/>
+      <xy x="53" y="36" width="788" height="402"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <vspacer id="eeb03">
         <constraints>
-          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="50b09" class="com.intellij.execution.ui.CommonJavaParametersPanel" binding="myCommonProgramParameters">
@@ -57,14 +57,6 @@
         </constraints>
         <properties/>
       </component>
-      <component id="b45cf" class="javax.swing.JCheckBox" binding="myShowSwingInspectorCheckbox">
-        <constraints>
-          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="messages/ExecutionBundle" key="show.swing.inspector"/>
-        </properties>
-      </component>
       <vspacer id="f4215">
         <constraints>
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
@@ -72,13 +64,6 @@
           </grid>
         </constraints>
       </vspacer>
-      <vspacer id="7cceb">
-        <constraints>
-          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
-            <preferred-size width="-1" height="10"/>
-          </grid>
-        </constraints>
-      </vspacer>
       <component id="8a028" class="com.intellij.openapi.ui.LabeledComponent" binding="typeWrapper" custom-create="true">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
diff --git a/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.java b/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.java
index b2d690b..6be59a4 100644
--- a/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.java
+++ b/src/main/java/no/tornado/tornadofx/idea/configurations/TornadoFXSettingsEditor.java
@@ -52,7 +52,6 @@ public class TornadoFXSettingsEditor extends SettingsEditor<TornadoFXConfigurati
 
 	private final ConfigurationModuleSelector myModuleSelector;
 	private JrePathEditor myJrePathEditor;
-	private JCheckBox myShowSwingInspectorCheckbox;
 	private LabeledComponent<JPanel> typeWrapper;
 	private LabeledComponent<JPanel> myDevOptions;
 	private final JreVersionDetector myVersionDetector;
@@ -94,8 +93,6 @@ public void applyEditorTo(@NotNull final TornadoFXConfiguration configuration) t
 		configuration.LIVE_VIEWS = liveViewsButton.isSelected();
 		configuration.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
 		configuration.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
-		configuration.setSwingInspectorEnabled((myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) && myShowSwingInspectorCheckbox.isSelected());
-		updateShowSwingInspector(configuration);
 	}
 
 	public void resetEditorFrom(@NotNull final TornadoFXConfiguration configuration) {
@@ -116,19 +113,6 @@ public void resetEditorFrom(@NotNull final TornadoFXConfiguration configuration)
 		dumpStylesheetsButton.setSelected(configuration.DUMP_STYLESHEETS);
 		liveViewsButton.setSelected(configuration.LIVE_VIEWS);
 		myJrePathEditor.setPathOrName(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
-		updateShowSwingInspector(configuration);
-	}
-
-	private void updateShowSwingInspector(final TornadoFXConfiguration configuration) {
-		if (myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) {
-			myShowSwingInspectorCheckbox.setEnabled(true);
-			myShowSwingInspectorCheckbox.setSelected(configuration.isSwingInspectorEnabled());
-			myShowSwingInspectorCheckbox.setText(ExecutionBundle.message("show.swing.inspector"));
-		} else {
-			myShowSwingInspectorCheckbox.setEnabled(false);
-			myShowSwingInspectorCheckbox.setSelected(false);
-			myShowSwingInspectorCheckbox.setText(ExecutionBundle.message("show.swing.inspector.disabled"));
-		}
 	}
 
 	public EditorTextFieldWithBrowseButton getViewClassField() {
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt b/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt
index a1a4c0b..25b8f21 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt
@@ -72,7 +72,7 @@ class InjectComponentAction : AnAction() {
             return
         }
 
-        val psiFacade = JavaPsiFacade.getInstance(e.project)
+        val psiFacade = JavaPsiFacade.getInstance(e.project!!)
         val psiClass = psiFacade.findClass(ktClass.fqName.toString(), e.project!!.allScope())!!
 
         e.presentation.isEnabled = isComponent(psiClass)

From 152607c0bf8904df10295d3e49fd8fa89bafac6b Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Sun, 2 May 2021 15:02:18 +0300
Subject: [PATCH 2/7] refactoring

---
 build.gradle.kts                                     | 10 +++++++++-
 .../tornado/tornadofx/idea/actions/NewViewAction.kt  |  2 +-
 .../tornadofx/idea/annotator/CSSColorAnnotator.kt    |  2 +-
 .../TornadoFXRunLineMarkerContributor.kt             |  2 +-
 .../no/tornado/tornadofx/idea/dialog/ErrorDialog.kt  |  2 +-
 .../idea/dialog/ExtractStringToResourceDialog.kt     |  8 ++++----
 .../no/tornado/tornadofx/idea/editors/ViewEditor.kt  | 12 ++++++------
 .../idea/framework/TornadoFXFrameworkDetector.kt     |  4 ++--
 .../no/tornado/tornadofx/idea/icons/PluginIcons.kt   |  2 +-
 .../tornadofx/idea/intentions/AddTableViewColumns.kt |  7 +------
 .../tornadofx/idea/intentions/FXPropertyConverter.kt |  2 +-
 .../tornadofx/idea/intentions/GenerateViewModel.kt   |  4 ++--
 src/main/resources/META-INF/plugin.xml               |  4 ++--
 13 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index eec0805..3cb106d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,7 @@ repositories {
 }
 
 intellij {
-    version = "2020.3.1"
+    version = "2020.3.2"
     //updateSinceUntilBuild = false
     setPlugins("java", "properties", "Kotlin")
 }
@@ -42,5 +42,13 @@ tasks {
     withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "11"
     }
+
+    runIde {
+        jvmArgs("--add-exports", "java.base/jdk.internal.vm=ALL-UNNAMED")
+    }
+
+    buildSearchableOptions {
+        jvmArgs("--add-exports", "java.base/jdk.internal.vm=ALL-UNNAMED")
+    }
 }
 
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/actions/NewViewAction.kt b/src/main/kotlin/no/tornado/tornadofx/idea/actions/NewViewAction.kt
index c2f276a..4b57fb8 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/actions/NewViewAction.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/actions/NewViewAction.kt
@@ -132,7 +132,7 @@ class NewViewAction : AnAction() {
                     .createHtmlTextBalloonBuilder("TornadoFX was not found on your classpath. You must add it to reliably use the TornadoFX plugin.", MessageType.WARNING, null)
                     .setFadeoutTime(7500)
                     .createBalloon()
-                    .show(RelativePoint.getCenterOf(statusBar.component), Balloon.Position.atRight);
+                    .show(RelativePoint.getCenterOf(statusBar.component), Balloon.Position.atRight)
             return true
         } else {
             return layouts.findMethodsByName(builderName, true).isNotEmpty()
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSColorAnnotator.kt b/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSColorAnnotator.kt
index 234c1a2..eea6079 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSColorAnnotator.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSColorAnnotator.kt
@@ -132,7 +132,7 @@ class CSSColorAnnotator : Annotator {
         val resolvedRef = element.mainReference.resolve()
 
         if( resolvedRef is KtProperty) {
-            val expr = resolvedRef.children.last();
+            val expr = resolvedRef.children.last()
             if (expr is KtExpression) {
                 handelProperty(
                         resolvedRef,
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunLineMarkerContributor.kt b/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunLineMarkerContributor.kt
index 119dc62..2af8388 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunLineMarkerContributor.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunLineMarkerContributor.kt
@@ -25,7 +25,7 @@ class TornadoFXRunLineMarkerContributor : RunLineMarkerContributor() {
             if (isApp || isView) {
                 return Info(
                         PluginIcons.ACTION,
-                        Function<PsiElement, String> { "Run TornadoFX ${if (isApp) "Application" else "View"}" },
+                        { "Run TornadoFX ${if (isApp) "Application" else "View"}" },
                         *ExecutorAction.getActions(0)
                 )
             }
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ErrorDialog.kt b/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ErrorDialog.kt
index f37508f..fdc7fdf 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ErrorDialog.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ErrorDialog.kt
@@ -12,5 +12,5 @@ class ErrorDialog(project: Project, private val error: String) : DialogWrapper(p
         init()
     }
 
-    override fun createCenterPanel(): JComponent? = JLabel(error)
+    override fun createCenterPanel(): JComponent = JLabel(error)
 }
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ExtractStringToResourceDialog.kt b/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ExtractStringToResourceDialog.kt
index 5e1039b..5a0549f 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ExtractStringToResourceDialog.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/dialog/ExtractStringToResourceDialog.kt
@@ -1,13 +1,13 @@
 package no.tornado.tornadofx.idea.dialog
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.psi.PsiFile
 import com.intellij.ui.components.JBTextField
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
 import java.awt.Insets
-import javax.swing.JComboBox
 import javax.swing.JComponent
 import javax.swing.JLabel
 import javax.swing.JPanel
@@ -21,8 +21,8 @@ class ExtractStringToResourceDialog(
         private val okAction: (String, String, PsiFile) -> Unit
 ) : DialogWrapper(project) {
 
-    private val resourcePathComboBox = JComboBox<String>(resourcePathStrings).apply {
-        resourcePathStrings.maxBy { it.length }?.let {
+    private val resourcePathComboBox = ComboBox(resourcePathStrings).apply {
+        resourcePathStrings.maxByOrNull { it.length }?.let {
             prototypeDisplayValue = it
         }
     }
@@ -38,7 +38,7 @@ class ExtractStringToResourceDialog(
         init()
     }
 
-    override fun createCenterPanel(): JComponent? = JPanel(GridBagLayout()).apply {
+    override fun createCenterPanel(): JComponent = JPanel(GridBagLayout()).apply {
         addGrid(0, 0, JLabel("resource:"))
         addGrid(1, 0, resourcePathComboBox)
 
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/editors/ViewEditor.kt b/src/main/kotlin/no/tornado/tornadofx/idea/editors/ViewEditor.kt
index e6cda01..d2530ec 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/editors/ViewEditor.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/editors/ViewEditor.kt
@@ -78,26 +78,26 @@ class ViewEditor(val project: Project, val myFile: VirtualFile) : FileEditor {
     }
 
     override fun getComponent(): JComponent {
-        return panel;
+        return panel
     }
 
     override fun getPreferredFocusedComponent(): JComponent? {
-        return null;
+        return null
     }
 
     override fun deselectNotify() {
     }
 
     override fun getBackgroundHighlighter(): BackgroundEditorHighlighter? {
-        return null;
+        return null
     }
 
     override fun isValid(): Boolean {
-        return true;
+        return true
     }
 
     override fun isModified(): Boolean {
-        return false;
+        return false
     }
 
     override fun addPropertyChangeListener(listener: PropertyChangeListener) {
@@ -111,7 +111,7 @@ class ViewEditor(val project: Project, val myFile: VirtualFile) : FileEditor {
     }
 
     override fun getCurrentLocation(): FileEditorLocation? {
-        return null;
+        return null
     }
 
     override fun removePropertyChangeListener(listener: PropertyChangeListener) {
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/framework/TornadoFXFrameworkDetector.kt b/src/main/kotlin/no/tornado/tornadofx/idea/framework/TornadoFXFrameworkDetector.kt
index f09fe7f..41fc9a2 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/framework/TornadoFXFrameworkDetector.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/framework/TornadoFXFrameworkDetector.kt
@@ -22,10 +22,10 @@ class TornadoFXFrameworkDetector : FacetBasedFrameworkDetector<TornadoFXFacet, T
     override fun getFacetType() = TornadoFXFacetType.INSTANCE
 
     override fun createSuitableFilePattern(): ElementPattern<FileContent> {
-        return FileContentPattern.fileContent().withName(StandardPatterns.string().endsWith(".kt"));
+        return FileContentPattern.fileContent().withName(StandardPatterns.string().endsWith(".kt"))
     }
 
-    override fun createConfiguration(files: MutableCollection<VirtualFile>?) = facetType.createDefaultConfiguration();
+    override fun createConfiguration(files: MutableCollection<VirtualFile>?) = facetType.createDefaultConfiguration()
 
     override fun getFileType(): KotlinFileType = KotlinFileType.INSTANCE
 
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/icons/PluginIcons.kt b/src/main/kotlin/no/tornado/tornadofx/idea/icons/PluginIcons.kt
index 5132767..ef20113 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/icons/PluginIcons.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/icons/PluginIcons.kt
@@ -4,5 +4,5 @@ import com.intellij.openapi.util.IconLoader
 
 object PluginIcons {
     @JvmField
-    val ACTION = IconLoader.getIcon("/icons/action.png")
+    val ACTION = IconLoader.getIcon("/icons/action.png", PluginIcons::class.java)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/AddTableViewColumns.kt b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/AddTableViewColumns.kt
index 2f916ec..caf1aca 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/AddTableViewColumns.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/AddTableViewColumns.kt
@@ -131,14 +131,9 @@ class AddTableViewColumns : PsiElementBaseIntentionAction() {
         }
 
 
-        override fun createCenterPanel(): JComponent? {
+        override fun createCenterPanel(): JComponent {
             return component
         }
-
-        override fun getOKAction(): Action {
-
-            return super.getOKAction()
-        }
     }
 
     private fun getJavaFXProperties(psiClass: PsiClass): List<PsiMethod> = psiClass.allMethods
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/FXPropertyConverter.kt b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/FXPropertyConverter.kt
index ae37c3b..6c307be 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/FXPropertyConverter.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/FXPropertyConverter.kt
@@ -156,7 +156,7 @@ class FXPropertyConverter : PsiElementBaseIntentionAction(), LowPriorityAction {
         fun createPropertyElements(factory: KtPsiFactory, paramName: String, returnType: KotlinType, ktClass: KtClass, value: String, importList: MutableSet<String>): Pair<PsiElement, PsiElement> {
             importList.addAll(listOf("tornadofx.property", "tornadofx.getProperty"))
 
-            return factory.createProperty("var $paramName by property<${returnType.nameIfStandardType ?: returnType.lowerIfFlexible() ?: returnType}>($value)") to
+            return factory.createProperty("var $paramName by property<${returnType.nameIfStandardType ?: returnType.lowerIfFlexible()}>($value)") to
                 factory.createFunction("fun ${paramName}Property() = getProperty(${ktClass.name}::$paramName)")
         }
 
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/GenerateViewModel.kt b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/GenerateViewModel.kt
index 4b57da7..c2434b8 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/GenerateViewModel.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/GenerateViewModel.kt
@@ -57,9 +57,9 @@ class GenerateViewModel : PsiElementBaseIntentionAction(), LowPriorityAction {
                 .filter { it.hasValOrVar() && !it.isVarArg && it.name != null }
                 .map(::PropDesc)
 
-            val properties = sourceClass.getBody()?.properties?.filterNot { it.name == null }?.filterNot { it.hasDelegate() }?.map(::PropDesc) ?: emptyList()
+            val properties = sourceClass.body?.properties?.filterNot { it.name == null }?.filterNot { it.hasDelegate() }?.map(::PropDesc) ?: emptyList()
 
-            val fxPropertyFunctions = sourceClass.getBody()?.declarations
+            val fxPropertyFunctions = sourceClass.body?.declarations
                 ?.filter { it is KtNamedFunction }
                 ?.filter { it.name?.endsWith("Property") ?: false }
                 ?.map { PropDesc(it as KtNamedFunction) }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 4d7062c..c115169 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -20,7 +20,7 @@
         </ul>
     ]]>
     </change-notes>
-
+Pretty sure it's the same as #113. Or atleast very closely related. I really hope this gets resolved soon, I had to disable the plugin, now I can only wait.
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
 
@@ -28,7 +28,7 @@
     <depends>org.jetbrains.kotlin</depends>
     <depends>com.intellij.properties</depends>
     
-    <idea-version since-build="202" />
+    <idea-version since-build="203" />
 
     <extensions defaultExtensionNs="com.intellij">
 

From 08cbb0d582e6bbf17bad58ac55b20299254188e6 Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Sun, 2 May 2021 16:34:30 +0300
Subject: [PATCH 3/7] up kotlin version in template project

---
 .../tornadofx-gradle-project-kts.zip          | Bin 62865 -> 62866 bytes
 .../tornadofx-gradle-project.zip              | Bin 62600 -> 62590 bytes
 .../tornadofx-maven-osgi-ds-project.zip       | Bin 15680 -> 15683 bytes
 .../tornadofx-maven-osgi-project.zip          | Bin 16432 -> 16434 bytes
 .../tornadofx-maven-project.zip               | Bin 14484 -> 14486 bytes
 .../build.gradle.kts                          |   2 +-
 .../tornadofx-gradle-project/build.gradle     |   3 +--
 .../tornadofx-maven-osgi-ds-project/pom.xml   |   2 +-
 .../tornadofx-maven-osgi-project/pom.xml      |   2 +-
 .../tornadofx-maven-project/pom.xml           |   2 +-
 zip-template-projects.sh                      |   0
 11 files changed, 5 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 zip-template-projects.sh

diff --git a/src/main/resources/projectTemplates/tornadofx-gradle-project-kts.zip b/src/main/resources/projectTemplates/tornadofx-gradle-project-kts.zip
index adc661f04297cbd62266c2acc8f92cb23249942d..918b850f56e4ac6efdbae5894fb86d3330b630a0 100644
GIT binary patch
delta 1939
zcmaJ>drT8|9RJ;2AJ;;qGAdZ8uz?IIWgy80100N3B7#&N?p1IhEa2wAS3m+m5SMIG
zq5LfV;bhCij7?#>B7+cScm&xd8J*b{P#%4NP=rEZlDUDq>)o|iNp{Iy^80<h-_Q5^
z`94lPk2TC=TQX8Hju4PfLiJY%)LVA*+nO&Nx>wf<;}9uK(~Du`R4B$i59oJ7Hwz!$
znc_R$2N=kEE<9~<6$$_rcvF_=aNEn6avq#lC}F2Qnm-<v%Q6td07I;^ky0NH!>q3G
zj)BWIrWoc7$(t{;jOnaP51|Jk3kSA{=S?|w$ZRTRLwAkYEJzO1P0>`0wV8u<Ap4Qg
zld2O*XDb-}*#qA<#=slXLc47o;uQM9bgl!MX%#wX)CCC)qW&($(~<7+${g7W4nXZT
z00N*62^5uPXAwoEYo<-m@da!Ng(FD}5o{kx-AeY-qIoqX1_7W51wcV?_`%{?Nfq7Q
zypv@v0O8DH0C47r&lP3&$7s0t@w%i@QzO4=4Hmm6B|@BA|7G31@flP9E2F=B8f2K%
zuA$8t`ro1>qP16#EN$(oyLJPVDvK_eCa&tz8<i4Xz_;!DkLfmsdqiU(zt?APjWus@
z?qsdH<*<BrZo<B?s_4)r)Afo|+Z2gs51nYM=RF?ydDgA^*Uq6H4KCn%zoq?TEpj4c
z@{h}FzvqPI$oq9EUkjgA{%by(`D1U3>Zj5-V#@30XXQicTX^rwX=S1_vDXim953<G
zY%geUQgub;2VGI_QfSWhZuilMPSos|h7S3MyWms8lE0I3U-QaOwYE+aMke?5&5m~l
zKY2l2@I!sysZsvrCM?}|qd+3-?z(?>K{Z_Xp6v6%4<w@>rOvNUtBO=-)+evs&Mv&z
z(7f0Y+<01r!M2Y3xBD799)5G|DMl`lqj|7<ESBkp_Sx7jE;UU`y#n?xxRblV8hsnq
zfJ8A4<l0g8xkx<g(rKawkaz6RPV^#W--Bi{ms(FOX?P2Q?!X+Y4QJ-!IAr(Xtwp)p
zi@=K>UolvSKL`=CAFQ9|z?Q`~k?-v%H%kiYj==aOe|od`p%sqf6N{XRJhCW7jpV(8
zR0fYOy^bcJ#4!k_8(iTz%S(RG?~KAJd@E(_YvkkESzKFr2ofKPynI=TdSEs-U!#ck
zJiJW6RSfI`<E$cE4*C@zThP!0DDp0$w1Rl!>7c|;faYo|+X;thD|SaJZi!Wj4sqzX
zBry)fCIJ(l;HS*$SEc9$u9I2ZBNxWZuA*{9ijMN^W*Ms@hg3TkLU1YhEF&3RPfANv
zS#4$nkvsW@I%zqA6HdM`Ovi(tnZ-;2s04Q`NKsrs<Lvxx^-1mv^be;w!<;zZb|-xN
zVB?4fBZjQ$rXP!w&noHTOZ;ct`9z;=!=|))Q+fPD<Z;P^&VvsvV?2hJDANB72-z!K
zYV+$~kT3<IID5=ew3xz3?HgtugKr`Xp%Vpw9Qa{}(-JChYK6_S?2E*~a-u9l#GB+K
zF~Xacz=KPu7j#2i85zvTJ)By88Zit&@-zT@>`_S>AwDc$8RPfiUw*tl=ZHYyKYLQw
A761SM

delta 1780
zcmZuxeM}Q)7{B(t_F5_+r7(7UNDD(PP|8QFfGEXK{(!l%+Tvuua8BjJ5xzvm6d1bc
z)F`~n>6C>z7mW)rKv3s!1Z9jkGF==7kc15w(DIGO1Y_L2ch@Ujc1fGd^Zb6#`+I)x
zJx`4VR9k?PJ`vy!7<#1NyChdTg%R)HkIHCh_J&$Q1}k_%+~vZu9+ru=652*@I?*jk
zpc3xzI2lX?{J_MlV6Tf5c!<;z8ZJTNbWrQLlM7z*tYv~xUIuHhwbm=XZxz60loS!B
zM0NH`;|V=mr&XHBP~63l9K|Fi#FP{b%vzE<h%sPO!yfvbEQSM5$<_;?&Md7i3<9?P
z+~G^!8*tuC*z-~A?l6syQUYk=xvrq-SG*&7$bVcwyqFajA)bl4xy_Fw+BjDjZ<WYf
z1<(<BthZJl+fm{a*hZ8zSq&!fHWci~jl=;qn1%<!G(j|u&^5S;1E=A64$P&}btZ%c
zE~O<%8V)mvbS`+0XmDVB&qhaF6r>Onte|DVsEkRW?_((L(Qq^m!}jr^FX;zET;0mq
z&n2VypakRLlK{i;DeA8-`OO@DsO+bSlp_zS%G5h1wYYP4;)(5ojxTS%_;I(USJGS9
zEPGYfnxTATDE#>RdCih8^>pRNPv17h_S9cL(V`0*><zoxRpIYuS@(E2_h^3(I9Xb#
zbgg}*{yP1wbH}bVD@GlUTrGc?zYvr$mQ*Af?|69YQpDcZOu|j2cg7S6fntStL(SRX
z{Tqh!(o0_4n9-{H*WDFY83c#xwh&J~nOnavWpPyFeC)bphj!aZ!MsOtSB}T<JAYQB
zR(@Omn}4EZpzcCoz|nB!FQ;16QB|!io6|=84mHA_dqJI5ft}-;(&1gXyKCm228;$P
z+;nTM7?XdGKN}P0@L7SV{ig8UO)q<u9~~&W^1SEvU{h9c!B>OE-aU^8MndMIEfTLi
zH~wh9WBfeKSfc+1H+!CY-j+7&=9G1Ri&6EnK9R@w0k*M(6H~E(G8$H!z2s;fBM%-i
zgj0ipek#m^`o}QpTCmHNDHsMrfe-x9QwSSHjsgJ&w2knLIT$u9Ie|qkOTf-)e`ca2
zPf4C0%BOuPlC#jbouX)9zQqH+H!oxmhbTlli%{Y#^KvxXPevA&!}~ByH;!SOSv5$}
z<;o_$RgI50JF~#Pwj2$)t}DPVl)|D;)OMZhe1N!X;1^OEI#O>hY5xKVp3w-l*99T9
z2l6c&33RS*kU2MN$qjZ-zi#WKbCCoMY?87_Qli?GS;WawL6g}D_>3U30v<QVfl~H;
z-kbmixOV}}v?PJ8e=#_;Av$?tIAT%2)0Wk+gQ{_j&aFiz)3L+TPQc-BgkKBWr&YX6
zc*f!lis*=n@w|;v?}O7DA$5iXLv$_zU0@!%KyNvkWn`=MiR7$ajm>Cvqo{fqtS3Yw
zx*=+Fz|dJQIocX?gTLNQqIifOYv=MU8x4lctpe0)K`drRB+rtde2lF->&7o>`d=Zo
zJ4Zr{<5nS#c0!nv+4Cgm;}E2fYL69))4L~qjs#QxSSyHJ3`M269~7!`m`kFz65W&i
dF2b;2yPhH@G3er|Mzzt<<UaEi_D><#{sp*kcntsm

diff --git a/src/main/resources/projectTemplates/tornadofx-gradle-project.zip b/src/main/resources/projectTemplates/tornadofx-gradle-project.zip
index 22167c1a6aab8157e41f3d878cb6b994841736ed..693e52e54ca2510e0ae51f9dc3f7acf08dc53a44 100644
GIT binary patch
delta 1775
zcmZuy4^We382>)rjg2t|D+u^NLCBMBGDw2}fsjNGF#(YZEWnKGh_uY{p9={txjK;X
zLdDr#f!;|J0&<l}f51GFBvH;zYej4_*v2*%c5)}XUGMvS+qW(HcJJ=p^E|)j_x%0V
zq6an|5anb6j)1_=GmX6mlp;Cr!nwARsnY{+Rz(3-YqWATmG@_CQ85-Jlh4BnwG`mH
zO)Z5}>KOa|2rFyT#M|!_2f=gUm^vCxYq`SwgI)x1c(SRpun-nogs|Zr&mGaNlE9ny
z0$5s`+U`m)pT1sre10!0L@|posr-Nkc?jiHk4_3~Tu6Y6S|8SGP5XwxA8Ggm9pK!2
zu8T?rk7#$$k$33wSb3pNEp!x$1}PS@StVj+Qq?UKvck;85iu_5XZ`o}9Fibr(b<eb
z35EPy;s$$>iz}+V36i4&1i{gxudep-y;o!X-d(PFFQ-}8Gv3dWRJVT@_5SFU2lC+!
zS+8yL%KU0;%d+`u<>%Lmrb@3&S^u(bpEcICDjQ<=XIH&=>E?BEraY(f!)1AJ>svts
zbCJz`8&-Ndo?3a>|H9)x*PT7o)faVl%Thy=s_yNdGM2vB=LbvnNH)uA3e54V)1#-3
zMh1D$y>xq$>$4~Dxz>}iG5^lQAHu`e;!5<lE^U)ev|dcR8!`P()5Y17^}U*;fP&u|
zc}7AN_U(<74=j%krfn%p?!WQtiTWM4U%kFs`XF`S%$*u5NT?XD6_lD|PNf(oMc@4M
z`<U$EXu?`|($}d!zWlx7Y`U)`CVx`3^-R9cu<g9n!#R_<)XKw8JBq42|14AJeKT<m
z*+|O_&&#!)R#hUaOa4Q`Wf0ve=NRMBg=Dn*(5cB32MmusJx0}^?3$=WgK`a>opkSp
zNFEF`2ExH5p}=LFKlSKjXc7QB79(vS;};R>u@N};3ufw*Ik@*QcO`_TI9=KQN;GmG
zgH9CuQZI$s27kOJ@VF%u%1wSS&@2KPf`CfRM!4IYPA0-0Lnzu04jj~Q;RPh=a+B=W
z2w}M;0%0kxA7R?L=AsqBh~)?-(qm={6nPMESR2XDKggw5ljW3IMBp-`L@O$15K0RL
z!U0A|-4L|4<8KNy(Mq|SauaSL%8h;Eh#>nN2WOxm@lMG2QYgdr<_ZN0IG8QX(;gkG
zGb1t?7wh7Ej~*^NCNEd8DX>Pi`xG!SM&dk0&FiHnT+L8**M*kk7TS|Mn!u;Bth6e|
z)jf^-7}QpDqeSM=$*|+lh7;!+`xqRIUVOwQ@J;L91#X}*K5j4tKQfA$`A}OzXr9FC
z=Dh95FFsN?NTh&)43VD7b{`iirhZdK3S4%YcvZQkz?k%yD8Tb)y}((Mz%hA@fzt9A
z52vIEW{k>A0S*H^n&NP`g59xO4Ut}O!eAdWqk#fXP!0~fJpBJ@cHt5Qpqmw5F<+XD
lZKxU<wS>633X|aflmEO!bF#Res8~cW`XqXz&C=sv{{mOL$SME;

delta 1811
zcmZux3rv$&6u$kRw8&2p5a<Ib!Wi!fvI+7SO4TW5)WKdRLgt1MafD2HXabpWZh=It
z2T7QqW0}bqC<@c)%wje+1KY?DHjUsE1P6suptw1m;O@OG<+Ubl`k!;Y?|k>3@BGt4
z>?bBxO54nG3Pe6j>)i}SDMHxsb6lqUJmj0*A&YV1+)h48gO!RTG5MSp$F)$X*uvsk
zV^*SQE7cm$ya5wF;mjOV*{2wlq)HG{&Jq-1Tf%Z4xQ!E{xmwlhqAjO|X;lSBgO%!6
zXM)XUwZ7eF212x@1a<C_WC*DkgaYBbOatGHOQmwe+ErxkD{@9MZiq#QGvS{T#)RE1
zFDMTePAPPX9I@Oxj$8Nf@iT#|f`2$*FxSU!$lTZ@ub6(c>0*CD>(cNbi=}vMds|)Y
zI`<*3T2t2MD}U7t>3qLUEzWN;)VfW58LRzH{Q7Xy*7!2dZBC}@@7G^X?;j{Vx%aMg
zB++p9&2axit!*Erwry=FYq30@8gFWh)%jMtc%R*HIjr`9Q#SkD{yNL@<9?4{$}%N4
z8=?-?{C4c!w@&dp>uQ*Z%Cer;sM`nGu7kU#2Ub2B3P>_t*j-W|?4i4)II6#Q>ZUm)
zw_)Q|_3iGQBc}(4-@j7w%k`ku*M1yX?b7u@=?zyQD6;MIb$rjg`?=Y}cdmvlvqt{j
zS*V;WuXv~CLe*DrbI*V)nY3*H<zzUmiWpH(hof!goJBc2lSM<lkEftnJTVIJ^oVr;
zGCYEL;2EXyX~>+Z!)cikiWnVq$av?BbUYfhgNt|x=U-V^9>>yhSi>k6riz$QVG+Sf
z$P;<UGB1%YqUS=0RU_C$A&*+sVPP6KvTGN{FOm9x*iAxV<06w@B)M4LAQsS^7L0s0
zM*%yzt)dM;f}t?NrFhsjh@|N%(I5Csy&R5l8fC$*_X;EFb^K2sN_k0q+d=8&)Xe3O
z=Ku1qiG%i?%Mkh`8RN^&ZYm_1;)(O2&#bZSsAXIQmrYu@rWPPe;llHXO+JV3zzZy6
z0@+xoF{#;Mguo!Gjpa%K7uX3vV^%_)Rbq-|&^w`nZfl?)S;*PLAoM))wm&M-XmXdW
z@a0KKmI8fNZ_>lI!}*gcCWfIj9jX8hH*pkD&O5ymPomoqTK@o{I0q*}UwjzC+EL!H
z<)PCouWr%y+hO=+fMGW}$ca?=ZQw@FW0=%%)UewpR7_$g=JXdb(y<Ob7V1ln8fTT*
z@*V_6pD_5tsv+Y22t+s$^0zCG(6}=~0rQ$zdN5C@Y?i`%SYo&Jk<PxbVR$XuWdDz?
z4~_U)x^K&M$lM^;>~C+Y5Xt53b>w*LdpWEaiGl-|?-q@(0Nuzc2s2A;bU)!(f!!Wq
z_qKHzC8(l_5Ro1$j|^FBE0B$<*rzlZF*oTq-<b%-I4+*(*)ageM&p^n#u>Nhi2KL7
zTU%1`4HFl{&%2Dy0ix?gDB<PAWd#nLZ9&Gch>8cck_JveN+`8fw@}9H{E3Y0KM5wm
zQBRFaG1ct;eN|XSFaGN1N$IATHIO#0oTJ~5EYP!CKehjg0hQP$iSt0#K~RqAnL%=K
O?vV3P5@Job5d8-pJBKy^

diff --git a/src/main/resources/projectTemplates/tornadofx-maven-osgi-ds-project.zip b/src/main/resources/projectTemplates/tornadofx-maven-osgi-ds-project.zip
index f9eee249605bb328990fb79dc7d6832d2eb207ca..dfa0241322f58be4f28e25eb0af596b3d444b06d 100644
GIT binary patch
delta 1861
zcmY*ZdpJ~S96ocw%ruTkYNxHnK?WIPTxK$ZGUc`jLrRGXt&);UGR0#Wk&2q(BbS&i
zPs++LMVp>>YulphmM*kWx?xvEy5F|iZ_bG6{4vk-zVGk-e(!hY{C<CIJi8H<1dzxy
zMElH^?+-0R`9}2zb}qZ3Py-qF2Lb{PlVV5^H8RMv$q?q+&(=b~<!Hsn_WpV(lPv(J
z+!>&NL)Bw7oOybP<*--}6+0}~L*uydIMOvP<w~`v(bRDvVJwMk1`|^7jN#eBt4|Bp
zOqUG@U798xgAmC7k`RR44}V(1*CcfD7++LNqyIeRdnw?~oTMmbb!^)WapR4K?U~8N
zokfK`=YD>6I=JxB@u^Ghwy8gdRjJ(Xr5^J8=l$&srWpy!?bNJx^L^3xNkKjrr0d$h
z3QtaneA}>DwP(%|Vy)-qz9+S(Z;518F_lVwl6UB=(oH!9LyEkNO!*e}oNM-9>Mpy6
z*RAVXEm-Mt1bzH4DQC~~=d8e-96B?+B8irk-g5BLU^jJ6Q{bzf7fU8thVOGhIcRy>
zOikX0Z4`^FloHCbdc~w)RcC!dm-oNp?X?su!PFgR&gWhiZ@slzTqD?0Oo*zG9aALu
z=5@~ZWUdLGHX$(|kh9B`l{t^z-pP>u*ZNz-M3dN|*F`H$UWWOrJsx>F{Vk0s`<l2l
z;;KR6K85;Z{_>jB$_wjU$`;Ga!*@-wxY=bkH)U`3(Pv-s+ngTPTzWwaY@N~V5-uGm
zit6E)I<8z@Hf69mHu-bp3YvuhtKyUF_LXYa(+gUC?VG($&U-5gu}o-jd?j4{6V=iA
z^XsSBr~4Vdr$p|omWtM<S`|vhK2@d>d}uutAzpnStFuYBw<d9$=5Kl86`#X4dZ#Aa
zt%@)$Ypq*E>9aiXCU5A#tXW2)Jynvg?p618AKg^eJ0-q7O1a-Ochyiw_m1nmMoL+f
zTon+*TG8|RzFb2>i_uuY^8-zNH(z!;yYI<1OzU|wBi~CM%zbi^)y_GVo}xO^yeqH4
zn{9WO7w_AoY>*e-nk#HgK9goHIdL#KE>7Ng`TC;Wt*HT>p$n$x-V+b>dLBO4v5j_W
zSqNL*jJ|V-I~Ek@?Yno!(SrKg-e@;jrlrb6*mi|>qE};@lzBg<>~o#}o%KPDR@Juh
z{vz8NP2wF?LEg6b<*H@1Ti3U<7+<aTD}p5h5!=<ihHHQEyZP|m_8at14b$dz-7U46
zaqxVi<pA$cU2x#0pz^`g7i)-BWgl({3LF?I#*vG*M8s*TBYzB%a5=S7X1Ze8HAa?y
zqO6iEL%xkL2&4GujZ-Gu129}^^!Z^_gk+(axO8-=<*sJn3tcyRSu_^dY}^8;*?_hl
zw`bA1A&MGPjHB0M-av%$%|H~Ifiqp`0Aw~YLba&z8YABf-yk599gOR``R!xt&JVPS
zgw?e+fq3;t8$SYsOROb$=@IMm_+*2NCi8K^g0T?FO%(iWK&9@~$+PT2aQiO1egaA$
zvPh#V3rKmh$=X!_ES#Cp>*Iuh_q?fKo0B(0jzWw`G5{e$KM2Yph}Hr&*u*gaeL@RJ
zQbZW>oQ{-;93Y|Ln4wI3BO(X`84z;~afcV&Y#k!4<2`g#ej|mD*yxTCO^t@Dn4r^r
z8YB%oFk;~-+0R8ms)yEI0)_FEk?MY~IWY5Nf;OI!mHvh!BFJBK1hGMMSqL!E0r?;m
z`Ygd@C%W#+(eBzSUv<KWB4b>^j12+PnWg(fv{$S6#xsDCi?+So6(f*=m_GwNaGeRU
zoeM^cH5oQf0x~`dcDXo0p%n@z86!gd7!OeDW)206j}iS%M+6yvfj0Qsl6R7BN0lZW
zZfd_01abK;_=RzJy@oL!92QI-jaO$oe2yU~m~IabZ=Q}3C)nwcG(dL~d~4w7wqYR;
zzKTHjcDUa)=+t>0*f54uUKU`46d(~=fd@85V7E1WnD2n;m7I|Vn7|2k6**%>vBL;C
fL@^nzKJJDQZMh>tmK_RAgiOHkL=6*o+K=Ra4yL}G

delta 1774
zcmY+Ec{G%39LHx~gJH%PW)wzaC_7_@G1k!u*|XC<X>Te*PH~W>iJPdbJxY;OoZ@E7
z9LdqWSz2yGvfLJHh&aNyHMy;~`@ADJz304td_TYM@Av$k=Y4-qdtyr>$<Ip$r-;Ge
zF&M%%P5*q76>i^U*B#&{TTMj<M}+~rG;pzwGcygaiq^|vis1g{m%f86@=@^)mEff6
zVPwEhEsdjd&4Z!eO0KPm*`#zbs^5pknG=*oSl=Dkr=&)67<(5#^?Clw$KHkdKYMp7
zcv`lapP+E)axIma8otaE>$Pj#rrJBg$ewzaQj1!yHvOT_%*qeUvaHADWUh<Fx>w-7
z-EO|WKP<A0m?n7pq{*A`*tqfOf%K5;U1NNQOQY8Zi<4+NYu7$#(7EW;w@p|X*KD1p
z`l{C<A-Ox<Fm^V3ZH99kFKcMmF8$r^+9`UvjkNJ|QKN@Wsy2P0y9M#_if0~CowjQ7
zjvKbWKCT&&N1Se}aUNnN{&j7pho2JAv=DlcPv+t8dzjV;O4FJ@N1J{qdS{c~Vw$ON
zInPOBP2OmJt1+wX-}sG^-TIlQoM(qp)_HwRUw5mxr}JaR?OT!f{t?f*N2xi#)n}Nu
zm1mXNJ+zG7-8W?MJmD26S*=uP-nBRWq4w$Gsl-5{YC@!Vhkc>w%NAN_^(YeM(?8>q
z9!b3`+TW<Bc1O@D>8mZ76-2)m#q<}BkKLKec5yPOa(kvn4fpeM#rD53kd;439^0yZ
zojCk!FRo;Ms8O-JGRlKb6Y|+FPES17ZUc(4yy@gcr?28zZnQ`%AVgCBG<HLgG4)MP
zXi|Jy*ZO0#mgg_%E*^5-{*8xE8g(zW*(==c8L{3>Y$g!CGE(nO+Ac1`b3RR!(P#bJ
zdlL-y+j`NC9N#i=s!c60&V}$^GkoJ*!5*!`t&P}*8{RSY1W8EF$N-lf+M84V$!J!2
zhAH;fi}MLuu=P4Td9R^a%zDx>n_7X(3O@HV`1c{D4CQ--E0`jCop`Mf?4sD77*nct
zrh1Aq7$`WUXt>(NIs1Lb!316Rf&9&cK)2W%^T$4zt2iegJMc1~%E}_qi#I?LhZMxU
z5CmU%@cNe4-;TURN_ejAWU?kA5lKo<M^mONOMJJrzrbE$wKVJr3nE2`&W>Rwd#`q6
z9D0W*4P{JxdgvjMN5^Do8luns<Ci7r-kBfy3!D<l&F7XlEFL&1ZA52AZpj5a%mUCL
zs4+V#oi5NR%LR2Na^M?TQ6V@;0VAVRry-rP<%|gBIB7;9i3AXG3oO}AE|8J~Dw9wV
zNeSQMeNg$S=1SFD)nTa4n+BumjF~$W-4yB4LMv(#RoXI0H1U&~hfNxPZf3!d0t5dy
zO*i68eP@llVV!ZKO{fw&8CzqaWHJ4vvVhr-g*~HJ1|Y~fqxpa(Ckq|nvhFKXr>yS^
z#gz+Op~~e#S13(+blK%97v#fHwR|jV@X~DyEAZ}E5*DG${J5(?63bZzURI!vqd{GH
zO(7V}V<HA)0Onb2P;EtAHo+bTSq!912J~3!0&TVn1kbD(h&LYe*cbu^m%emft_}>O
zYKi4Jm@I8|#Fl{o1?aN?=eRmBakDi8`HBKBAW|j+Yin%?B@hM^Amjn6iUY{CLE&vK
z0~seu;WiTEyVFmVN>az54;H@VsT)Yp0H9lB&p=w0p)dqg2Q~!V6e>7kOGFNnrLfl4
zME}Q+I2SqYFN6h{unHTqvS5fFz}g#uOZJ98HV~^1#vF{nWjj2uutPTyWXC{8mZ2jA
zFCn;U05koeU@?F0(as2_`+zzwZmA@n%|KF2;9=^6DmGfK3xYuum;jmu3eZz?G=;zd
zE=bp3`gZ65p&MU*IN$rmV91!c4Hc-J3ka5IzL_NhS!D)+BgmG5S_raG5C)@m90o#Q
gLg5C=IQkHXAjn+;3HVjO!%7{P^GI@GEOe>=02CUJI{*Lx

diff --git a/src/main/resources/projectTemplates/tornadofx-maven-osgi-project.zip b/src/main/resources/projectTemplates/tornadofx-maven-osgi-project.zip
index a32d9a3076a08e00e3bbb18f37f282874162e9ff..e223e6c652dc2d8c95b4941d028c2c4810ead2af 100644
GIT binary patch
delta 1952
zcmY+F2~bm46o%i+0trcI44^0yf*4RCBwz@EKmdiZxCK<ejev?u2_VX1TQCYtL2KA9
z6sQ)(VL%3m5d`bfs8xz~1V;t6iik1_xRF){#L?RO-h&!5lQ;Rl`=4{qnfuO-ZXepR
z4>eaTBU8)}?6Y+L@rV+0cT;U`VeE~fW>D=i3q?wl8_7_d(pyt-8#uSn9|J(>3|E2G
zq97xMN-e>_d^=F=#%8WvLr2K=y4lLl=DtM=BXh8Gw2?aJ9A~5?F7dd+O8{2FR7|xV
z5UxTgmatNAT9Ayd^Ib<_5$!H%xDp6*i5mMv+l<0Dxn<z$uG{czG9FLEdmT<xvIa;9
z63#@B`QR3v2Ut|5da8S6`W^;?QijP0LK%UN=BURh4|(jpH<fWg-?M5H+E!Sl_cpu`
zH>`DPJN!OOl)59yf1gFvoqs3d3e+8`Pq$sS>CDW0oNc;2NBdSxk6e@B_^$UIb9pEF
zEHLm;XVjqbW+pf}_;P1nE$3ue<)!0i^>c)pk_t7uZcmWcB@W<Imvk702FVwY)i&{#
zWqw1usuCm5Hs4Fs$urGcN5+_XpFY38XbY=FTGsPC$s>>RJ;@U>Y}MSZ+>u;)pw=Pf
zh;***W$JKg&6+^*<m+<UBi9_k!)t?^`R<brW(PvhuGB>q2V)b)*iFn0v74I$hAV@_
zR%)8$5Vs>W?8^2UY2npJ%M9<vexaU;77mdb7yMe{9;c6`*royXohCyQFWU9PPt9*x
zo$cvQd<MfWH@2%TBsuWgmY*<p*4#QQq7NP`%tE`j(~_$aFZ^9Q>)R{O7?tbfk8F?5
zl)U|Jbs+y)iLWZjwS4k7NqgE5N!6md9%HYz35&`)_dd!{I#TavJFY%sIo|f__@2r$
zzI%^JS>)&ng@4|0a;18_zHMpme(|Y4^CLf%`xeZ|*_&OuE2g2!StS%0g5&)YxYApW
zVfV8Xs~^-GdThP)l%;K6;iyJFdBXJj9-Ua*<Fh3+*Yx(h)p`By@xf;lqcxFNSNi>-
zj$8Lqax9}fbX(^S{ZEIRlLk+fj$eCG-@2+tI2z88In8^Q(^0hxw4EOnoopPN-B>wC
zc27SqT6q4+!2Uf2&&#%URKE$0L^DQZ%-u(At{*Jv&Ik!dpK%h`Z~53_$7LKDGkg>G
zq9D1~j?FEQ2JX$b>Cf?=D8BnUdDmA-!Kvz1PIe=q51(w+B;<cAdh=>+-Kn#_oB?f>
zNTpEq$1{G`WepS??p(f@ESJphzT7lnGqO+YS(X@86FyrIre$_&N}hT&y0;AdBfIaZ
z?9x!RI@>E<75oK{iy~d<i)cBv_0@H6hIA9%X&W}IPn(?aAZzE>Z?dC41kgUA@GhVd
z6Eu^y1fLmV%89w=gJQac(Og+D(sA`8V-OCZp1ylZaY2OHB}h1|RTydA%33y)$V%jq
z8s%8bC&s>lzY#`^@x$<l0LNey%2tOJxRpG=gBbf1W&{qdGFQOm-84Ku=%5u6%LklR
z;^7aR9-!tZiA(-`uYnux{uFGq!4tU^;a<2{?MN6>$|n@~4LJ3%N35rQv60sSw<+MV
z%mFxg+rvFWy?G=76@mo--~g5KNE!?Xfr$)rERgX?V;EQrvT<+}0;LHASchC69_cnF
zWT42G4)T1kkU9ugnodC$VEfuTAT$K4>iK$PxeP@R2E2hHrmBJxsomdA_%F&miEg@l
zd8Bgs=NzsKK=HQ*u^y(=xiWiBJEdT;@VoYlT;pa_ao)r+y_drl82=X;>*olI%=hDw
z(wRn(3eLH4j5oplKfbtAzu2UY1!}~0;PqnW^f_3=tTV+t(wrG^g%37~xzle6kCaKU
zVmcFqc-T$1kg>*a{RS+b3UBSmFS7Sf`^~^v4+e;l_`&2mJa{B;3p{x-9a{*2aF!>J
zRAh<67*FTVJBplfrsA7{2q|_dY4Bt#rlCFPliES}0m5h(+$nH011r2RsDUY83vl?#
zfdzWSbBQylmhea>LY$vqa=?THGpk|84H#4qrX(-;0*P?bX)i}G*WcVk?+$xJ{sR?=
B&)@(6

delta 1974
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

diff --git a/src/main/resources/projectTemplates/tornadofx-maven-project.zip b/src/main/resources/projectTemplates/tornadofx-maven-project.zip
index 5051dc0f0367eb3ca10dbbe3d941915b35639884..cea2913a5c460819199c69cb7486fa60f15ac71f 100644
GIT binary patch
delta 1679
zcmZvcc~nzJ6vkg(LN+i44U0hGK|%rv2?+@V1q5q6psc4A0gL)TK(qlu6~xj?s6`Yg
zXeU^gxYkn^6@ucvfh`CsT2osUr7l>i@wl|MAgxH>A|>|p{W0f!zq$9$%zg8XA%9ao
zCn1_jV?+2ivvkjU8#z)&)81<IQq2L-E^?wk02PK%$JG&Ggq5-vMOrDHiU-O?YAbS6
z^uCpf^hvf-Cwx)~b<Y!DrCgjrsHfrr8V}nGQ21sNV2iJX*dACSSzr}^N0LpbIesQO
zmCQh;yp6fjaoW=S2kZzji37zdSdC#Y1lh45$OCc%X|gFLy1X1&QI0loE(@Z*Iqaf>
zB3p<;dq{;K+9Pb}NsO)Om2*$OknE|yext4FnnS?N=)?wd)BJ{8jY<8R(V!Oot<wFC
zuZLVh?g&0NyI){kIkjcgi_RUp&U?k4qSjWh&I~%CPm2wc?G^6LBYFNFYZ#*n<L;P>
zuoCZHWp>j~uj3wTZPF?x8mPv!gI`B<Ij<gmW%sQ8cE*-fKVDh8pWR_G_5a4KUKxZ=
z-RXa~=GVGr;mitZXKknP`@&=ClFZZbpP@NR<2DU-a?2`=3R5t8d3AQ>?ztM(@KXcx
zfKz*Q&Va6kw`$Ory*`Q})ou0WwO@FMBrhvD(xGu(<M?HNl(w?1R$8VpmF3U)g?p}}
zL06!YeLL!KK1*=VJ({*{@$7CvPknb}VzO=d!m>DLMr?1f?x@DJB=>pX5A(W;O{$E`
zVNHJ8>jmGe%Q8d`&<l=V8#vl|!yecs%zLyng<q};OKMr06mw@Jbn)muQS;->b@x?y
zCClsDc38gnZomT9J#ly^7~QqPVCqR+u;TpSXzQ*9mt&XIfhd)yND{9|=^M43aK!IG
z$g%De^Zimom-lXu&8lZ{T}KmUrx!x~Cd=W8+3y|_sGr6B89eR7>qYza@(*shc+Sz~
zt0Cd~9In)-JO1L_?I9=iX=gj+Cuz#U`Fd@Mem?&ON79S-<-57t8mpdL(5+R2svX?8
z42|Zwv~u}+(X^jE%uarb8+&p;i7-uFSpVs)T$<>?nL@X^m6Km}$DE*yYUO>cC5r8p
z7g~)YBKF^Ttq1FuEjN6So^>|8F8-sJuH&}Ks~t)p{PkvV2hnsfad}CD*^6W#-hUEk
zW-zQS_*I6EP#R`GW{(%FIk-9$!Jg?z+JVRtFo8+IW@Fdb(==rf?o!fC!=9wKlD$%~
z<ilRGh~yD3J_WZL5=B%tBkiPdd|0srC}Mq#O>dwROMyOmH974mm`$YT2%b<l6xf|Q
z{#pR0G=zpb2(&94$bF$g9*9-i0lm}>R14{#Sm}Wk-KIn+^`KPh3c^J!a98PxF?$gY
z=oNM_l>+oZVi2dop-zRsnK+PvHkBtIYuSI>r-Gc{G?EKFnQ;-14Fb~w@#NG%1fB|G
zAOsvIz%2~y$3Zv<4Z<TVK?uyJ5+GVF9D8Ya9I_+@E4;UqO2g)}$kP<45je$$sAyIT
zu>!*wxJm+<-z1P7><qYa1~!385z6mik<1ksrJ?-)eSEAJ31tIR=ED8=C9)x3qVYaX
zmm#p(4hxz-_P@z)i6>wT0g3(+Y|&DG1g;{14KonD^v8Q$B}d?X4iR-(E_pk9r8mKw
z6nJ*80)cOi0X9&3If1YMyuyM21g;elkvju?F))Iar1%gZT;WT$%^73%z648UO#)gu
op1Fbkb}w&}0S{!7vAe_reF1jxNimUVs}ur#Fo*t^AO1`K0RdZ7_W%F@

delta 1750
zcmZuy2~bm46#f5a4_SZ&BoLc`CX&R2B>_^=2$e+y5s*|X2*wR6FcftJTQCG2HxR_9
z=`i3@a9<)A(4iHnViBoMtBe#-J33Na5VuxD>(cjs0>+vCKR+|~ymQaJ@4kCq%y~QW
zI0>;NG7~}Q2*Nt(nOMnDk~8*2r2|ud8<j-n!v)X~$Ojyn4njO@I;|h$)9D1)?|NBx
zD25<T3<ME@V${p|o7@~#K~A<lnSqe(Dm>#={p{SE{;Zb!^E}!u<{g%ww}$2UMVe4$
z@S@xG$9xp!NhyI7KhFzz+&ahncDFX(I^H}tLbs!$!gbq|QqA+>WVv*tGrhR^X<~fD
z#e%ahT3e@5^WPU~XH@Y+XEkR0o_gZ#iSAz43;d@tnzn6etZ93|+c$p+{w!&}9QgO6
zy+-y|?puQlo7zyJuCKWIbs=ihO)pXll7#*i&A^5=ZEh*@!6H|3R_v-%XG1pnCij<_
zenD3a&q!e%@TtAbJrt4ILLbgnZz?^|Vf`&}W&|_S)HV4BdUq7<e3F$d?el2dE{tA0
zmu$(FOe`5+=5%zUv#RsL%k#~w5A%f8mBtOBlU=ea+$2C#Cl%=p6NKNoO)&@?zs~*j
zA}Px$ck>z_oym*0@^PNtaOSu=Qd2iIaNOZJ2Lf7~+V_}Ki;s4ObyC;Py1vB4tKjNC
zZ6_xTx6&T{m=>Q{GmvB9_awHMdv2xPX>8d?qOo?CyPiIGxb%I``@QZO{iG)^^z0rZ
z5_x48bK#e-KE$mbAA6r;S!G^bAeO9*c|ZaKy^PoH@|Y{kMZ)eD4w{o`?jNW+f<|Wy
zd7a#~I-+~Uyq+)ay-1TZuxlxjwau|N8mwIH&>4^A`HR{+-(8AN$fDd_9GP-Fw7hMJ
z3Am(9i>to2r=53UOW9`nIYXZ6dBmlkqKn>?EQ@RE-Ih;3eM#Nq*Rk!+hFjm4*A<4G
z|8Dtp?nuV^hlk#kKCICnyeHHpY76U{B5zdJ^|`A5byKu<+!c-XC+K5MbL`4~*(|&x
zLAZP!(Z9eb(SYS_o+HPg;e*5MRDw5-(}mK3KsKAO*2-2uYmh@|SZ8w8?zUcM_|7EO
zm-;r0szy61-j&$Y5~Oj^f44LeXIo!Nc_=j7<S~RPQrt%2@ZeKbxggZ;PFVF}4i?N<
z1;YHD8N|GJ*9%6c4yS?~G}e*Zh0b*}!?F2}W+R5DH8!zM<Ymz0f%W7*+qM*>r36q*
zT4vjpfwIuip_h_LtS3|VaZv0t(#Hz{FqNVBECUyny+jRxVk`*(4Qfv?6gYLl|6K-%
z2ZBE+{Pvq_NH~`}b~jLny8-G6V96@fV$7ck2|8P%M?%EdX51Eo!4QQlSA|N9WzYyL
zNTYyG28|fIYy&#jL7+z?f?yEz6f+3cY?&+A5`u#xkU3}rMO-e32@=}Ev<HhZqnIF1
z^JRmB!NQNBD!d8&SP&lSu7nQ;gIL(}QIH8l(s5u)Fs{A;s+{m4*fqg22zYA6m|!9S
zq-v$$nT9O2RWf(is|2DX_8+0WLI~oF4292^LKn{+Dl({5dZYBpdOqk;vM`GsmP2K{
z28>BK4euC`uYx>K1;MOQkPjXbpp%~%yEY06!4f~58IJKml^+Y6?rWFuwuJ&@e=&Ay
z6pX?T6HnDkTDYPcrn(oNVALmvDU;a+Bp{9K1l9%E3%UvF80BMY>qtz{rN(Pypzt}i
zZm{h&T``tHJ%tALD}_@0PsSFv_QA9Jdtlrl_{Dq@_YX%m3Q$tnP~U@3q2dJ<z;~k)
Kf{aYYt^WXi5H_a(

diff --git a/template-projects/tornadofx-gradle-project-kts/build.gradle.kts b/template-projects/tornadofx-gradle-project-kts/build.gradle.kts
index 30ca866..e4dfd75 100644
--- a/template-projects/tornadofx-gradle-project-kts/build.gradle.kts
+++ b/template-projects/tornadofx-gradle-project-kts/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.0"
+    kotlin("jvm") version "1.4.32"
     application
 }
 group = "com.test"
diff --git a/template-projects/tornadofx-gradle-project/build.gradle b/template-projects/tornadofx-gradle-project/build.gradle
index a4dbd33..b2a725f 100644
--- a/template-projects/tornadofx-gradle-project/build.gradle
+++ b/template-projects/tornadofx-gradle-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version "1.4.0"
+    id 'org.jetbrains.kotlin.jvm' version "1.4.32"
     id 'application'
 }
 group = 'com.test'
@@ -14,7 +14,6 @@ application {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "no.tornado:tornadofx:$tornadofx_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
 }
diff --git a/template-projects/tornadofx-maven-osgi-ds-project/pom.xml b/template-projects/tornadofx-maven-osgi-ds-project/pom.xml
index af77920..d6578c7 100644
--- a/template-projects/tornadofx-maven-osgi-ds-project/pom.xml
+++ b/template-projects/tornadofx-maven-osgi-ds-project/pom.xml
@@ -11,7 +11,7 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <kotlin.version>1.4.20</kotlin.version>
+        <kotlin.version>1.4.32</kotlin.version>
         <tornadofx.version>1.7.20</tornadofx.version>
     </properties>
 
diff --git a/template-projects/tornadofx-maven-osgi-project/pom.xml b/template-projects/tornadofx-maven-osgi-project/pom.xml
index 55e5c2a..f707137 100644
--- a/template-projects/tornadofx-maven-osgi-project/pom.xml
+++ b/template-projects/tornadofx-maven-osgi-project/pom.xml
@@ -12,7 +12,7 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <kotlin.version>1.4.0</kotlin.version>
+        <kotlin.version>1.4.32</kotlin.version>
         <tornadofx.version>1.7.20</tornadofx.version>
     </properties>
 
diff --git a/template-projects/tornadofx-maven-project/pom.xml b/template-projects/tornadofx-maven-project/pom.xml
index 547851f..0f6c4a6 100644
--- a/template-projects/tornadofx-maven-project/pom.xml
+++ b/template-projects/tornadofx-maven-project/pom.xml
@@ -10,7 +10,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <kotlin.version>1.4.0</kotlin.version>
+        <kotlin.version>1.4.32</kotlin.version>
         <tornadofx.version>1.7.20</tornadofx.version>
     </properties>
 
diff --git a/zip-template-projects.sh b/zip-template-projects.sh
old mode 100644
new mode 100755

From f7bad6656d595b30866228a2f425aaf4bd50cf94 Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Sun, 2 May 2021 16:41:15 +0300
Subject: [PATCH 4/7] update build.gradle.kts, up version intellij, append
 untilBuild=""

---
 build.gradle.kts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3cb106d..0c94cc6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.intellij.tasks.RunIdeTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.intellij.tasks.PatchPluginXmlTask
 import org.jetbrains.intellij.tasks.PublishTask
@@ -6,12 +5,12 @@ import org.jetbrains.intellij.tasks.PublishTask
 plugins {
     idea
     java
-    kotlin("jvm") version "1.4.30"
-    id("org.jetbrains.intellij") version "0.7.2"
+    kotlin("jvm") version "1.4.32"
+    id("org.jetbrains.intellij") version "0.7.3"
 }
 
 group = "no.tornado"
-version = "1.7.20-1-dev"
+version = "1.7.20-1"
 
 val publishUsername: String by rootProject.extra
 val publishPassword: String by rootProject.extra
@@ -21,13 +20,17 @@ repositories {
 }
 
 intellij {
-    version = "2020.3.2"
+    version = "2021.1.1"
     //updateSinceUntilBuild = false
     setPlugins("java", "properties", "Kotlin")
 }
 
 tasks {
-    // withType<PatchPluginXmlTask> { }
+     withType<PatchPluginXmlTask> {
+         version(project.version)
+         sinceBuild("203")
+         untilBuild("")
+     }
 
     withType<PublishTask> {
         username(publishUsername)

From 7f760ecbcb45a8865a434b39e005189e91a2149e Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Mon, 3 May 2021 12:01:25 +0300
Subject: [PATCH 5/7] class FXTools - convert to object

---
 .../no/tornado/tornadofx/idea/FXTools.kt      | 68 +++++++++----------
 .../idea/actions/InjectComponentAction.kt     |  2 +-
 .../idea/annotator/CSSBoxAnnotator.kt         |  2 +-
 .../TornadoFXRunConfigurationProducer.kt      |  2 +-
 .../intentions/ConvertAllPropertiesToFX.kt    |  2 +-
 5 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/FXTools.kt b/src/main/kotlin/no/tornado/tornadofx/idea/FXTools.kt
index 2316ea2..d27ae7f 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/FXTools.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/FXTools.kt
@@ -12,48 +12,46 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.supertypes
 
-class FXTools {
-    companion object {
-        fun isComponent(psiClass: PsiClass) = isType("tornadofx.Component", psiClass)
-        fun isFragment(psiClass: PsiClass) = isType("tornadofx.Fragment", psiClass)
-        fun isUIComponent(psiClass: PsiClass) = isType("tornadofx.UIComponent", psiClass)
-        fun isApp(psiClass: PsiClass) = isType("tornadofx.App", psiClass)
-        fun isView(psiClass: PsiClass) = isType("tornadofx.View", psiClass)
-        fun isStylesheet(psiClass: PsiClass) = isType("tornadofx.Stylesheet", psiClass)
+object FXTools {
+    fun isComponent(psiClass: PsiClass) = isType("tornadofx.Component", psiClass)
+    fun isFragment(psiClass: PsiClass) = isType("tornadofx.Fragment", psiClass)
+    fun isUIComponent(psiClass: PsiClass) = isType("tornadofx.UIComponent", psiClass)
+    fun isApp(psiClass: PsiClass) = isType("tornadofx.App", psiClass)
+    fun isView(psiClass: PsiClass) = isType("tornadofx.View", psiClass)
+    fun isStylesheet(psiClass: PsiClass) = isType("tornadofx.Stylesheet", psiClass)
 
-        fun isType(type: String, psiClass: PsiClass): Boolean {
-            for (supa in psiClass.supers)
-                if (type == supa.qualifiedName) {
-                    return true
-                } else {
-                    val superIs = isType(type, supa)
-                    if (superIs) return true
-                }
+    fun isType(type: String, psiClass: PsiClass): Boolean {
+        for (supa in psiClass.supers)
+            if (type == supa.qualifiedName) {
+                return true
+            } else {
+                val superIs = isType(type, supa)
+                if (superIs) return true
+            }
 
-            return false
-        }
+        return false
+    }
 
-        fun isTornadoFXType(psiClass: PsiClass): Boolean {
-            for (supa in psiClass.supers)
-                if (supa.qualifiedName?.startsWith("tornadofx.") == true) {
-                    return true
-                } else {
-                    val superIs = isTornadoFXType(supa)
-                    if (superIs) return true
-                }
+    fun isTornadoFXType(psiClass: PsiClass): Boolean {
+        for (supa in psiClass.supers)
+            if (supa.qualifiedName?.startsWith("tornadofx.") == true) {
+                return true
+            } else {
+                val superIs = isTornadoFXType(supa)
+                if (superIs) return true
+            }
 
-            return false
-        }
+        return false
+    }
 
-        fun containsTornadoFXImports(file: KtFile) = file.importList?.imports?.find {
-            it.importedFqName?.asString()?.contains("tornadofx") ?: false
-        } != null
+    fun containsTornadoFXImports(file: KtFile) = file.importList?.imports?.find {
+        it.importedFqName?.asString()?.contains("tornadofx") ?: false
+    } != null
 
-        fun psiClass(className: String, project: Project) =
-                JavaPsiFacade.getInstance(project).findClass(className, project.projectScope())
+    fun psiClass(className: String, project: Project) =
+            JavaPsiFacade.getInstance(project).findClass(className, project.projectScope())
 
-        fun isJavaFXProperty(type: KotlinType?) = type?.supertypes()?.find { it.getJetTypeFqName(false) == "javafx.beans.property.Property" } != null
-    }
+    fun isJavaFXProperty(type: KotlinType?) = type?.supertypes()?.find { it.getJetTypeFqName(false) == "javafx.beans.property.Property" } != null
 
 }
 
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt b/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt
index 25b8f21..39e5939 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/actions/InjectComponentAction.kt
@@ -16,7 +16,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.ui.EditorTextField
 import com.intellij.ui.EditorTextFieldWithBrowseButton
 import no.tornado.tornadofx.idea.FXTools
-import no.tornado.tornadofx.idea.FXTools.Companion.isComponent
+import no.tornado.tornadofx.idea.FXTools.isComponent
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.search.allScope
 import org.jetbrains.kotlin.idea.search.projectScope
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSBoxAnnotator.kt b/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSBoxAnnotator.kt
index ef5fbf8..1ce8ba1 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSBoxAnnotator.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/annotator/CSSBoxAnnotator.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
-import no.tornado.tornadofx.idea.FXTools.Companion.isStylesheet
+import no.tornado.tornadofx.idea.FXTools.isStylesheet
 import no.tornado.tornadofx.idea.quickfixes.css.BoxQuickFix
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
 import org.jetbrains.kotlin.idea.references.KtInvokeFunctionReference
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunConfigurationProducer.kt b/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunConfigurationProducer.kt
index 1b0492a..464b850 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunConfigurationProducer.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/configurations/TornadoFXRunConfigurationProducer.kt
@@ -8,7 +8,7 @@ import com.intellij.execution.configurations.runConfigurationType
 import com.intellij.openapi.util.Ref
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiElement
-import no.tornado.tornadofx.idea.FXTools.Companion.isApp
+import no.tornado.tornadofx.idea.FXTools.isApp
 import no.tornado.tornadofx.idea.configurations.TornadoFXConfiguration.RunType.App
 import no.tornado.tornadofx.idea.configurations.TornadoFXConfiguration.RunType.View
 import no.tornado.tornadofx.idea.firstModuleWithTornadoFXLib
diff --git a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/ConvertAllPropertiesToFX.kt b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/ConvertAllPropertiesToFX.kt
index e573246..94147b2 100644
--- a/src/main/kotlin/no/tornado/tornadofx/idea/intentions/ConvertAllPropertiesToFX.kt
+++ b/src/main/kotlin/no/tornado/tornadofx/idea/intentions/ConvertAllPropertiesToFX.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import no.tornado.tornadofx.idea.FXTools
-import no.tornado.tornadofx.idea.FXTools.Companion.isJavaFXProperty
+import no.tornado.tornadofx.idea.FXTools.isJavaFXProperty
 import no.tornado.tornadofx.idea.facet.TornadoFXFacet
 import no.tornado.tornadofx.idea.facet.TornadoFXFacetType
 import org.jetbrains.kotlin.idea.KotlinLanguage

From 1ef29158a07dbaf6c5657b9ea02db5968d682b6a Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Mon, 3 May 2021 13:42:21 +0300
Subject: [PATCH 6/7] fix deprecate JavaFX plugin:
 https://blog.jetbrains.com/platform/2020/07/javafx-and-jcef-in-the-intellij-platform/

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0c94cc6..dc6e8f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "no.tornado"
-version = "1.7.20-1"
+version = "1.7.20.1"
 
 val publishUsername: String by rootProject.extra
 val publishPassword: String by rootProject.extra
@@ -22,7 +22,7 @@ repositories {
 intellij {
     version = "2021.1.1"
     //updateSinceUntilBuild = false
-    setPlugins("java", "properties", "Kotlin")
+    setPlugins("java", "properties", "Kotlin", "com.intellij.javafx:1.0.3")
 }
 
 tasks {

From d7527fbbe804a8af2d18797babb48cad1cc461a6 Mon Sep 17 00:00:00 2001
From: "Sch.Funtik" <schweinchenfuntik@gmail.com>
Date: Mon, 10 May 2021 13:12:40 +0300
Subject: [PATCH 7/7] release 1.7.20.1

---
 build.gradle.kts                         | 14 +++++++-------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 src/main/resources/META-INF/plugin.xml   |  4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index dc6e8f7..cd52a30 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,22 +26,17 @@ intellij {
 }
 
 tasks {
-     withType<PatchPluginXmlTask> {
+    patchPluginXml {
          version(project.version)
          sinceBuild("203")
          untilBuild("")
      }
 
-    withType<PublishTask> {
+     publishPlugin {
         username(publishUsername)
         password(publishPassword)
     }
 
-    withType<JavaCompile> {
-        sourceCompatibility = "11"
-        targetCompatibility = "11"
-    }
-
     withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "11"
     }
@@ -55,3 +50,8 @@ tasks {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 186b715..442d913 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index c115169..b8a5d81 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -9,6 +9,10 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <h4>1.7.20.1 2021-05-10</h4>
+        <ul>
+            <li>Support IDEA 2020.3</li>
+        </ul>
         <h4>1.7.20 2020-08-24</h4>
         <ul>
             <li>Support kotlin 1.4</li>