#1676 import extra sdks automatically into ide

CHANGELOG.adoc

@@ -6,6 +6,7 @@ This file documents all notable changes to https://github.com/devonfw/IDEasy[IDE
 
 Release with new features and bugfixes:
 
+* https://github.com/devonfw/IDEasy/issues/1676[#1676]: Import extra sdks automatically into ide
 * https://github.com/devonfw/IDEasy/issues/2140[#2140]: just install fails since already installed
 * https://github.com/devonfw/IDEasy/issues/2137[#2137]: fix-vpn-tls-problem does not detect TLS certificate issues behind HTTP redirects
 * https://github.com/devonfw/IDEasy/issues/1041[#1041]: native image has globbing active
@@ -104,8 +105,6 @@ Release with new features and bugfixes:
 * https://github.com/devonfw/IDEasy/issues/1904[#1904]: Add Inso CLI to IDEasy commandlets
 * https://github.com/devonfw/IDEasy/issues/1952[#1952]: Ability for platform specific dependencies
 * https://github.com/devonfw/IDEasy/issues/1950[#1950]: Fix exit autocompletion
-* https://github.com/devonfw/IDEasy/issues/1936[#1936]: Improve localization of GUI
-
 * https://github.com/devonfw/IDEasy/issues/1958[#1958]: Fix git pull on settings with local branch without remote
 
 The full list of changes for this release can be found in https://github.com/devonfw/IDEasy/milestone/44?closed=1[milestone 2026.05.001].

cli/src/main/java/com/devonfw/tools/ide/commandlet/AbstractUpdateCommandlet.java

@@ -33,6 +33,7 @@
 import com.devonfw.tools.ide.tool.extra.ExtraToolInstallation;
 import com.devonfw.tools.ide.tool.extra.ExtraTools;
 import com.devonfw.tools.ide.tool.extra.ExtraToolsMapper;
+import com.devonfw.tools.ide.tool.ide.IdeToolCommandlet;
 import com.devonfw.tools.ide.variable.IdeVariables;
 import com.devonfw.tools.ide.version.VersionIdentifier;
 
@@ -349,6 +350,18 @@ private void doUpdateSoftwareStep(Step step) {
         List<ExtraToolInstallation> installations = extraTools.getExtraInstallations(tool);
         this.context.newStep("Install extra version(s) of " + tool).run(() -> installExtraToolInstallations(tool, installations));
       }
+
+      // After installing extra tools, synchronize them into all IDE workspaces
+      List<String> ides = IdeVariables.CREATE_START_SCRIPTS.get(this.context);
+      if (ides != null) {
+        for (String ideName : ides) {
+          ToolCommandlet ideCommandlet = commandletManager.getToolCommandlet(ideName);
+          if (ideCommandlet instanceof IdeToolCommandlet) {
+            LOG.info("Synchronizing extra tools into {} workspace", ideName);
+            ((IdeToolCommandlet) ideCommandlet).synchronizeExtraTools();
+          }
+        }
+      }
     }
   }
 

cli/src/main/java/com/devonfw/tools/ide/tool/extra/ExtraTools.java

