Fix ide -v and --version handling (#2049)

Co-authored-by: Jörg Hohwiller <hohwille@users.noreply.github.com>

Author: tineff96

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

@@ -66,6 +66,7 @@
 import com.devonfw.tools.ide.process.ProcessContext;
 import com.devonfw.tools.ide.process.ProcessContextImpl;
 import com.devonfw.tools.ide.process.ProcessResult;
+import com.devonfw.tools.ide.property.KeywordProperty;
 import com.devonfw.tools.ide.property.Property;
 import com.devonfw.tools.ide.step.Step;
 import com.devonfw.tools.ide.step.StepImpl;
@@ -1628,7 +1629,8 @@ public ValidationResult apply(CliArguments arguments, Commandlet cmd) {
           currentProperty = option;
         } else {
           boolean allowDashedValue = (property != null && property.isValue() && property.isMultiValued());
-          if (!allowDashedValue && currentArgument.isOption()) {
+          boolean allowKeywordOption = (currentProperty instanceof KeywordProperty keywordProperty) && keywordProperty.matches(currentArgument.getKey());
+          if (!allowDashedValue && !allowKeywordOption && currentArgument.isOption()) {
             ValidationState state = new ValidationState(null);
             state.addInvalidOption(currentArgument.getKey());
             state.addErrorMessage("Invalid option \"" + currentArgument.getKey() + "\"");

cli/src/main/java/com/devonfw/tools/ide/property/KeywordProperty.java

@@ -67,7 +67,9 @@ public boolean matches(String nameOrAlias) {
   public boolean apply(CliArguments args, IdeContext context, Commandlet commandlet, CompletionCandidateCollector collector) {
 
     String normalizedName = this.name;
-    if (args.current().isOption()) {
+    if (args.current().getKey().equals(this.alias)) {
+      normalizedName = this.alias;
+    } else if (args.current().isOption()) {
       normalizedName = this.optionName;
     }
     return apply(normalizedName, args, context, commandlet, collector);

cli/src/test/java/com/devonfw/tools/ide/cli/IdeasyTest.java

@@ -9,6 +9,7 @@
 
 import com.devonfw.tools.ide.context.AbstractIdeContextTest;
 import com.devonfw.tools.ide.context.IdeTestContext;
+import com.devonfw.tools.ide.version.IdeVersion;
 
 /**
  * Test of {@link Ideasy}.
@@ -33,6 +34,44 @@ void testEnvOutsideProjectDoesNotLogCliExitException() {
     assertThat(context).log().hasNoEntryWithException();
   }
 
+  /**
+   * Test of {@code ide --version}.
+   */
+  @Test
+  void testVersionLongOption() {
+
+    // arrange
+    IdeTestContext context = newContext(Path.of("/"));
+    Ideasy ideasy = new Ideasy(context);
+
+    // act
+    int exitCode = ideasy.run("--version");
+
+    // assert
+    assertThat(exitCode).isEqualTo(0);
+    assertThat(context).logAtProcessable().hasMessage(IdeVersion.getVersionString());
+    assertThat(context).logAtError().hasNoMessageContaining("Unknown command");
+  }
+
+  /**
+   * Test of {@code ide -v}.
+   */
+  @Test
+  void testVersionShortOption() {
+
+    // arrange
+    IdeTestContext context = newContext(Path.of("/"));
+    Ideasy ideasy = new Ideasy(context);
+
+    // act
+    int exitCode = ideasy.run("-v");
+
+    // assert
+    assertThat(exitCode).isEqualTo(0);
+    assertThat(context).logAtProcessable().hasMessage(IdeVersion.getVersionString());
+    assertThat(context).logAtError().hasNoMessageContaining("Unknown command");
+  }
+
   /**
    * Test that running 'ide' without arguments does not trigger any tool installation.
    * Verifies fix for issue #1667.