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

Remove unused "VcsConfiguration.REFORMAT_BEFORE_FILE_COMMIT"

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2017-09-13 08:55:45 +03:00
parent d8590540df
commit 680a9cdd82
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
-1
View File
@@ -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;
platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/ReformatBeforeCheckinHandler.java
+1 -6
View File
@@ -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;
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/statistics/VcsOptionsUsagesCollector.java
-1
View File
@@ -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));
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
+1 -3
View File
@@ -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);
}
}