fix: activation command for IntelliJ plugin (#4028)

block · Jan 14, 2025 · 9f7dff6 · 9f7dff6
1 parent 0bf791e
commit 9f7dff6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/frontend/intellij/build.gradle.kts b/frontend/intellij/build.gradle.kts
@@ -32,7 +32,7 @@ tasks {
 
   patchPluginXml {
     sinceBuild.set("241")
-    untilBuild.set("*")
+    untilBuild.set("241.*")
   }
 
   signPlugin {

diff --git a/frontend/intellij/src/main/kotlin/xyz/block/ftl/intellij/FTLLspServerDescriptor.kt b/frontend/intellij/src/main/kotlin/xyz/block/ftl/intellij/FTLLspServerDescriptor.kt
@@ -17,16 +17,15 @@ import java.util.concurrent.CompletableFuture
 import java.util.regex.Pattern
 
 class FTLLspServerDescriptor(project: Project) : ProjectWideLspServerDescriptor(project, "FTL") {
-  override fun isSupportedFile(file: VirtualFile) = file.extension == "go"
+  override fun isSupportedFile(file: VirtualFile) = file.extension == "go" || file.extension == "kt" || file.extension == "java"
 
   override fun createLsp4jClient(handler: LspServerNotificationsHandler): CustomLsp4jClient {
     return CustomLsp4jClient(handler)
   }
 
   override fun createCommandLine(): GeneralCommandLine {
     val settings = AppSettings.getInstance().state
-    val generalCommandLine =
-      GeneralCommandLine(listOf(settings.lspServerPath))
+    val generalCommandLine = GeneralCommandLine(listOf(settings.lspServerPath, "lsp"))
     generalCommandLine.setWorkDirectory(project.basePath)
     displayMessageInToolWindow("LSP Server Command: " + generalCommandLine.commandLineString)
     displayMessageInToolWindow("Working Directory: " + generalCommandLine.workDirectory)

diff --git a/python-runtime/ftl/pyproject.toml b/python-runtime/ftl/pyproject.toml
@@ -21,7 +21,6 @@ select = [
     "ANN001",  # missing type annotation for function argument
     "ANN002",  # missing type annotation for *args
     "ANN003",  # missing type annotation for **kwargs
-    "ANN102",  # missing type annotation for cls in classmethod
     "ANN201",  # missing return type annotation for public function
     "ANN202",  # missing return type annotation for private function
     "ANN204",  # missing return type annotation for special method