#424: re-adding last relevant change (#561)

devonfw · Aug 26, 2024 · 19b4d60 · 19b4d60
1 parent 44d5f02
commit 19b4d60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java
@@ -930,21 +930,30 @@ public List<CompletionCandidate> complete(CliArguments arguments, boolean includ
       Commandlet firstCandidate = this.commandletManager.getCommandletByFirstKeyword(keyword);
       boolean matches = false;
       if (firstCandidate != null) {
-        matches = apply(arguments.copy(), firstCandidate, collector);
+        matches = completeCommandlet(arguments, firstCandidate, collector);
       } else if (current.isCombinedShortOption()) {
         collector.add(keyword, null, null, null);
       }
       if (!matches) {
         for (Commandlet cmd : this.commandletManager.getCommandlets()) {
           if (cmd != firstCandidate) {
-            apply(arguments.copy(), cmd, collector);
+            completeCommandlet(arguments, cmd, collector);
           }
         }
       }
     }
     return collector.getSortedCandidates();
   }
 
+  private boolean completeCommandlet(CliArguments arguments, Commandlet cmd, CompletionCandidateCollector collector) {
+    if (cmd.isIdeHomeRequired() && (this.ideHome == null)) {
+      return false;
+    } else {
+      return apply(arguments.copy(), cmd, collector);
+    }
+  }
+
+
   /**
    * @param arguments the {@link CliArguments} to apply. Will be {@link CliArguments#next() consumed} as they are matched. Consider passing a
    *     {@link CliArguments#copy() copy} as needed.

diff --git a/cli/src/test/java/com/devonfw/tools/ide/completion/IdeCompleterTest.java b/cli/src/test/java/com/devonfw/tools/ide/completion/IdeCompleterTest.java
@@ -1,7 +1,5 @@
 package com.devonfw.tools.ide.completion;
 
-import java.nio.file.Path;
-
 import org.junit.jupiter.api.Test;
 
 import com.devonfw.tools.ide.cli.AutocompletionReaderTestSupport;
@@ -128,6 +126,6 @@ private IdeCompleter newCompleter() {
 
   private IdeTestContext newTestContext() {
 
-    return new IdeTestContext(Path.of(""));
+    return newContext(PROJECT_BASIC, null, false);
   }
 }