From 03699c1b8d84b080410b0b724a79b940a55e1eff Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 3 Jul 2014 20:18:06 +0200 Subject: [PATCH] optional forced fs rescan for automakes --- .../impl/src/com/intellij/compiler/server/BuildManager.java | 2 +- platform/platform-resources-en/src/misc/registry.properties | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index cb01abba6015..c32d9ecda313 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -611,7 +611,7 @@ public class BuildManager implements ApplicationComponent{ data = new ProjectData(new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE)); myProjectDataMap.put(projectPath, data); } - if (isRebuild) { + if (isRebuild || (isAutomake && Registry.is("compiler.automake.force.fs.rescan", false))) { data.dropChanges(); } if (IS_UNIT_TEST_MODE) { diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index dad0fd91d83d..6205e75f9345 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -198,6 +198,9 @@ compiler.automake.trigger.delay=300 # suppress inspection "UnusedProperty" compiler.automake.trigger.delay.description=Delay in milliseconds before triggering auto-make in response to file system events +compiler.automake.force.fs.rescan=false +compiler.automake.force.fs.rescan.description=When enabled, for all automatically started builds (automake) collected VFS changes will be ignored and modified files will be determined with FS rescan will be forces + compiler.document.save.trigger.delay=1500 # suppress inspection "UnusedProperty" compiler.document.save.trigger.delay.description=Delay in milliseconds before triggering save in response to document changes