Merge remote-tracking branch 'origin/endgame-202503.next' into develop

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts

@@ -3,4 +3,8 @@ dependencies {
     // runtimeOnly project(path: ":azure-intellij-plugin-lib", configuration: "instrumentedJar")
     implementation("com.microsoft.azure:azure-toolkit-ide-common-lib")
     implementation("com.microsoft.azure:azure-toolkit-ide-arm-lib")
+    intellijPlatform {
+        // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
+        bundledPlugin("com.intellij.modules.json")
+    }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/src/main/java/com/microsoft/azure/toolkit/intellij/arm/language/ARMTemplateCompletionProvider.java

@@ -5,16 +5,19 @@
 
 package com.microsoft.azure.toolkit.intellij.arm.language;
 
+import com.intellij.json.psi.JsonProperty;
 import com.google.common.collect.Sets;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionProvider;
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.json.psi.impl.JsonPropertyImpl;
+import com.intellij.json.psi.JsonValue;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
 
 import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import org.jetbrains.annotations.NotNull;
 
@@ -57,12 +60,10 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
     }
 
     private boolean isProperty(PsiElement position) {
-        PsiElement parentElement = position.getParent().getParent().getOriginalElement();
-        if (parentElement instanceof JsonPropertyImpl) {
-            if (((JsonPropertyImpl) parentElement).getValue() == null) {
-                return true;
-            }
-            return !position.getText().equals(((JsonPropertyImpl) parentElement).getValue().getText());
+        final PsiElement parentElement = position.getParent().getParent().getOriginalElement();
+        if (parentElement instanceof JsonProperty) {
+            final String value = Optional.ofNullable(((JsonProperty) parentElement).getValue()).map(JsonValue::getText).orElse(null);
+            return Objects.isNull(value) || !position.getText().equals(value);
         }
         return false;
     }
@@ -75,8 +76,10 @@ private Scope findScope(PsiElement position) {
             while (position.getParent().getParent().getParent() != null) {
                 position = position.getParent();
             }
-            String positionName = ((JsonPropertyImpl) position).getName();
-            return Scope.valueOf(positionName);
+
+//            String positionName = ((JsonProperty) position).namespace();
+//            return Scope.valueOf(positionName);
+            return Scope.root;
         } catch (Exception ignore) {
             return Scope.root;
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/actions/OpenKubernetesPluginAction.java

@@ -135,7 +135,7 @@ public CoroutineContext getContext() {
             public void resumeWith(@Nonnull Object o) {
                 if (o instanceof com.intellij.kubernetes.api.ContextsConfiguration configuration) {
                     final Context context = configuration.getContexts().entrySet().stream()
-                            .filter(c -> StringUtils.equals(c.getKey(), cluster.getName()))
+                            .filter(c -> StringUtils.equals(c.getKey().getName(), cluster.getName()))
                             .findFirst()
                             .map(Map.Entry::getValue)
                             .orElse(null);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts

@@ -6,4 +6,8 @@ dependencies {
     implementation("com.azure:azure-monitor-query:1.0.10")
     implementation("org.apache.commons:commons-csv:1.9.0")
     implementation("com.michaelbaranov:microba:0.4.4.3")
-}
+    intellijPlatform {
+        // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
+        bundledPlugin("com.intellij.modules.json")
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -1,12 +1,12 @@
 pluginVersion=3.95.0
-intellijDisplayVersion=2024.2
-intellij_version=IU-2024.2
-platformVersion=2024.2
+intellijDisplayVersion=2024.3
+intellij_version=IU-2024.3
+platformVersion=2024.3
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild=242
-pluginUntilBuild=242.*
+pluginSinceBuild=243
+pluginUntilBuild=243.*
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
-platformPlugins=org.intellij.scala:2024.2.5
+platformPlugins=org.intellij.scala:2024.3.8
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IU
 needPatchVersion=true

gradle.properties

@@ -1,9 +1,9 @@
 ARTIFACTS_DIR=artifacts
 INJECT_INTELLIJ_VERSION=true
-IJ_VERSION_MAJOR_BUILD=241.12662.62
-IJ_VERSION_MAJOR=233-EAP-SNAPSHOT
+IJ_VERSION_MAJOR_BUILD=243.21565.193
+IJ_VERSION_MAJOR=2024.3
 IJ_VERSION_MINOR=
-IJ_SCALA_VERSION_LATEST=2024.1.2
+IJ_SCALA_VERSION_LATEST=2024.3.8
 skipCheckstyle=true
 skipTest=false
 forceClean=false