Merge develop.next into develop for IntelliJ 2026.1

.azure-pipelines/build-pull-request.yml

@@ -109,6 +109,12 @@ extends:
                 inputs:
                   type: InlineScript
                   script: ./gradlew buildUtils -x buildToolkitsLib || exit -1
+              - task: JavaToolInstaller@0
+                displayName: Use Java 25 for IntelliJ
+                inputs:
+                  versionSpec: "25"
+                  jdkArchitectureOption: x64
+                  jdkSourceOption: PreInstalled
               - task: ms-devlabs.utilitytasks.task-Shellpp.Shellpp@0
                 displayName: Build IntelliJ
                 inputs:

.azure-pipelines/sign-for-stable-release.yml

@@ -90,23 +90,22 @@ extends:
                 clean: true
                 fetchTags: false
               - task: PowerShell@2
-                displayName: Install JDK 21
+                displayName: Install JDK 25
                 inputs:
                   targetType: inline
                   script: |
-                    # Download Adoptium/Temurin JDK 21.0.8
-                    Write-Host "Downloading Java 21.0.8..."
-                    $source = "https://download.oracle.com/java/21/archive/jdk-21.0.2_windows-x64_bin.zip"
-                    $destination = "$(build.sourcesdirectory)\jdk21_x64_windows.zip"
+                    Write-Host "Downloading Java 25.0.2..."
+                    $source = "https://download.oracle.com/java/25/archive/jdk-25.0.2_windows-x64_bin.zip"
+                    $destination = "$(build.sourcesdirectory)\jdk25_x64_windows.zip"
                     Invoke-WebRequest -Uri $source -OutFile $destination
               - task: JavaToolInstaller@0
-                displayName: 'Use Java 21'
+                displayName: 'Use Java 25'
                 inputs:
-                  versionSpec: 21
+                  versionSpec: 25
                   jdkArchitectureOption: x64
                   jdkSourceOption: LocalDirectory
-                  jdkFile: '$(build.sourcesdirectory)\jdk21_x64_windows.zip'
-                  jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk21'
+                  jdkFile: '$(build.sourcesdirectory)\jdk25_x64_windows.zip'
+                  jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk25'
               - task: UseNode@1
                 inputs:
                   version: "22.x"
@@ -131,7 +130,7 @@ extends:
                     mvn -v
                     # ./gradlew buildUtils || exit -1
                     mvn clean install -f ./Utils/pom.xml -T 1C "-Dcheckstyle.skip=true" "-Dmaven.test.skip=true" "-Dmaven.javadoc.skip=true"
-                    mvn clean -f ./Utils/pom.xml
+                    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
                     cd PluginsAndFeatures/azure-toolkit-for-intellij
                     ./gradlew clean buildPlugin -s "-Papplicationinsights.key=$(INTELLIJ_KEY)" "-PneedPatchVersion=false" "-Psources=false" "-Porg.gradle.configureondemand=false" "-Porg.gradle.daemon=false" "-Porg.gradle.unsafe.configuration-cache=false" "-Porg.gradle.caching=false"
                 env:

CHANGELOG.md

@@ -2,136 +2,20 @@
 
 All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
 
