From db541de9b9212c08d9a5f04c8fcdfe86fead8d07 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 28 Nov 2023 15:17:15 +0100 Subject: [PATCH] [updater] consistent use of "keep" and "ignore" options (IDEA-336163) The former is used when other options are available for a file (like "replace" or "delete"). GitOrigin-RevId: 4674747a06adb81f3ccd81392a0a91e66757739c --- updater/src/com/intellij/updater/PatchAction.java | 2 +- .../com/intellij/updater/PatchApplyingRevertingTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/updater/src/com/intellij/updater/PatchAction.java b/updater/src/com/intellij/updater/PatchAction.java index 041aa77fb0c8..6c95f2c3613c 100644 --- a/updater/src/com/intellij/updater/PatchAction.java +++ b/updater/src/com/intellij/updater/PatchAction.java @@ -209,7 +209,7 @@ public abstract class PatchAction { } else { if (isCritical()) { - options = new ValidationResult.Option[]{ValidationResult.Option.REPLACE, ValidationResult.Option.IGNORE}; + options = new ValidationResult.Option[]{ValidationResult.Option.REPLACE, ValidationResult.Option.KEEP}; } else { options = new ValidationResult.Option[]{ValidationResult.Option.IGNORE}; diff --git a/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java b/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java index 1d86bfddc728..b7aa838dcdd1 100644 --- a/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java +++ b/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java @@ -723,7 +723,7 @@ public abstract class PatchApplyingRevertingTest extends PatchTestCase { "plugins/some/lib/plugin.jar", ValidationResult.Action.UPDATE, "Absent", - ValidationResult.Option.REPLACE, ValidationResult.Option.IGNORE) + ValidationResult.Option.REPLACE, ValidationResult.Option.KEEP) ); assertAppliedAndReverted(preparationResult, (original, target) -> { original.put("plugins/some/", Digester.DIRECTORY);