Merge branch 'JetBrains:master' into master

Author: magidc

.devcontainer/devcontainer.json

@@ -6,6 +6,8 @@ on:
 
 jobs:
   claude-review:
+    # Run only for PRs originating from the same repository (not from forks)
+    if: ${{ github.event.pull_request.head.repo.full_name == 'JetBrains/ideavim' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read

.github/workflows/claude-code-review.yml

@@ -2,8 +2,8 @@ name: Codebase Maintenance with Claude
 
 on:
   schedule:
-    # Run every day at 6 AM UTC
-    - cron: '0 6 * * *'
+    # Run weekly at 6 AM UTC
+    - cron: '0 6 * * 2'
   workflow_dispatch:  # Allow manual trigger
 
 jobs:

.github/workflows/codebaseMaintenance.yml

@@ -642,6 +642,10 @@ Contributors:
   [![icon][github]](https://github.com/azjf)
    
   azjf
+* [![icon][mail]](mailto:41898282+claude[bot]@users.noreply.github.com)
+  [![icon][github]](https://github.com/apps/github-actions)
+   
+  github-actions[bot]
 
 Previous contributors:
 

.github/workflows/junie.yml

@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.3.0")
+  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.3.2")
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:$kotlinxSerializationVersion") {
     // kotlin stdlib is provided by IJ, so there is no need to include it into the distribution
     exclude("org.jetbrains.kotlin", "kotlin-stdlib")

AUTHORS.md

@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-  testImplementation(platform("org.junit:junit-bom:6.0.0"))
+  testImplementation(platform("org.junit:junit-bom:6.0.1"))
   testImplementation("org.junit.jupiter:junit-jupiter")
   compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
   compileOnly("org.jetbrains:annotations:26.0.2-1")

annotation-processors/build.gradle.kts

@@ -26,11 +26,11 @@ buildscript {
     classpath("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.4.0.202509020913-r")
     classpath("org.kohsuke:github-api:1.305")
 
-    classpath("io.ktor:ktor-client-core:3.3.1")
-    classpath("io.ktor:ktor-client-cio:3.3.1")
-    classpath("io.ktor:ktor-client-auth:3.3.1")
-    classpath("io.ktor:ktor-client-content-negotiation:3.3.1")
-    classpath("io.ktor:ktor-serialization-kotlinx-json:3.3.1")
+    classpath("io.ktor:ktor-client-core:3.3.2")
+    classpath("io.ktor:ktor-client-cio:3.3.2")
+    classpath("io.ktor:ktor-client-auth:3.3.2")
+    classpath("io.ktor:ktor-client-content-negotiation:3.3.2")
+    classpath("io.ktor:ktor-serialization-kotlinx-json:3.3.2")
 
     // This comes from the changelog plugin
 //        classpath("org.jetbrains:markdown:0.3.1")
@@ -46,7 +46,7 @@ plugins {
   // NOTE: Unignore "test block comment falls back to line comment when not available" test
   //   After changing this version. It supposed to work on the next version of the gradle plugin
   //   Or go report to the devs that this test still fails.
-  id("org.jetbrains.intellij.platform") version "2.10.2"
+  id("org.jetbrains.intellij.platform") version "2.10.4"
 
   id("org.jetbrains.changelog") version "2.4.0"
   id("org.jetbrains.kotlinx.kover") version "0.6.1"
@@ -129,7 +129,7 @@ dependencies {
 
   // --------- Test dependencies ----------
 
-  testApi("com.squareup.okhttp3:okhttp:5.0.0")
+  testApi("com.squareup.okhttp3:okhttp:5.3.0")
 
   // https://mvnrepository.com/artifact/com.ensarsarajcic.neovim.java/neovim-api
   testImplementation("com.ensarsarajcic.neovim.java:neovim-api:0.2.3")
@@ -154,7 +154,7 @@ dependencies {
   // Temp workaround suggested in https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#junit5-test-framework-refers-to-junit4
   // Can be removed when IJPL-159134 is fixed
 //  testRuntimeOnly("junit:junit:4.13.2")
-  testImplementation("org.junit.vintage:junit-vintage-engine:6.0.0")
+  testImplementation("org.junit.vintage:junit-vintage-engine:6.0.1")
 //  testFixturesImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 }
 

api/build.gradle.kts

@@ -23,11 +23,11 @@ repositories {
 dependencies {
   compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.2.21")
 
-  implementation("io.ktor:ktor-client-core:3.3.1")
-  implementation("io.ktor:ktor-client-cio:3.3.1")
-  implementation("io.ktor:ktor-client-content-negotiation:3.3.1")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:3.3.1")
-  implementation("io.ktor:ktor-client-auth:3.3.1")
+  implementation("io.ktor:ktor-client-core:3.3.2")
+  implementation("io.ktor:ktor-client-cio:3.3.2")
+  implementation("io.ktor:ktor-client-content-negotiation:3.3.2")
+  implementation("io.ktor:ktor-serialization-kotlinx-json:3.3.2")
+  implementation("io.ktor:ktor-client-auth:3.3.2")
   implementation("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")
 
   // This is needed for jgit to connect to ssh

build.gradle.kts

@@ -17,6 +17,7 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.statistic.PluginState.Util.enabledExtensions
 import com.maddyhome.idea.vim.statistic.PluginState.Util.extensionNames
 import com.maddyhome.idea.vim.ui.JoinEap
+import java.util.concurrent.ConcurrentHashMap
 
 internal class PluginState : ApplicationUsagesCollector() {
 
@@ -48,7 +49,7 @@ internal class PluginState : ApplicationUsagesCollector() {
       "textobj-indent",
       "mini-ai"
     )
-    internal val enabledExtensions = HashSet<String>()
+    internal val enabledExtensions = ConcurrentHashMap.newKeySet<String>()
   }
 }