MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[updater] consistent use of "keep" and "ignore" options (IDEA-336163)

Browse Source 
The former is used when other options are available for a file (like "replace" or "delete").

GitOrigin-RevId: 4674747a06adb81f3ccd81392a0a91e66757739c
This commit is contained in:
Roman Shevchenko
2023-11-28 15:10:15 +00:00
committed by intellij-monorepo-bot
parent e5776f72b4
commit db541de9b9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/src/com/intellij/updater/PatchAction.java
+1 -1
View File
@@ -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};
updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java
+1 -1
View File
@@ -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);