From 680a9cdd82fcaedae21ee8fb6dbac0a96f184fe2 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Wed, 30 Aug 2017 18:23:42 +0300
Subject: [PATCH] Remove unused "VcsConfiguration.REFORMAT_BEFORE_FILE_COMMIT"

---
 .../src/com/intellij/openapi/vcs/VcsConfiguration.java     | 1 -
 .../openapi/vcs/checkin/ReformatBeforeCheckinHandler.java  | 7 +------
 .../openapi/vcs/statistics/VcsOptionsUsagesCollector.java  | 1 -
 .../importing/configurers/MavenIdeaPluginConfigurer.java   | 4 +---
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
index be65d1d5c055..d26a5c77f5f4 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
@@ -133,7 +133,6 @@ public final class VcsConfiguration implements PersistentStateComponent<VcsConfi
   public boolean CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT = false;
 
   public boolean REFORMAT_BEFORE_PROJECT_COMMIT = false;
-  public boolean REFORMAT_BEFORE_FILE_COMMIT = false;
 
   public boolean REARRANGE_BEFORE_PROJECT_COMMIT = false;
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/ReformatBeforeCheckinHandler.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/ReformatBeforeCheckinHandler.java
index 9be361c1704a..579c137b959d 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/ReformatBeforeCheckinHandler.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/ReformatBeforeCheckinHandler.java
@@ -87,7 +87,7 @@ public class ReformatBeforeCheckinHandler extends CheckinHandler implements Chec
       finishAction.run();
     };
 
-    if (reformat(configuration, true) && !DumbService.isDumb(myProject)) {
+    if (configuration.REFORMAT_BEFORE_PROJECT_COMMIT && !DumbService.isDumb(myProject)) {
       new ReformatCodeProcessor(
         myProject, CheckinHandlerUtil.getPsiFiles(myProject, files), FormatterUtil.REFORMAT_BEFORE_COMMIT_COMMAND_NAME, performCheckoutAction, true
       ).run();
@@ -97,9 +97,4 @@ public class ReformatBeforeCheckinHandler extends CheckinHandler implements Chec
     }
 
   }
-
-  private static boolean reformat(final VcsConfiguration configuration, boolean checkinProject) {
-    return checkinProject ? configuration.REFORMAT_BEFORE_PROJECT_COMMIT : configuration.REFORMAT_BEFORE_FILE_COMMIT;
-  }
-
 }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java
index 6f88902e1a4f..71e8bad4b562 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java
@@ -62,7 +62,6 @@ public class VcsOptionsUsagesCollector extends AbstractProjectsUsagesCollector {
     usages.add(getBooleanUsage("commit.before.optimize.imports", configuration.OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT));
     usages.add(getBooleanUsage("commit.before.check.files.up.to.date", configuration.CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT));
     usages.add(getBooleanUsage("commit.before.reformat.project", configuration.REFORMAT_BEFORE_PROJECT_COMMIT));
-    usages.add(getBooleanUsage("commit.before.reformat.file", configuration.REFORMAT_BEFORE_FILE_COMMIT));
     usages.add(getBooleanUsage("commit.before.rearrange", configuration.REARRANGE_BEFORE_PROJECT_COMMIT));
 
     usages.add(getBooleanUsage("commit.clear.initial.comment", configuration.CLEAR_INITIAL_COMMIT_MESSAGE));
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
index dd3147bba9fd..f15be1d7f6ff 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
@@ -93,9 +93,7 @@ public class MavenIdeaPluginConfigurer extends MavenModuleConfigurer {
     String reformatCodeBeforeCommit = cfg.getChildTextTrim("reformatCodeBeforeCommit");
     if (!StringUtil.isEmptyOrSpaces(reformatCodeBeforeCommit)) {
       VcsConfiguration vcsConfiguration = VcsConfiguration.getInstance(module.getProject());
-      boolean value = Boolean.parseBoolean(reformatCodeBeforeCommit);
-      vcsConfiguration.REFORMAT_BEFORE_FILE_COMMIT = value;
-      vcsConfiguration.REFORMAT_BEFORE_PROJECT_COMMIT = value;
+      vcsConfiguration.REFORMAT_BEFORE_PROJECT_COMMIT = Boolean.parseBoolean(reformatCodeBeforeCommit);
     }
   }