style(intellij): reformat and cleanup code

d-biehl · d-biehl · commit 9415c3b56f63 · 2024-12-30T00:57:43.000+01:00
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeCodeStyleSettings.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeCodeStyleSettings.kt
@@ -4,5 +4,4 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings
 
 class RobotCodeCodeStyleSettings(settings: CodeStyleSettings) :
-    CustomCodeStyleSettings("GdCodeStyleSettings", settings) {
-}
+    CustomCodeStyleSettings("GdCodeStyleSettings", settings)
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeLangCodeStyleSettingsProvider.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeLangCodeStyleSettingsProvider.kt
@@ -49,7 +49,7 @@ class RobotCodeLangCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvider
         }
     }
     
-    override fun getCodeSample(settingsType: SettingsType): String? {
+    override fun getCodeSample(settingsType: SettingsType): String {
         return "*** Settings ***\n" +
             "Library  SeleniumLibrary\n" +
             "\n" +
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeParserDefinition.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeParserDefinition.kt
@@ -22,7 +22,7 @@ import com.intellij.psi.tree.TokenSet
 import org.jetbrains.plugins.textmate.TextMateService
 import org.jetbrains.plugins.textmate.language.syntax.lexer.TextMateHighlightingLexer
 
-val FILE = IStubFileElementType<PsiFileStub<RobotFile>>("RobotSuiteFile", RobotFrameworkLanguage);
+val FILE = IStubFileElementType<PsiFileStub<RobotFile>>("RobotSuiteFile", RobotFrameworkLanguage)
 
 class RobotCodeParserDefinition : ParserDefinition {
     
@@ -81,6 +81,4 @@ class RobotPsiParser : PsiParser {
     }
 }
 
-class RobotPsiElement(type: IElementType) : CompositePsiElement(type) {
-
-}
+class RobotPsiElement(type: IElementType) : CompositePsiElement(type)
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeRunConfiguration.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeRunConfiguration.kt
@@ -7,6 +7,6 @@ import com.intellij.execution.configurations.ConfigurationTypeBase
 class RobotCodeRunConfiguration :
     ConfigurationTypeBase("robotcode", "RobotCode", "Run Robot Framework Tests", RobotIcons.RobotCode) {
     init {
-        addFactory(RobotCodeRunConfigurationFactory(this));
+        addFactory(RobotCodeRunConfigurationFactory(this))
     }
 }
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeRunConfigurationFactory.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeRunConfigurationFactory.kt
@@ -1,6 +1,6 @@
 package dev.robotcode.robotcode4ij
 
-import com.intellij.execution.configurations.ConfigurationFactory;
+import com.intellij.execution.configurations.ConfigurationFactory
 import com.intellij.execution.configurations.ConfigurationType
 import com.intellij.execution.configurations.RunConfiguration
 import com.intellij.openapi.project.Project
@@ -16,6 +16,6 @@ class RobotCodeRunConfigurationFactory(type: ConfigurationType) : ConfigurationF
     }
     
     override fun getIcon(): Icon? {
-        return RobotIcons.RobotCode;
+        return RobotIcons.RobotCode
     }
 }
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeTextMateBundleProvider.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeTextMateBundleProvider.kt
@@ -12,6 +12,6 @@ private fun getBundles(): List<TextMateBundleProvider.PluginBundle> {
 class RobotCodeTextMateBundleProvider : TextMateBundleProvider {
     
     override fun getBundles(): List<TextMateBundleProvider.PluginBundle> {
-        return robotCodeBundle;
+        return robotCodeBundle
     }
 }
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotIcons.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotIcons.kt
@@ -3,11 +3,11 @@ package dev.robotcode.robotcode4ij
 import com.intellij.openapi.util.IconLoader
 import javax.swing.Icon
 
-public class RobotIcons {
+class RobotIcons {
     companion object {
-        val Resource: Icon? = IconLoader.findIcon("/images/robot.svg", RobotIcons.Companion::class.java);
-        val Suite: Icon? = IconLoader.findIcon("/images/robot.svg", RobotIcons.Companion::class.java);
-        val RobotCode: Icon? = IconLoader.findIcon("/images/robotcode.svg", RobotIcons.Companion::class.java);
+        val Resource: Icon? = IconLoader.findIcon("/images/robot.svg", Companion::class.java)
+        val Suite: Icon? = IconLoader.findIcon("/images/robot.svg", Companion::class.java)
+        val RobotCode: Icon? = IconLoader.findIcon("/images/robotcode.svg", Companion::class.java)
     }
     
 }
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotResourceFileType.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotResourceFileType.kt
@@ -4,9 +4,9 @@ import com.intellij.openapi.fileTypes.LanguageFileType
 import com.intellij.openapi.fileTypes.OSFileIdeAssociation
 
 object RobotResourceFileType : LanguageFileType(RobotFrameworkLanguage), OSFileIdeAssociation {
-    override fun getName() = "ROBOT_FRAMEWORK_RESOURCE";
-    override fun getDisplayName() = "Robot Framework Resource";
-    override fun getDescription() = "Robot Framework resource files";
+    override fun getName() = "ROBOT_FRAMEWORK_RESOURCE"
+    override fun getDisplayName() = "Robot Framework Resource"
+    override fun getDescription() = "Robot Framework resource files"
     override fun getDefaultExtension() = "robot"
     override fun getIcon() = RobotIcons.Resource
 }
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotSuiteFileType.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotSuiteFileType.kt
@@ -4,9 +4,9 @@ import com.intellij.openapi.fileTypes.LanguageFileType
 import com.intellij.openapi.fileTypes.OSFileIdeAssociation
 
 object RobotSuiteFileType : LanguageFileType(RobotFrameworkLanguage), OSFileIdeAssociation {
-    override fun getName() = "ROBOT_FRAMEWORK_SUITE";
-    override fun getDisplayName() = "Robot Framework Suite";
-    override fun getDescription() = "Robot Framework suite files";
+    override fun getName() = "ROBOT_FRAMEWORK_SUITE"
+    override fun getDisplayName() = "Robot Framework Suite"
+    override fun getDescription() = "Robot Framework suite files"
     override fun getDefaultExtension() = "robot"
     override fun getIcon() = RobotIcons.Suite
 }
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageClient.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageClient.kt
@@ -9,7 +9,7 @@ class RobotCodeLanguageClient(project: Project?) : IndexAwareLanguageClient(proj
     
     override fun handleServerStatusChanged(serverStatus: ServerStatus?) {
         if (serverStatus == ServerStatus.started) {
-            triggerChangeConfiguration();
+            triggerChangeConfiguration()
         }
     }
     
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageServer.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageServer.kt
@@ -28,7 +28,7 @@ class RobotCodeLanguageServer(private val project: Project) : OSProcessStreamCon
     }
     
     private fun buildCommandLine(port: Int = 6610): GeneralCommandLine {
-        val pythonInterpreter = project.pythonSdk?.homePath;
+        val pythonInterpreter = project.pythonSdk?.homePath
         if (pythonInterpreter != null) {
             return GeneralCommandLine(
                 pythonInterpreter, "-u", "-X", "utf8",
@@ -69,7 +69,7 @@ class RobotCodeLanguageServer(private val project: Project) : OSProcessStreamCon
         clientSocket!!.close()
         clientSocket = null
         serverSocket!!.close()
-        serverSocket = null;
+        serverSocket = null
         
     }
     
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageServerFactory.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageServerFactory.kt
@@ -17,10 +17,6 @@ class RobotCodeLanguageServerFactory : LanguageServerFactory, LanguageServerEnab
         return RobotCodeLanguageClient(project)
     }
     
-    override fun getServerInterface(): Class<out LanguageServer> {
-        return super.getServerInterface()
-    }
-    
     override fun isEnabled(project: Project): Boolean {
         if (project.getUserData(ENABLED_KEY) == true) {
             return true
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageServerManager.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/lsp/RobotCodeLanguageServerManager.kt
@@ -66,7 +66,7 @@ class RobotCodeLanguageServerManager(private val project: Project) {
         )
         if (res.exitCode != 0 || res.stdout.trim() != "True") {
             thisLogger().warn("Invalid python version")
-            return false;
+            return false
         }
         
         val res1 = ExecUtil.execAndGetOutput(
diff --git a/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/settings/ProjectSettingsConfigurableProvider.kt b/intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/settings/ProjectSettingsConfigurableProvider.kt
@@ -27,9 +27,6 @@ class ProjectSettingsConfigurableProvider(private val project: Project) : Config
         return ProjectSettingsConfigurable(project)
     }
     
-    override fun canCreateConfigurable(): Boolean {
-        return super.canCreateConfigurable()
-    }
 }
 
 
@@ -96,14 +93,14 @@ class ProjectSettings : SimplePersistentStateComponent<ProjectSettings.ProjectSt
     }
     
     fun asJson(): JsonElement {
-        val builder = GsonBuilder().serializeNulls().setPrettyPrinting().create();
+        val builder = GsonBuilder().serializeNulls().setPrettyPrinting().create()
         
         val robotSettings = RobotCodeSettings()
         robotSettings.robotcode.inlayHints.parameterNames = state.inlayHintsParameterNames
         robotSettings.robotcode.inlayHints.namespaces = state.inlayHintsNamespaces
         
         val json = builder.toJsonTree(robotSettings)
-        return json;
+        return json
     }
     
     class ProjectState : BaseState() {
diff --git a/intellij-client/src/main/resources/META-INF/pluginIcon.svg b/intellij-client/src/main/resources/META-INF/pluginIcon.svg
@@ -2,6 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
         width="512"
         height="512"
         viewBox="0 0 512 512"
@@ -13,9 +16,6 @@
         inkscape:export-filename="RobotCode_light.png"
         inkscape:export-xdpi="192"
         inkscape:export-ydpi="192"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
         xmlns="http://www.w3.org/2000/svg"
 ><sodipodi:namedview
      id="namedview1"
diff --git a/intellij-client/src/main/resources/images/robot.svg b/intellij-client/src/main/resources/images/robot.svg
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         viewBox="0 0 24 24"
         version="1.1"
         id="svg4"
@@ -8,8 +10,6 @@
         inkscape:export-ydpi="1241"
         inkscape:version="1.4 (86a8ad7, 2024-10-11)"
         inkscape:export-filename="robot.png"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns="http://www.w3.org/2000/svg"
 >
     <defs
diff --git a/intellij-client/src/main/resources/images/robotcode.svg b/intellij-client/src/main/resources/images/robotcode.svg
@@ -2,6 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
         width="24"
         height="24"
         viewBox="0 0 512 512"
@@ -13,9 +16,6 @@
         inkscape:export-filename="RobotCode_light.png"
         inkscape:export-xdpi="192"
         inkscape:export-ydpi="192"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
         xmlns="http://www.w3.org/2000/svg"
 ><sodipodi:namedview
      id="namedview1"

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class RobotCodeLangCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvider`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- override fun getCodeSample(settingsType: SettingsType): String? {`
	`52`	`+ override fun getCodeSample(settingsType: SettingsType): String {`
`53`	`53`	`return "* Settings *\n" +`
`54`	`54`	`"Library SeleniumLibrary\n" +`
`55`	`55`	`"\n" +`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import com.intellij.psi.tree.TokenSet`
`22`	`22`	`import org.jetbrains.plugins.textmate.TextMateService`
`23`	`23`	`import org.jetbrains.plugins.textmate.language.syntax.lexer.TextMateHighlightingLexer`
`24`	`24`
`25`		`-val FILE = IStubFileElementType<PsiFileStub<RobotFile>>("RobotSuiteFile", RobotFrameworkLanguage);`
	`25`	`+val FILE = IStubFileElementType<PsiFileStub<RobotFile>>("RobotSuiteFile", RobotFrameworkLanguage)`
`26`	`26`
`27`	`27`	`class RobotCodeParserDefinition : ParserDefinition {`
`28`	`28`
`@@ -81,6 +81,4 @@ class RobotPsiParser : PsiParser {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`-class RobotPsiElement(type: IElementType) : CompositePsiElement(type) {`
`85`		`-`
`86`		`-}`
	`84`	`+class RobotPsiElement(type: IElementType) : CompositePsiElement(type)`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ import com.intellij.execution.configurations.ConfigurationTypeBase`
`7`	`7`	`class RobotCodeRunConfiguration :`
`8`	`8`	`ConfigurationTypeBase("robotcode", "RobotCode", "Run Robot Framework Tests", RobotIcons.RobotCode) {`
`9`	`9`	`init {`
`10`		`- addFactory(RobotCodeRunConfigurationFactory(this));`
	`10`	`+ addFactory(RobotCodeRunConfigurationFactory(this))`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package dev.robotcode.robotcode4ij`
`2`	`2`
`3`		`-import com.intellij.execution.configurations.ConfigurationFactory;`
	`3`	`+import com.intellij.execution.configurations.ConfigurationFactory`
`4`	`4`	`import com.intellij.execution.configurations.ConfigurationType`
`5`	`5`	`import com.intellij.execution.configurations.RunConfiguration`
`6`	`6`	`import com.intellij.openapi.project.Project`
`@@ -16,6 +16,6 @@ class RobotCodeRunConfigurationFactory(type: ConfigurationType) : ConfigurationF`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`override fun getIcon(): Icon? {`
`19`		`- return RobotIcons.RobotCode;`
	`19`	`+ return RobotIcons.RobotCode`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ private fun getBundles(): List<TextMateBundleProvider.PluginBundle> {`
`12`	`12`	`class RobotCodeTextMateBundleProvider : TextMateBundleProvider {`
`13`	`13`
`14`	`14`	`override fun getBundles(): List<TextMateBundleProvider.PluginBundle> {`
`15`		`- return robotCodeBundle;`
	`15`	`+ return robotCodeBundle`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@ package dev.robotcode.robotcode4ij`
`3`	`3`	`import com.intellij.openapi.util.IconLoader`
`4`	`4`	`import javax.swing.Icon`
`5`	`5`
`6`		`-public class RobotIcons {`
	`6`	`+class RobotIcons {`
`7`	`7`	`companion object {`
`8`		`- val Resource: Icon? = IconLoader.findIcon("/images/robot.svg", RobotIcons.Companion::class.java);`
`9`		`- val Suite: Icon? = IconLoader.findIcon("/images/robot.svg", RobotIcons.Companion::class.java);`
`10`		`- val RobotCode: Icon? = IconLoader.findIcon("/images/robotcode.svg", RobotIcons.Companion::class.java);`
	`8`	`+ val Resource: Icon? = IconLoader.findIcon("/images/robot.svg", Companion::class.java)`
	`9`	`+ val Suite: Icon? = IconLoader.findIcon("/images/robot.svg", Companion::class.java)`
	`10`	`+ val RobotCode: Icon? = IconLoader.findIcon("/images/robotcode.svg", Companion::class.java)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class RobotCodeLanguageClient(project: Project?) : IndexAwareLanguageClient(proj`
`9`	`9`
`10`	`10`	`override fun handleServerStatusChanged(serverStatus: ServerStatus?) {`
`11`	`11`	`if (serverStatus == ServerStatus.started) {`
`12`		`- triggerChangeConfiguration();`
	`12`	`+ triggerChangeConfiguration()`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`