IDEA-140344 allow to override heap size locally without modifying VM options

Effective value is determined in the following order:
1. user-local heap size;
2. user-local VM options;
3. shared heap size;
4. shared VM options.

3 already had higher priority than 4, so newly added 1 has higher priority than 2 for consistency.

GitOrigin-RevId: 9677822c66c02c047cec602d757cd3591dd881b3
This commit is contained in:
Daniil Ovchinnikov
2020-10-05 19:02:07 +03:00
committed by intellij-monorepo-bot
parent 43fc9ab7cb
commit 066d57a271
6 changed files with 108 additions and 62 deletions

View File

@@ -125,7 +125,8 @@ settings.configure.annotations=&Configure annotations...
settings.build.project.automatically=Build project automatically
settings.compile.independent.modules.in.parallel=Compile independent modules in parallel
settings.rebuild.module.on.dependency.change=Rebuild module on dependency change
settings.build.process.heap.size=Build process heap size (Mbytes):
settings.build.process.heap.size=Shared build process heap size (Mbytes):
settings.user.local.build.process.heap.size=User-local build process heap size (Mbytes) (overrides Shared size):
settings.shared.build.process.vm.options=Shared build process VM options:
settings.user.local.build.process.vm.options=User-local build process VM options (overrides Shared options):
settings.auto.build.only.works.while.not.running=(only works while not running / debugging)

View File

@@ -28,6 +28,7 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent<
public boolean CLEAR_OUTPUT_DIRECTORY = true;
public boolean MAKE_PROJECT_ON_SAVE = false; // until we fix problems with several open projects (IDEA-104064), daemon slowness (IDEA-104666)
public boolean PARALLEL_COMPILATION = false;
public int COMPILER_PROCESS_HEAP_SIZE = 0;
public String COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = "";
public boolean REBUILD_ON_DEPENDENCY_CHANGE = true;
public boolean COMPILE_AFFECTED_UNLOADED_MODULES_BEFORE_COMMIT = true;