@@ -51,6 +51,12 @@ public List<ExtraToolInstallation> getExtraInstallations(String tool) {
    */
   public void addExtraInstallations(String tool, ExtraToolInstallation extraInstallation) {
 
+    if ((tool != null) && (extraInstallation != null) && tool.equalsIgnoreCase(extraInstallation.name())) {
+      throw new IllegalArgumentException(
+          "Invalid extra installation name '" + extraInstallation.name() + "' for tool '" + tool
+              + "': the extra installation name must not be the same as the tool name.");
+    }
+
     List<ExtraToolInstallation> list = this.tool2installationsMap.computeIfAbsent(tool, k -> new ArrayList<>());
     list.add(extraInstallation);
   }

cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java

@@ -2,22 +2,35 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
 
 import com.devonfw.tools.ide.common.Tag;
 import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.environment.AbstractEnvironmentVariables;
+import com.devonfw.tools.ide.environment.ExtensibleEnvironmentVariables;
 import com.devonfw.tools.ide.io.FileAccess;
+import com.devonfw.tools.ide.log.IdeLogLevel;
+import com.devonfw.tools.ide.merge.xml.XmlMergeDocument;
+import com.devonfw.tools.ide.merge.xml.XmlMerger;
 import com.devonfw.tools.ide.process.ProcessMode;
 import com.devonfw.tools.ide.process.ProcessResult;
 import com.devonfw.tools.ide.step.Step;
 import com.devonfw.tools.ide.tool.ToolCommandlet;
 import com.devonfw.tools.ide.tool.ToolInstallRequest;
 import com.devonfw.tools.ide.tool.ToolInstallation;
 import com.devonfw.tools.ide.tool.eclipse.Eclipse;
+import com.devonfw.tools.ide.tool.extra.ExtraToolInstallation;
+import com.devonfw.tools.ide.tool.extra.ExtraTools;
+import com.devonfw.tools.ide.tool.extra.ExtraToolsMapper;
 import com.devonfw.tools.ide.tool.intellij.Intellij;
 import com.devonfw.tools.ide.tool.plugin.PluginBasedCommandlet;
 import com.devonfw.tools.ide.tool.vscode.Vscode;
@@ -29,6 +42,8 @@ public abstract class IdeToolCommandlet extends PluginBasedCommandlet {
 
   private static final Logger LOG = LoggerFactory.getLogger(IdeToolCommandlet.class);
 
+  private final Map<String, Set<Path>> extraSdkMap;
+
   /**
    * The constructor.
    *
@@ -40,6 +55,7 @@ public IdeToolCommandlet(IdeContext context, String tool, Set<Tag> tags) {
 
     super(context, tool, tags);
     assert (hasIde(tags));
+    this.extraSdkMap = new HashMap<>();
   }
 
   private boolean hasIde(Set<Tag> tags) {
@@ -66,10 +82,17 @@ public ProcessResult runTool(List<String> args) {
   @Override
   public ToolInstallation install(ToolInstallRequest request) {
 
-    configureWorkspace();
     return super.install(request);
   }
 
+  /**
+   * Synchronizes extra tool installations into the IDE workspace.
+   * This is called after extra tools are installed during ide create/update and before launching the IDE.
+   */
+  public void synchronizeExtraTools() {
+    configureWorkspace();
+  }
+
   /**
    * Configure (initialize or update) the workspace for this IDE using the templates from the settings.
    */
@@ -91,6 +114,9 @@ private void doMergeWorkspaceStep(Step step, Path workspaceFolder) {
     errors = mergeWorkspace(this.context.getUserHomeIde(), workspaceFolder, errors);
     errors = mergeWorkspace(this.context.getSettingsPath(), workspaceFolder, errors);
     errors = mergeWorkspace(this.context.getConfPath(), workspaceFolder, errors);
+
+    synchronizeExtraToolInstallations();
+
     if (errors == 0) {
       step.success();
     } else {
@@ -131,4 +157,86 @@ public void importRepository(Path repositoryPath) {
 
     throw new UnsupportedOperationException("Repository import is not yet implemented for IDE " + this.tool);
   }
+
+  /**
+   * Registers support for synchronizing an extra SDK/template for this IDE.
+   *
+   * <p>
+   * The registered template path must be relative to the IDE workspace root. During workspace synchronization, the generic extra-SDK handling in
+   * {@link #synchronizeExtraToolInstallations()} uses this mapping to locate the corresponding template file in the settings repository and merge it into the
+   * current workspace.
+   * </p>
+   *
+   * @param sdk the name of the extra SDK/tool as configured in {@code ide-extra-tools.json}.
+   * @param relativeTemplatePath the workspace-relative path of the IDE-specific template file to merge.
+   */
+  protected void registerExtraSdkTemplate(String sdk, Path relativeTemplatePath) {
+    Set<Path> templatePaths = this.extraSdkMap.computeIfAbsent(sdk, _ -> new HashSet<>());
+    templatePaths.add(relativeTemplatePath);
+  }
+
+  /**
+   * Synchronizes extra IDEasy tool installations into the current IDE workspace configuration if supported.
+   *
+   * <p>
+   * By default, nothing will happen. Your IDE commandlet has to register one or more according templates in its constructor.
+   * </p>
+   */
+  protected void synchronizeExtraToolInstallations() {
+    ExtraTools extraTools = ExtraToolsMapper.get().loadJsonFromFolder(this.context.getSettingsPath());
+    if (extraTools == null) {
+      return;
+    }
+    for (String sdk : extraTools.getSortedToolNames()) {
+      Set<Path> templatePaths = this.extraSdkMap.get(sdk);
+      if ((templatePaths == null) || templatePaths.isEmpty()) {
+        LOG.debug("Skipping import of extra tool {} into {} because not configured or supported.", sdk, this.tool);
+        continue;
+      }
+      List<ExtraToolInstallation> extraInstallations = extraTools.getExtraInstallations(sdk);
+      synchronizeExtraToolInstallation(sdk, templatePaths, extraInstallations);
+    }
+  }
+
+  private void synchronizeExtraToolInstallation(String sdk, Set<Path> templatePaths, List<ExtraToolInstallation> extraInstallations) {
+    for (Path templatePath : templatePaths) {
+      Path workspaceFile = this.context.getWorkspacePath().resolve(templatePath);
+      Path templateFile = this.context.getSettingsPath().resolve(this.tool).resolve(IdeContext.FOLDER_WORKSPACE)
+          .resolve("repository") // TODO: create and use constant IdeContext.FOLDER_REPOSITORY - this string literal exists at least 16 times in our code base
+          .resolve(templatePath);
+      if (Files.exists(templateFile)) {
+        for (ExtraToolInstallation extraInstallation : extraInstallations) {
+          synchronizeExtraToolInstallation(sdk, templateFile, workspaceFile, extraInstallation);
+        }
+      } else {
+        LOG.warn("You are missing a template file at {}.", templatePath);
+        IdeLogLevel.INTERACTION.log(LOG, "Please ask the IDEasy admin in your project to merge your settings with upstream.");
+      }
+    }
+  }
+
+  private void synchronizeExtraToolInstallation(String sdk, Path templateFile, Path workspaceFile, ExtraToolInstallation installation) {
+    String name = installation.name();
+    Path extraToolHome = this.context.getSoftwareExtraPath().resolve(sdk).resolve(name);
+    if (!Files.isDirectory(extraToolHome)) {
+      LOG.warn("Skipping extra tool installation import to {} because it is missing at {}", this.tool, extraToolHome);
+      IdeLogLevel.INTERACTION.log(LOG, "Please run the following command to fix:\nide update");
+      return;
+    }
+    ExtensibleEnvironmentVariables environmentVariables = new ExtensibleEnvironmentVariables(
+        (AbstractEnvironmentVariables) this.context.getVariables().getParent(), this.context);
+    String variablePrefix = "EXTRA_" + sdk.toUpperCase(Locale.ROOT);
+    environmentVariables.setValue(variablePrefix + "_NAME", name);
+    environmentVariables.setValue(variablePrefix + "_HOME", extraToolHome.toString().replace('\\', '/'));
+    environmentVariables.setValue(variablePrefix + "_VERSION", installation.version().toString());
+    if (installation.edition() != null) {
+      environmentVariables.setValue(variablePrefix + "_EDITION", installation.edition());
+    }
+
+    XmlMerger xmlMerger = new XmlMerger(this.context);
+    XmlMergeDocument workspaceDocument = xmlMerger.load(workspaceFile);
+    XmlMergeDocument templateDocument = xmlMerger.loadAndResolve(templateFile, environmentVariables);
+    Document mergedDocument = xmlMerger.merge(templateDocument, workspaceDocument, false);
+    xmlMerger.save(mergedDocument, workspaceFile);
+  }
 }

cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeaBasedIdeToolCommandlet.java

@@ -84,6 +84,7 @@ protected String getIdeProductPrefix() {
   public ProcessResult runTool(ProcessContext pc, ProcessMode processMode, List<String> args) {
     if (!args.contains("installPlugins")) {
       args.add(this.context.getWorkspacePath().toString());
+      configureWorkspace();
     }
 
     String variableName = getName().toUpperCase(Locale.ROOT).replace("-", "_") + VM_ARGS_ENV_SUFFIX;

cli/src/main/java/com/devonfw/tools/ide/tool/intellij/Intellij.java

@@ -61,6 +61,7 @@ public class Intellij extends IdeaBasedIdeToolCommandlet {
   public Intellij(IdeContext context) {
 
     super(context, "intellij", Set.of(Tag.INTELLIJ));
+    registerExtraSdkTemplate("java", Path.of(".intellij/config/options/jdk.table.xml"));
   }
 
   @Override
@@ -97,23 +98,24 @@ protected ToolEditionAndVersion adjustRequestedEdition(ToolEditionAndVersion req
     ToolEdition edition = requested.getEdition();
     // Check if edition is set as "ultimate"
     if ("ultimate".equals(edition.edition())) {
-      
+
       VersionIdentifier version;
       if (requested.getVersion() != null) {
         version = VersionIdentifier.of(requested.getVersion().toString());
       } else {
         version = getConfiguredVersion();
       }
       // Check whether set version warrants switching editions
-      if ((version.isGreater(INTELLIJ_LAST_SEPARATE_VERSION)) || // Specified version is > 2025.2.6.1 **OR** no specified version but configured version is > 2025.2.6.1
-        (VersionIdentifier.LATEST.equals(version)) || // No version specified and no configured version
-        (VersionIdentifier.LATEST_UNSTABLE.equals(version))) { // No version specified and no configured version
+      if ((version.isGreater(INTELLIJ_LAST_SEPARATE_VERSION)) ||
+          // Specified version is > 2025.2.6.1 **OR** no specified version but configured version is > 2025.2.6.1
+          (VersionIdentifier.LATEST.equals(version)) || // No version specified and no configured version
+          (VersionIdentifier.LATEST_UNSTABLE.equals(version))) { // No version specified and no configured version
         // Switching to IntelliJ Standard edition
         LOG.warn("""
-                 Notice: You have configured IDEasy to use the IntelliJ Ultimate Edition. Since version 2025.3, the Ultimate and Community editions of IntelliJ have been unified into a single edition.
-                 Since you are attempting to install a version of IntelliJ that is 2025.3 or newer, we are automatically switching your edition to the unified edition to ensure compatibility.
-                 To specifically install the last true ultimate version of IntelliJ, please run "ide install intellij 2025.2.6.1".
-                 Otherwise, we recommend permanently switching to the unified edition by running "ide set-edition intellij intellij".""");
+            Notice: You have configured IDEasy to use the IntelliJ Ultimate Edition. Since version 2025.3, the Ultimate and Community editions of IntelliJ have been unified into a single edition.
+            Since you are attempting to install a version of IntelliJ that is 2025.3 or newer, we are automatically switching your edition to the unified edition to ensure compatibility.
+            To specifically install the last true ultimate version of IntelliJ, please run "ide install intellij 2025.2.6.1".
+            Otherwise, we recommend permanently switching to the unified edition by running "ide set-edition intellij intellij".""");
         edition = new ToolEdition(this.tool, "intellij");
         requested.replaceEdition(edition);
       }

cli/src/main/resources/META-INF/native-image/com.devonfw.tools.IDEasy/ide-cli/reflect-config.json

@@ -58,5 +58,19 @@
     "allPublicConstructors": true,
     "allDeclaredFields": false,
     "allDeclaredMethods": false
+  },
+  {
+    "name": "com.devonfw.tools.ide.tool.ide.IdeToolCommandlet",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true
+  },
+  {
+    "name": "com.devonfw.tools.ide.tool.intellij.Intellij",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true
   }
 ]