Fix RUN_JAVA_PROGRAM after refactor

Fix RUN_JAVA_PROGRAM after refactor
commit_hash:d4fec69bfd7ca33d1c1cbe4a666b7ddef4bf2fb4

3 files changed, 12 insertions, 13 deletions

diff --git a/build/export_generators/ide-gradle/build.gradle.kts.jinja b/build/export_generators/ide-gradle/build.gradle.kts.jinja
index 36aa47faa99..d0a9040f05d 100644
--- a/build/export_generators/ide-gradle/build.gradle.kts.jinja
+++ b/build/export_generators/ide-gradle/build.gradle.kts.jinja
@@ -1,3 +1,14 @@
+{%- macro OutDirs(run, prefix, suffix) -%}
+{%-    if run.args|length and run.out_dir|length -%}
+{%-        for out_dir in run.out_dir -%}
+{%-            set out_dirs = select_by_ends(run.args, "/" + out_dir) -%}
+{%-            if out_dirs|length %}
+{{ prefix }}{{ out_dirs|first }}{{ suffix }}
+{%-            endif -%}
+{%-        endfor -%}
+{%-    endif -%}
+{%- endmacro -%}
+
 {%- include "[generator]/vars.jinja" -%}
 {%- include "[generator]/import.jinja" -%}
 {%- include "[generator]/repositories.jinja" -%}
diff --git a/build/export_generators/ide-gradle/source_sets.jinja b/build/export_generators/ide-gradle/source_sets.jinja
index 47dc8a81803..75268d66aa2 100644
--- a/build/export_generators/ide-gradle/source_sets.jinja
+++ b/build/export_generators/ide-gradle/source_sets.jinja
@@ -31,7 +31,7 @@ sourceSets {
         java.srcDir("src/intTest/java")
         resources.srcDir("src/intTest/resources")
 {%- for extra_target in extra_targets -%}
-{%-     if extra_target|length -%}
+{%-     if extra_target.runs|length -%}
 {%-         for run in extra_target.runs -%}
 {{              OutDirs(run, '        java.srcDir("', '")') }}
 {%-         endfor -%}
diff --git a/build/export_generators/ide-gradle/vars.jinja b/build/export_generators/ide-gradle/vars.jinja
index db363b3cbc8..1f4cea76d07 100644
--- a/build/export_generators/ide-gradle/vars.jinja
+++ b/build/export_generators/ide-gradle/vars.jinja
@@ -13,15 +13,3 @@
 {%-     set has_required_jdk = true -%}
 {%-     set required_jdk = target.required_jdk -%}
 {%- endif -%}
-
-{%- macro OutDirs(runs, prefix, suffix) -%}
-{%-    if run.args|length and run.out_dir|length -%}
-{%-        for out_dir in run.out_dir -%}
-{#-            search all run arguments ended by /<out_dir> -#}
-{%-            set out_dirs = select_by_ends(run.args, "/" + out_dir) -%}
-{%-            if out_dirs|length %}
-{{ prefix }}{{ out_dirs|first }}{{ suffix }}
-{%-            endif -%}
-{%-        endfor -%}
-{%-    endif -%}
-{%- endmacro -%}