bunch of fixes

Author: daimor

gradle.properties

@@ -8,14 +8,14 @@ pluginVersion = 0.0.5
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.s
 pluginSinceBuild = 193.*
-pluginUntilBuild = 221.*
+pluginUntilBuild = 213.*
 
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
 pluginVerifierIdeVersions = 2021.3
 
 platformType = IC
-platformVersion = 2021.3
+platformVersion = 2021.3.3
 platformDownloadSources = true
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html

lib/textmate/language-configuration-class.jsonc renamed to lib/textmate/language-configuration-class.json

@@ -4,9 +4,7 @@
     "blockComment": ["/*", "*/"]
   },
   "brackets": [["{", "}"], ["(", ")"], ["[", "]"]],
-  // symbols that are auto closed when typing
   "autoClosingPairs": [["{", "}"], ["(", ")"], ["[", "]"], ["\"", "\""]],
-  // symbols that that can be used to surround a selection
   "surroundingPairs": [["{", "}"], ["(", ")"], ["\"", "\""], ["[", "]"]],
   "indentationRules": {
     "increaseIndentPattern": "^((Class|Client)?Method|Query|XData|Storage|Trigger)",

lib/textmate/syntaxes/objectscript-macros.tmLanguage.json

@@ -4,7 +4,7 @@
   "scopeName": "source.objectscript_macros",
   "patterns": [
     {
-      "match": "^(ROUTINE)\\s(\\b[\\p{Alnum}.]+\\b)",
+      "match": "^(ROUTINE)\\s(%?\\b[\\p{Alnum}.]+\\b)",
       "captures": {
         "1": { "name": "keyword.control" },
         "2": { "name": "entity.name.class" }

lib/textmate/syntaxes/objectscript.tmLanguage.json

@@ -4,7 +4,7 @@
   "scopeName": "source.objectscript",
   "patterns": [
     {
-      "match": "^(ROUTINE)\\s(\\b[\\p{Alnum}.]+\\b)",
+      "match": "^(ROUTINE)\\s(%?\\b[\\p{Alnum}.]+\\b)",
       "captures": {
         "1": { "name": "keyword.control" },
         "2": { "name": "entity.name.class" }

src/main/kotlin/com/caretdev/plugins/idea/InterSystemsLanguage.kt

@@ -3,7 +3,6 @@ package com.caretdev.plugins.idea.configuration
 import com.caretdev.plugins.idea.preloading.LSPUtils
 import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Disposer
 import javax.swing.JComponent
 
 class InterSystemsProjectSettingsConfigurable(private val project: Project) :
@@ -15,7 +14,7 @@ class InterSystemsProjectSettingsConfigurable(private val project: Project) :
 
     override fun isProjectLevel(): Boolean = true
 
-    override fun createComponent(): JComponent? {
+    override fun createComponent(): JComponent {
         settingsPanel = settingsPanel ?: InterSystemsProjectSettingsPanel(project)
         return settingsPanel!!.getPanel()
     }
@@ -33,10 +32,7 @@ class InterSystemsProjectSettingsConfigurable(private val project: Project) :
     override fun getDisplayName(): String = "InterSystems"
 
     override fun disposeUIResources() {
-        if (settingsPanel == null) {
-            return
-        }
-        Disposer.dispose(settingsPanel!!)
+//        Disposer.dispose(settingsPanel!!)
         this.settingsPanel = null
     }
 }

src/main/kotlin/com/caretdev/plugins/idea/configuration/InterSystemsProjectSettingsConfigurable.kt

@@ -1,63 +1,62 @@
 package com.caretdev.plugins.idea.configuration
 
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
-import com.intellij.util.ui.UIUtil
-import javax.swing.JCheckBox
+import com.intellij.ui.components.JBCheckBox
+import com.intellij.util.ui.FormBuilder
 import javax.swing.JComponent
 import javax.swing.JFormattedTextField
 import javax.swing.JPanel
 import javax.swing.JPasswordField
 import javax.swing.JTextField
 
-class InterSystemsProjectSettingsPanel(project: Project) : WithProject(project), Disposable {
-
-    private var settingsPane: JPanel? = null
-    private var lsTraceLogs: JCheckBox? = null
-    private var host: JTextField? = null
-    private var port: JFormattedTextField? = null
-    private var namespace: JTextField? = null
-    private var username: JTextField? = null
-    private var password: JPasswordField? = null
+class InterSystemsProjectSettingsPanel(project: Project) : WithProject(project) {
+
+    internal var settingsPane: JPanel
+    private var host: JTextField = JTextField()
+    private var port: JFormattedTextField = JFormattedTextField()
+    private var namespace: JTextField = JTextField()
+    private var username: JTextField = JTextField()
+    private var password: JPasswordField = JPasswordField()
+    private var lsTraceLogs: JBCheckBox = JBCheckBox()
+
+    init {
+        settingsPane = FormBuilder.createFormBuilder()
+            .addLabeledComponent("Host:", host)
+            .addLabeledComponent("Port:", port)
+            .addLabeledComponent("Namespace:", namespace)
+            .addLabeledComponent("Username:", username)
+            .addLabeledComponent("Password:", password)
+            .addLabeledComponent("Show trace logs", lsTraceLogs)
+            .addComponentFillVertically(JPanel(), 0)
+            .panel
+    }
 
-    fun getPanel(): JComponent? {
+    fun getPanel(): JComponent {
         return settingsPane
     }
 
     fun setData(settings: InterSystemsProjectSettings) {
-        lsTraceLogs!!.isSelected = settings.lsTraceLogs
-        host!!.text = settings.host
-        port!!.text = settings.port.toString()
-        namespace!!.text = settings.namespace
-        username!!.text = settings.username
-        password!!.text = settings.password
+        lsTraceLogs.isSelected = settings.lsTraceLogs
+        host.text = settings.host
+        port.text = settings.port.toString()
+        namespace.text = settings.namespace
+        username.text = settings.username
+        password.text = settings.password
     }
 
     fun storeSettings(settings: InterSystemsProjectSettings) {
-        settings.lsTraceLogs = lsTraceLogs!!.isSelected
-        settings.host = host!!.text
-        settings.port = port!!.text.toInt()
-        settings.namespace = namespace!!.text
-        settings.username = username!!.text
-        settings.password = password!!.password.joinToString("")
+        settings.lsTraceLogs = lsTraceLogs.isSelected
+        settings.host = host.text
+        settings.port = port.text.toInt()
+        settings.namespace = namespace.text
+        settings.username = username.text
+        settings.password = password.password.joinToString("")
     }
 
-    fun isModified(settings: InterSystemsProjectSettings): Boolean =
-        lsTraceLogs!!.isSelected != settings.lsTraceLogs ||
-            host!!.text != settings.host ||
-            port!!.text.toInt() != settings.port ||
-            namespace!!.text != settings.namespace ||
-            username!!.text != settings.username ||
-            !password!!.password.contentEquals(settings.password.toCharArray())
-
-    override fun dispose() {
-        UIUtil.dispose(settingsPane)
-        settingsPane = null
-        lsTraceLogs = null
-        host = null
-        port = null
-        namespace = null
-        username = null
-        password = null
-    }
+    fun isModified(settings: InterSystemsProjectSettings): Boolean = lsTraceLogs.isSelected != settings.lsTraceLogs ||
+        host.text != settings.host ||
+        port.text.toInt() != settings.port ||
+        namespace.text != settings.namespace ||
+        username.text != settings.username ||
+        !password.password.contentEquals(settings.password.toCharArray())
 }

src/main/kotlin/com/caretdev/plugins/idea/configuration/InterSystemsProjectSettingsPanel.form

@@ -9,9 +9,11 @@ object CLSFileType : LanguageFileType(TextMateLanguage.LANGUAGE) {
 
     override fun getName(): String = "ObjectScript Class"
 
-    override fun getDescription(): String = "ObjectScript class"
+    override fun getDescription(): String = name
 
     override fun getDefaultExtension(): String = "cls"
 
     override fun getIcon(): Icon = InterSystemsIcons.ICON
+
+    override fun getDisplayName(): String = name
 }

src/main/kotlin/com/caretdev/plugins/idea/configuration/InterSystemsProjectSettingsPanel.kt

@@ -9,9 +9,11 @@ object MACFileType : LanguageFileType(TextMateLanguage.LANGUAGE) {
 
     override fun getName(): String = "ObjectScript Routine"
 
-    override fun getDescription(): String = "ObjectScript routine"
+    override fun getDescription(): String = name
 
     override fun getDefaultExtension(): String = "mac"
 
     override fun getIcon(): Icon = InterSystemsIcons.ICON
+
+    override fun getDisplayName(): String = name
 }