Merge branch 'main' into main

Author: hasanalpzengin

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
+## [1.2.0](https://github.com/robotcodedev/robotcode/compare/v1.1.0..v1.2.0) - 2025-05-07
+
+### Bug Fixes
+
+- **intellij:** Corrected handling of short by-longname argument ([b5fa232](https://github.com/robotcodedev/robotcode/commit/b5fa232f4c0fd3032b863363c141d8ffeff6c8c7))
+- **intellij:** Reenable semantic highlightning, because something has changed in the new LSP4IJ API ([5cdf3c3](https://github.com/robotcodedev/robotcode/commit/5cdf3c3ab87857db294e63bcdc0798f1cfd5eacd))
+- Update IntelliJ platform version and plugin dependencies ([e94c96b](https://github.com/robotcodedev/robotcode/commit/e94c96b99646e602820663f1210d0df962251bf1))
+
+
+  because of some new features regarding syntax highlightning and text mate the minimal supported version is PyCharm 2025.1
+
+
+### Features
+
+- **intellij:** Refactored textmate highlightning to use the new intellij textmate infrastructure ([74644f0](https://github.com/robotcodedev/robotcode/commit/74644f055e6c1dea38e37446ef430387c667b80c))
+- **langserver:** Refactor and optimize Robot Framework textmate syntax highlighting rules ([5b7c4b1](https://github.com/robotcodedev/robotcode/commit/5b7c4b13469072e3c39c8c112118149ac4b5b1cd))
+
+  this also fixes the loading of robotframework core test files in PyCharm
+
+
+
 ## [1.1.0](https://github.com/robotcodedev/robotcode/compare/v1.0.3..v1.1.0) - 2025-04-29
 
 ### Bug Fixes

intellij-client/build.gradle.kts

@@ -27,7 +27,7 @@ kotlin {
 // Configure project's dependencies
 repositories {
     mavenCentral()
-
+    
     // IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html
     intellijPlatform {
         defaultRepositories()
@@ -37,22 +37,22 @@ repositories {
 // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
 dependencies {
     compileOnly(libs.kotlinxSerialization)
-
+    
     testImplementation(kotlin("test"))
     testImplementation(libs.junit)
-
+    
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
         create(
             providers.gradleProperty("platformType"),
             providers.gradleProperty("platformVersion"),
             useInstaller = false,
         )
-
+        
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
-
+        
         pluginVerifier()
         zipSigner()
         testFramework(TestFrameworkType.Platform)
@@ -64,22 +64,22 @@ intellijPlatform {
     pluginConfiguration {
         name = providers.gradleProperty("pluginName")
         version = providers.gradleProperty("pluginVersion")
-
+        
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
         description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
             val start = "<!-- Plugin description -->"
             val end = "<!-- Plugin description end -->"
-
+            
             with(it.lines()) {
                 if (!containsAll(listOf(start, end))) {
                     throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
                 }
                 subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
             }
         }
-
+        
         val changelog = project.changelog
-
+        
         // local variable for configuration cache compatibility // Get the latest available change notes from the changelog file
         changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion ->
             with(changelog) {
@@ -89,34 +89,34 @@ intellijPlatform {
                 )
             }
         }
-
+        
         ideaVersion {
             sinceBuild = providers.gradleProperty("pluginSinceBuild")
             untilBuild = providers.gradleProperty("pluginUntilBuild")
         }
     }
-
+    
     signing {
         certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
         privateKey = providers.environmentVariable("PRIVATE_KEY")
         password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
     }
-
+    
     publishing {
         token = providers.environmentVariable("PUBLISH_TOKEN")
-
+        
         // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
         channels = providers.gradleProperty("pluginVersion")
             .map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
     }
-
+    
     pluginVerification {
         ides {
             recommended()
         }
-
+        
     }
 }
 
@@ -149,22 +149,22 @@ val prepareSandboxConfig: PrepareSandboxTask.() -> Unit = {
 
 tasks {
     runIde {
-
+        
         // From https://app.slack.com/client/T5P9YATH9/C5U8BM1MK
         // systemProperty("ide.experimental.ui", "true")
         // systemProperty("projectView.hide.dot.idea", "false")
         // systemProperty("terminal.new.ui", "false")
         // systemProperty("ide.tree.painter.compact.default", "true")
     }
-
+    
     wrapper {
         gradleVersion = providers.gradleProperty("gradleVersion").get()
     }
-
+    
     publishPlugin {
         dependsOn(patchChangelog)
     }
-
+    
     prepareSandbox(prepareSandboxConfig)
 }
 
@@ -190,29 +190,29 @@ tasks.withType<KotlinCompile> {
             )
         }
     }
-
+    
     prepareSandboxTask(prepareSandboxConfig)
-
+    
     plugins {
         robotServerPlugin(Constraints.LATEST_VERSION)
     }
 }
 
 @Suppress("unused") val runIdePyCharmProf by intellijPlatformTesting.runIde.registering {
     type = IntelliJPlatformType.PyCharmProfessional
-
+    
     prepareSandboxTask(prepareSandboxConfig)
 }
 
 @Suppress("unused") val runIdePyCharmCommunityEAP by intellijPlatformTesting.runIde.registering {
     type = IntelliJPlatformType.PyCharmCommunity
     version = "LATEST-EAP-SNAPSHOT"
-
+    
     prepareSandboxTask(prepareSandboxConfig)
 }
 
 @Suppress("unused") val runIdeIntellijIdeaC by intellijPlatformTesting.runIde.registering {
     type = IntelliJPlatformType.IntellijIdeaCommunity
-
+    
     prepareSandboxTask(prepareSandboxConfig)
 }

intellij-client/gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = dev.robotcode
 pluginName = RobotCode - Robot Framework Support
 pluginRepositoryUrl = https://github.com/robotcodedev/robotcode4ij
 # SemVer format -> https://semver.org
-pluginVersion = 1.1.0
+pluginVersion = 1.2.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 251
@@ -17,7 +17,7 @@ platformVersion = 2025.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
-#platformPlugins = com.redhat.devtools.lsp4ij:0.13.0-20250501-072621@nightly
+#platformPlugins = com.redhat.devtools.lsp4ij:0.13.0-20250502-121924@nightly
 platformPlugins = com.redhat.devtools.lsp4ij:0.12.0
 
 

intellij-client/gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 # libraries
 annotations = "26.0.2"
-kotlinxSerialization = "1.8.1"
+kotlinxSerialization = "1.7.3"
 junit = "4.13.2"
 lsp4j = "0.21.1"
 
 # plugins
 changelog = "2.2.1"
 intelliJPlatForm = "2.5.0"
-kotlin = "2.1.0"
+kotlin = "2.1.10"
 kover = "0.9.1"
 
 [libraries.lsp4j]

intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeHelpers.kt

@@ -22,7 +22,7 @@ class RobotCodeHelpers {
         val toolPath: Path = bundledPath.resolve("tool")
         val robotCodePath: Path = toolPath.resolve("robotcode")
         val checkRobotVersion: Path = toolPath.resolve("utils").resolve("check_robot_version.py")
-
+        
         val PYTHON_AND_ROBOT_OK_KEY = Key.create<Boolean?>("ROBOTCODE_PYTHON_AND_ROBOT_OK")
     }
 }
@@ -38,28 +38,28 @@ fun Project.checkPythonAndRobotVersion(reset: Boolean = false): Boolean {
     if (!reset && this.getUserData(RobotCodeHelpers.PYTHON_AND_ROBOT_OK_KEY) == true) {
         return true
     }
-
+    
     val result = ApplicationManager.getApplication().executeOnPooledThread<Boolean> {
-
+        
         val pythonInterpreter = this.robotPythonSdk?.homePath
-
+        
         if (pythonInterpreter == null) {
             thisLogger().info("No Python Interpreter defined for project '${this.name}'")
             return@executeOnPooledThread false
         }
-
+        
         if (!Path(pythonInterpreter).exists()) {
             thisLogger().warn("Python Interpreter $pythonInterpreter not exists")
             return@executeOnPooledThread false
         }
-
+        
         if (!Path(pythonInterpreter).isRegularFile()) {
             thisLogger().warn("Python Interpreter $pythonInterpreter is not a regular file")
             return@executeOnPooledThread false
         }
-
+        
         thisLogger().info("Use Python Interpreter $pythonInterpreter for project '${this.name}'")
-
+        
         val res = ExecUtil.execAndGetOutput(
             GeneralCommandLine(
                 pythonInterpreter, "-u", "-c", "import sys; print(sys.version_info[:2]>=(3,8))"
@@ -69,7 +69,7 @@ fun Project.checkPythonAndRobotVersion(reset: Boolean = false): Boolean {
             thisLogger().warn("Invalid python version")
             return@executeOnPooledThread false
         }
-
+        
         val res1 = ExecUtil.execAndGetOutput(
             GeneralCommandLine(pythonInterpreter, "-u", RobotCodeHelpers.checkRobotVersion.pathString),
             timeoutInMilliseconds = 5000
@@ -78,13 +78,13 @@ fun Project.checkPythonAndRobotVersion(reset: Boolean = false): Boolean {
             thisLogger().warn("Invalid Robot Framework version")
             return@executeOnPooledThread false
         }
-
+        
         return@executeOnPooledThread true
-
+        
     }.get()
-
+    
     this.putUserData(RobotCodeHelpers.PYTHON_AND_ROBOT_OK_KEY, result)
-
+    
     return result
 }
 
@@ -100,7 +100,7 @@ fun Project.buildRobotCodeCommandLine(
     if (!this.checkPythonAndRobotVersion()) {
         throw IllegalArgumentException("PythonSDK is not defined or robot version is not valid for project ${this.name}")
     }
-
+    
     val pythonInterpreter = this.robotPythonSdk?.homePath
     val commandLine = GeneralCommandLine(
         pythonInterpreter,
@@ -115,6 +115,6 @@ fun Project.buildRobotCodeCommandLine(
         *extraArgs,
         *args
     ).withWorkDirectory(this.basePath).withCharset(Charsets.UTF_8)
-
+    
     return commandLine
 }

intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/TextMateBundleHolder.kt

@@ -1,28 +1,29 @@
 package dev.robotcode.robotcode4ij
 
-import com.intellij.util.containers.Interner
 import org.jetbrains.plugins.textmate.TextMateService
+import org.jetbrains.plugins.textmate.language.TextMateConcurrentMapInterner
 import org.jetbrains.plugins.textmate.language.TextMateLanguageDescriptor
-import org.jetbrains.plugins.textmate.language.syntax.TextMateSyntaxTable
+import org.jetbrains.plugins.textmate.language.syntax.TextMateSyntaxTableBuilder
 
 
 object TextMateBundleHolder {
-    private val interner = Interner.createWeakInterner<CharSequence>()
+    private val interner = TextMateConcurrentMapInterner()
 
     val descriptor: TextMateLanguageDescriptor by lazy {
 
         val reader = TextMateService.getInstance().readBundle(RobotCodeHelpers.basePath)
             ?: throw IllegalStateException("Failed to read robotcode textmate bundle")
 
-        val syntaxTable = TextMateSyntaxTable()
+        val builder = TextMateSyntaxTableBuilder(interner)
 
         val grammarIterator = reader.readGrammars().iterator()
         while (grammarIterator.hasNext()) {
             val grammar = grammarIterator.next()
-            val rootScopeName = syntaxTable.loadSyntax(grammar.plist.value, interner) ?: continue
+            
+            val rootScopeName = builder.addSyntax(grammar.plist.value) ?: continue
             if (rootScopeName == "source.robotframework") {
-                val syntax = syntaxTable.getSyntax(rootScopeName)
-                return@lazy TextMateLanguageDescriptor(rootScopeName, syntax)
+                val syntax = builder.build()
+                return@lazy TextMateLanguageDescriptor(rootScopeName, syntax.getSyntax(rootScopeName))
             }
         }