-- [Change Log](#change-log)
-  - [3.97.7](#3977)
-  - [3.97.6](#3976)
-  - [3.97.5](#3975)
-  - [3.97.4](#3974)
-  - [3.97.3](#3973)
-  - [3.97.2](#3972)
-  - [3.97.1](#3971)
-  - [3.97.0](#3970)
-  - [3.96.2](#3962)
-  - [3.96.1](#3961)
-  - [3.95.0](#3950)
-  - [3.94.0](#3940)
-  - [3.93.0](#3930)
-  - [3.92.0](#3920)
-  - [3.91.0](#3910)
-  - [3.90.0](#3900)
-  - [3.89.0](#3890)
-  - [3.88.0](#3880)
-  - [3.87.0](#3870)
-  - [3.86.0](#3860)
-  - [3.85.0](#3850)
-  - [3.84.0](#3840)
-  - [3.83.0](#3830)
-  - [3.82.0](#3820)
-  - [3.81.0](#3810)
-  - [3.80.0](#3800)
-  - [3.79.1](#3791)
-  - [3.79.0](#3790)
-  - [3.78.1](#3781)
-  - [3.78.0](#3780)
-  - [3.77.0](#3770)
-  - [3.76.0](#3760)
-  - [3.75.0](#3750)
-  - [3.74.0](#3740)
-  - [3.73.0](#3730)
-  - [3.72.0](#3720)
-  - [3.71.0](#3710)
-  - [3.70.0](#3700)
-  - [3.69.0](#3690)
-  - [3.68.1](#3681)
-  - [3.68.0](#3680)
-  - [3.67.0](#3670)
-  - [3.66.0](#3660)
-  - [3.65.0](#3650)
-  - [3.64.0](#3640)
-  - [3.63.0](#3630)
-  - [3.62.0](#3620)
-  - [3.61.1](#3611)
-  - [3.61.0](#3610)
-  - [3.60.2](#3602)
-  - [3.60.1](#3601)
-  - [3.60.0](#3600)
-  - [3.59.0](#3590)
-  - [3.58.0](#3580)
-  - [3.57.1](#3571)
-  - [3.57.0](#3570)
-  - [3.56.0](#3560)
-  - [3.55.0](#3550)
-  - [3.54.0](#3540)
-  - [3.53.0](#3530)
-  - [3.52.0](#3520)
-  - [3.51.0](#3510)
-  - [3.50.0](#3500)
-  - [3.49.0](#3490)
-  - [3.48.0](#3480)
-  - [3.47.0](#3470)
-  - [3.46.0](#3460)
-  - [3.45.1](#3451)
-  - [3.45.0](#3450)
-  - [3.44.0](#3440)
-  - [3.43.0](#3430)
-  - [3.42.0](#3420)
-  - [3.41.1](#3411)
-  - [3.41.0](#3410)
-  - [3.40.0](#3400)
-  - [3.39.0](#3390)
-  - [3.38.0](#3380)
-  - [3.37.0](#3370)
-  - [3.36.0](#3360)
-  - [3.35.0](#3350)
-  - [3.34.0](#3340)
-  - [3.33.1](#3331)
-  - [3.33.0](#3330)
-  - [3.32.0](#3320)
-  - [3.31.0](#3310)
-  - [3.30.0](#3300)
-  - [3.29.0](#3290)
-  - [3.28.0](#3280)
-  - [3.27.0](#3270)
-  - [3.26.0](#3260)
-  - [3.25.0](#3250)
-  - [3.24.0](#3240)
-  - [3.23.0](#3230)
-  - [3.22.0](#3220)
-  - [3.21.1](#3211)
-  - [3.21.0](#3210)
-  - [3.20.0](#3200)
-  - [3.19.0](#3190)
-  - [3.18.0](#3180)
-  - [3.17.0](#3170)
-  - [3.16.0](#3160)
-  - [3.15.0](#3150)
-  - [3.14.0](#3140)
-  - [3.13.0](#3130)
-  - [3.12.0](#3120)
-  - [3.11.0](#3110)
-  - [3.10.0](#3100)
-  - [3.9.0](#390)
-  - [3.8.0](#380)
-  - [3.7.0](#370)
-  - [3.6.0](#360)
-  - [3.5.0](#350)
-  - [3.4.0](#340)
-  - [3.3.0](#330)
-  - [3.2.0](#320)
-  - [3.1.0](#310)
-  - [3.0.12](#3012)
-  - [3.0.11](#3011)
-  - [3.0.10](#3010)
-  - [3.0.9](#309)
-  - [3.0.8](#308)
-  - [3.0.7](#307)
-  - [3.0.6](#306)
+## [Unreleased]
 
 ## 3.97.7
 ### Fixed
+- Migrate IntelliJ Platform integrations to APIs supported by IntelliJ IDEA 2026.2
+- Preserve proxy, run configuration, Project Explorer, Cosmos DB SSL, and refresh behavior during the migration
+- Preserve file chooser guidance, button accessibility metadata, and plugin lifecycle cleanup
+- Fix registry key conflict for Cosmos DB dbtools module
 - Fixed appmod plugin: Copilot modernization branding, CVE fix actions with custom agent support, and context menu hover issue.
 
 ## 3.97.6
+### Added
+- Added support for IntelliJ IDEA 2026.2.
+
 ### Fixed
 - Fixed several UI freeze issues caused by non-cancellable read actions in Azure task manager, Azure artifact resolution, Maven report generation, and background JDK version checks.
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/action/RunFunctionAction.java

@@ -71,7 +71,9 @@ private void runConfiguration(Module module) {
         }
         if (RunDialog.editConfiguration(project, settings, message("function.run.configuration.title"), DefaultRunExecutor.getRunExecutorInstance())) {
             final List<BeforeRunTask> tasks = new ArrayList<>(manager.getBeforeRunTasks(settings.getConfiguration()));
-            manager.addConfiguration(settings, false, tasks, false);
+            settings.storeInLocalWorkspace();
+            manager.setBeforeRunTasks(settings.getConfiguration(), tasks);
+            manager.addConfiguration(settings);
             manager.setSelectedConfiguration(settings);
             ProgramRunnerUtil.executeConfiguration(project, settings, DefaultRunExecutor.getRunExecutorInstance());
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/core/IntellijGradleFunctionProject.java

@@ -6,7 +6,7 @@
 
 import com.intellij.openapi.externalSystem.model.project.ExternalProjectPojo;
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId;
-import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListenerAdapter;
+import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListener;
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType;
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
 import com.intellij.openapi.module.Module;
@@ -92,7 +92,8 @@ public void packageJar() {
         final GradleExecutionSettings settings = manager.getExecutionSettingsProvider().fun(Pair.create(workspace, externalProject.getProjectDir().toString()));
         final IAzureMessager messager = AzureMessager.getMessager();
         gradleTaskManager.executeTasks(externalSystemTaskId, List.of("jar"),
-            externalProject.getProjectDir().toString(), settings, null, new ExternalSystemTaskNotificationListenerAdapter() {
+            externalProject.getProjectDir().toString(), settings, null, new ExternalSystemTaskNotificationListener() {
+                @Override
                 public void onTaskOutput(ExternalSystemTaskId id, String text, boolean stdOut) {
                     if (StringUtils.isNotBlank(text)) {
                         for (String line : text.split("\\r?\\n")) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/task/TriggerFunctionTask.java

@@ -1,9 +1,10 @@
 package com.microsoft.azure.toolkit.intellij.appservice.task;
 
+import com.intellij.openapi.actionSystem.ActionUiKind;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.EmptyAction;
+import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.PlatformUtils;
 import com.microsoft.azure.toolkit.ide.appservice.function.FunctionAppActionsContributor;
@@ -49,7 +50,7 @@ public void execute() throws Exception {
         final Action.Id<FunctionEntity> action = PlatformUtils.isIdeaUltimate() ?
             FunctionAppActionsContributor.TRIGGER_FUNCTION_WITH_HTTP_CLIENT : FunctionAppActionsContributor.TRIGGER_FUNCTION_IN_BROWSER;
         final DataContext context = dataId -> CommonDataKeys.PROJECT.getName().equals(dataId) ? project : null;
-        final AnActionEvent event = AnActionEvent.createFromAnAction(new EmptyAction(), null, "azure.guidance.summary", context);
+        final AnActionEvent event = AnActionEvent.createEvent(context, new Presentation(), "azure.guidance.summary", ActionUiKind.NONE, null);
         IntellijAzureActionManager.getInstance().getAction(action).handle(target, event);
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogManager.java

@@ -118,7 +118,7 @@ private void showAppServiceStreamingLog(Project project, String resourceId, ILog
 
     private StreamingLogsConsoleView getOrCreateConsoleView(Project project, String resourceId) {
         return consoleViewMap.compute(resourceId,
-            (id, view) -> (view == null || view.isDisposed()) ? new StreamingLogsConsoleView(project) : view);
+            (id, view) -> (view == null || view.isConsoleDisposed()) ? new StreamingLogsConsoleView(project) : view);
     }
 
     interface ILogStreaming {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/lib/legacy/function/FunctionCoreToolsCombobox.java

@@ -9,7 +9,9 @@
 import com.intellij.ide.DataManager;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.ActionPlaces;
+import com.intellij.openapi.actionSystem.ActionUiKind;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.keymap.KeymapUtil;
@@ -107,7 +109,7 @@ public FunctionCoreToolsCombobox(Project project, boolean includeSettings) {
 
     private void openAzureSettingsPanel() {
         final Action<Object> openSettingsAction = AzureActionManager.getInstance().getAction(ResourceCommonActionsContributor.OPEN_AZURE_SETTINGS);
-        final AnActionEvent event = AnActionEvent.createFromInputEvent(null, ActionPlaces.UNKNOWN, null, DataManager.getInstance().getDataContext(FunctionCoreToolsCombobox.this));
+        final AnActionEvent event = AnActionEvent.createEvent(DataManager.getInstance().getDataContext(FunctionCoreToolsCombobox.this), new Presentation(), ActionPlaces.UNKNOWN, ActionUiKind.NONE, null);
         final ActionInstance<Object> instance = openSettingsAction.instantiate(null, event);
         instance.perform(); // Open Azure Settings Panel sync
     }

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

@@ -3,8 +3,9 @@ dependencies {
     implementation(project(":azure-intellij-plugin-lib-java"))
     implementation("com.microsoft.azure:azure-toolkit-common-lib")
     implementation("com.microsoft.azure:azure-toolkit-ide-common-lib")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
-    testImplementation("org.mockito:mockito-core:3.9.0")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.mockito:mockito-core:5.23.0")
 
     intellijPlatform {
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/src/main/resources/META-INF/plugin.xml

@@ -18,6 +18,14 @@
     <![CDATA[
     <html>
         <h3>Azure</h3>
+        <h4>3.97.7</h4>
+        <ul>
+          <li>Migrate IntelliJ Platform integrations to APIs supported by IntelliJ IDEA 2026.2</li>
+          <li>Preserve proxy, run configuration, Project Explorer, Cosmos DB SSL, and refresh behavior during the migration</li>
+          <li>Preserve file chooser guidance, button accessibility metadata, and plugin lifecycle cleanup</li>
+          <li>Fix registry key conflict for Cosmos DB dbtools module</li>
+          <li>Fixed appmod plugin: Copilot modernization branding, CVE fix actions with custom agent support, and context menu hover issue.</li>
+        </ul>
         <p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
     </html>
     ]]>
@@ -27,6 +35,7 @@
   <idea-version since-build="222.2270.31" until-build="222.*"/>
   <resource-bundle>com.microsoft.intellij.ui.messages.messages</resource-bundle>
   <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.modules.jcef</depends>
   <depends>org.jetbrains.idea.maven</depends>
   <depends>com.intellij.gradle</depends>
   <xi:include href="/META-INF/azure-intellij-plugin-lib-java.xml" xpointer="xpointer(/idea-plugin/*)"/>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-bicep/src/main/java/com/microsoft/azure/toolkit/intellij/bicep/activities/BicepStartupActivity.java

@@ -23,19 +23,13 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
-import org.jetbrains.plugins.textmate.configuration.BundleConfigBean;
-import org.jetbrains.plugins.textmate.configuration.TextMateSettings;
-import org.jetbrains.plugins.textmate.configuration.TextMateSettings.TextMateSettingsState;
 import org.jetbrains.plugins.textmate.configuration.TextMateUserBundlesSettings;
 import org.wso2.lsp4intellij.IntellijLanguageClient;
 import org.wso2.lsp4intellij.client.languageserver.serverdefinition.ProcessBuilderServerDefinition;
 
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Objects;
 import java.util.Optional;
 
 @Slf4j
@@ -93,16 +87,10 @@ public static synchronized void registerBicepTextMateBundle() {
 
     @AzureOperation("boundary/bicep.unregister_textmate_bundles")
     public static synchronized void unregisterBicepTextMateBundle() {
-        final TextMateSettingsState state = TextMateSettings.getInstance().getState();
-        if (Objects.nonNull(state)) {
-            final Path bicepParamTextmatePath = Path.of(CommonConst.PLUGIN_PATH, "bicep", "textmate", "bicepparam");
-            final Collection<BundleConfigBean> bundles = state.getBundles();
-            if (bundles.stream().anyMatch(b -> "bicep".equals(b.getName()))) {
-                final ArrayList<BundleConfigBean> newBundles = new ArrayList<>(bundles);
-                newBundles.removeIf(bundle -> StringUtils.equalsAnyIgnoreCase(bundle.getName(), "bicep", "bicepparam"));
-                state.setBundles(newBundles);
-            }
-        }
+        final Path bicepTextmatePath = Path.of(CommonConst.PLUGIN_PATH, "bicep", "textmate", "bicep");
+        final Path bicepParamTextmatePath = Path.of(CommonConst.PLUGIN_PATH, "bicep", "textmate", "bicepparam");
+        TextMateUserBundlesSettings.getInstance().removeBundle(bicepTextmatePath.toString());
+        TextMateUserBundlesSettings.getInstance().removeBundle(bicepParamTextmatePath.toString());
     }
 
     @Override

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-bicep/src/main/java/org/wso2/lsp4intellij/client/DefaultLanguageClient.java

@@ -200,7 +200,7 @@ public CompletableFuture<MessageActionItem> showMessageRequest(ShowMessageReques
 
         } else {
 
-            final Notification notification = STICKY_NOTIFICATION_GROUP.createNotification(title, null, message, getNotificationType(msgType));
+            final Notification notification = STICKY_NOTIFICATION_GROUP.createNotification(title, message, getNotificationType(msgType));
             final CompletableFuture<Integer> integerCompletableFuture = new CompletableFuture<>();
             for (int i = 0, optionsSize = options.length; i < optionsSize; i++) {
                 final int finalI = i;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-bicep/src/main/java/org/wso2/lsp4intellij/listeners/LSPProjectManagerListener.java

@@ -19,7 +19,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManagerListener;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.wso2.lsp4intellij.IntellijLanguageClient;
 import org.wso2.lsp4intellij.client.languageserver.wrapper.LanguageServerWrapper;
 import org.wso2.lsp4intellij.utils.FileUtils;
@@ -30,10 +29,7 @@ public class LSPProjectManagerListener implements ProjectManagerListener {
 
     private static final Logger LOG = Logger.getInstance(LSPProjectManagerListener.class);
 
-    @Override
-    public void projectOpened(@Nullable final Project project) {
-        // Todo
-    }
+    // Removed deprecated projectOpened method - replaced with ProjectActivity if needed
 
     @Override
     public void projectClosing(@NotNull Project project) {