mirror of
https://github.com/lihop/godot-xterm.git
synced 2024-11-22 09:40:25 +01:00
Update gdtoolkit to version 4.2.2
This commit is contained in:
parent
11ed797005
commit
893c768f75
12 changed files with 62 additions and 84 deletions
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
@ -327,7 +327,7 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-python@v4
|
- uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: 3.x
|
python-version: 3.9
|
||||||
cache: 'pip'
|
cache: 'pip'
|
||||||
- name: Install python dependencies
|
- name: Install python dependencies
|
||||||
run: pip install -r requirements.txt
|
run: pip install -r requirements.txt
|
||||||
|
|
|
@ -280,9 +280,12 @@ func _parse_script(obj):
|
||||||
if inner_class_registry.has(obj):
|
if inner_class_registry.has(obj):
|
||||||
parsed = _script_collector.parse(inner_class_registry.get_base_resource(obj), obj)
|
parsed = _script_collector.parse(inner_class_registry.get_base_resource(obj), obj)
|
||||||
else:
|
else:
|
||||||
_lgr.error(
|
(
|
||||||
|
_lgr
|
||||||
|
. error(
|
||||||
"Doubling Inner Classes requires you register them first. Call register_inner_classes passing the script that contains the inner class."
|
"Doubling Inner Classes requires you register them first. Call register_inner_classes passing the script that contains the inner class."
|
||||||
)
|
)
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
parsed = _script_collector.parse(obj)
|
parsed = _script_collector.parse(obj)
|
||||||
|
|
||||||
|
|
|
@ -63,23 +63,15 @@ func _ready():
|
||||||
_ctrls.output_button.icon = get_theme_icon("Font", "EditorIcons")
|
_ctrls.output_button.icon = get_theme_icon("Font", "EditorIcons")
|
||||||
|
|
||||||
_ctrls.run_results.set_output_control(_ctrls.output_ctrl)
|
_ctrls.run_results.set_output_control(_ctrls.output_ctrl)
|
||||||
(
|
_ctrls.run_results.set_font(
|
||||||
_ctrls
|
|
||||||
. run_results
|
|
||||||
. set_font(
|
|
||||||
_gut_config.options.panel_options.font_name, _gut_config.options.panel_options.font_size
|
_gut_config.options.panel_options.font_name, _gut_config.options.panel_options.font_size
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
|
||||||
var check_import = load("res://addons/gut/images/red.png")
|
var check_import = load("res://addons/gut/images/red.png")
|
||||||
if check_import == null:
|
if check_import == null:
|
||||||
(
|
_ctrls.run_results.add_centered_text(
|
||||||
_ctrls
|
|
||||||
. run_results
|
|
||||||
. add_centered_text(
|
|
||||||
"GUT got some new images that are not imported yet. Please restart Godot."
|
"GUT got some new images that are not imported yet. Please restart Godot."
|
||||||
)
|
)
|
||||||
)
|
|
||||||
print("GUT got some new images that are not imported yet. Please restart Godot.")
|
print("GUT got some new images that are not imported yet. Please restart Godot.")
|
||||||
else:
|
else:
|
||||||
_ctrls.run_results.add_centered_text("Let's run some tests!")
|
_ctrls.run_results.add_centered_text("Let's run some tests!")
|
||||||
|
@ -94,13 +86,9 @@ func _apply_options_to_controls():
|
||||||
_ctrls.output_ctrl.set_all_fonts(_gut_config.options.panel_options.font_name)
|
_ctrls.output_ctrl.set_all_fonts(_gut_config.options.panel_options.font_name)
|
||||||
_ctrls.output_ctrl.set_font_size(_gut_config.options.panel_options.font_size)
|
_ctrls.output_ctrl.set_font_size(_gut_config.options.panel_options.font_size)
|
||||||
|
|
||||||
(
|
_ctrls.run_results.set_font(
|
||||||
_ctrls
|
|
||||||
. run_results
|
|
||||||
. set_font(
|
|
||||||
_gut_config.options.panel_options.font_name, _gut_config.options.panel_options.font_size
|
_gut_config.options.panel_options.font_name, _gut_config.options.panel_options.font_size
|
||||||
)
|
)
|
||||||
)
|
|
||||||
_ctrls.run_results.set_show_orphans(!_gut_config.options.hide_orphans)
|
_ctrls.run_results.set_show_orphans(!_gut_config.options.hide_orphans)
|
||||||
|
|
||||||
|
|
||||||
|
@ -178,10 +166,10 @@ func _apply_shortcuts():
|
||||||
_ctrls.run_button.shortcut = _ctrls.shortcut_dialog.get_run_all()
|
_ctrls.run_button.shortcut = _ctrls.shortcut_dialog.get_run_all()
|
||||||
|
|
||||||
_ctrls.run_at_cursor.get_script_button().shortcut = (
|
_ctrls.run_at_cursor.get_script_button().shortcut = (
|
||||||
_ctrls . shortcut_dialog . get_run_current_script()
|
_ctrls.shortcut_dialog.get_run_current_script()
|
||||||
)
|
)
|
||||||
_ctrls.run_at_cursor.get_inner_button().shortcut = (
|
_ctrls.run_at_cursor.get_inner_button().shortcut = (
|
||||||
_ctrls . shortcut_dialog . get_run_current_inner()
|
_ctrls.shortcut_dialog.get_run_current_inner()
|
||||||
)
|
)
|
||||||
_ctrls.run_at_cursor.get_test_button().shortcut = _ctrls.shortcut_dialog.get_run_current_test()
|
_ctrls.run_at_cursor.get_test_button().shortcut = _ctrls.shortcut_dialog.get_run_current_test()
|
||||||
|
|
||||||
|
@ -337,10 +325,8 @@ func set_current_script(script):
|
||||||
|
|
||||||
func set_interface(value):
|
func set_interface(value):
|
||||||
_interface = value
|
_interface = value
|
||||||
(
|
_interface.get_script_editor().connect(
|
||||||
_interface
|
"editor_script_changed", Callable(self, "_on_editor_script_changed")
|
||||||
. get_script_editor()
|
|
||||||
. connect("editor_script_changed", Callable(self, "_on_editor_script_changed"))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var ste = ScriptTextEditors.new(_interface.get_script_editor())
|
var ste = ScriptTextEditors.new(_interface.get_script_editor())
|
||||||
|
|
|
@ -47,15 +47,11 @@ func run_tests(show_gui = true):
|
||||||
add_child(_gut)
|
add_child(_gut)
|
||||||
|
|
||||||
if !_cmdln_mode:
|
if !_cmdln_mode:
|
||||||
(
|
_gut.end_run.connect(
|
||||||
_gut
|
|
||||||
. end_run
|
|
||||||
. connect(
|
|
||||||
_on_tests_finished.bind(
|
_on_tests_finished.bind(
|
||||||
_gut_config.options.should_exit, _gut_config.options.should_exit_on_success
|
_gut_config.options.should_exit, _gut_config.options.should_exit_on_success
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
|
||||||
_gut_config.config_gut(_gut)
|
_gut_config.config_gut(_gut)
|
||||||
var run_rest_of_scripts = _gut_config.options.unit_test_name == ""
|
var run_rest_of_scripts = _gut_config.options.unit_test_name == ""
|
||||||
|
|
|
@ -81,17 +81,11 @@ func _ready():
|
||||||
_set_toolbutton_icon(_ctrls.toolbar.show_script, "Script", "ss")
|
_set_toolbutton_icon(_ctrls.toolbar.show_script, "Script", "ss")
|
||||||
_set_toolbutton_icon(_ctrls.toolbar.scroll_output, "Font", "so")
|
_set_toolbutton_icon(_ctrls.toolbar.scroll_output, "Font", "so")
|
||||||
|
|
||||||
(
|
_ctrls.toolbar.hide_passing.set(
|
||||||
_ctrls
|
"custom_icons/checked", get_theme_icon("GuiVisibilityHidden", "EditorIcons")
|
||||||
. toolbar
|
|
||||||
. hide_passing
|
|
||||||
. set("custom_icons/checked", get_theme_icon("GuiVisibilityHidden", "EditorIcons"))
|
|
||||||
)
|
)
|
||||||
(
|
_ctrls.toolbar.hide_passing.set(
|
||||||
_ctrls
|
"custom_icons/unchecked", get_theme_icon("GuiVisibilityVisible", "EditorIcons")
|
||||||
. toolbar
|
|
||||||
. hide_passing
|
|
||||||
. set("custom_icons/unchecked", get_theme_icon("GuiVisibilityVisible", "EditorIcons"))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if get_parent() == get_tree().root:
|
if get_parent() == get_tree().root:
|
||||||
|
|
|
@ -480,9 +480,9 @@ func get_options(base_opts):
|
||||||
to_return.should_exit_on_success = _cfg_ctrls.should_exit_on_success.button_pressed
|
to_return.should_exit_on_success = _cfg_ctrls.should_exit_on_success.button_pressed
|
||||||
|
|
||||||
#Output
|
#Output
|
||||||
to_return.panel_options.font_name = (
|
to_return.panel_options.font_name = (_cfg_ctrls.output_font_name.get_item_text(
|
||||||
_cfg_ctrls . output_font_name . get_item_text(_cfg_ctrls.output_font_name.selected)
|
_cfg_ctrls.output_font_name.selected
|
||||||
)
|
))
|
||||||
to_return.panel_options.font_size = _cfg_ctrls.output_font_size.value
|
to_return.panel_options.font_size = _cfg_ctrls.output_font_size.value
|
||||||
|
|
||||||
# Runner Appearance
|
# Runner Appearance
|
||||||
|
|
|
@ -210,11 +210,14 @@ func setup_options(options, font_names):
|
||||||
)
|
)
|
||||||
opts.add("-gpo", false, "Print option values from all sources and the value used, then quit.")
|
opts.add("-gpo", false, "Print option values from all sources and the value used, then quit.")
|
||||||
opts.add("-ginclude_subdirs", false, "Include subdirectories of -gdir.")
|
opts.add("-ginclude_subdirs", false, "Include subdirectories of -gdir.")
|
||||||
opts.add(
|
(
|
||||||
|
opts
|
||||||
|
. add(
|
||||||
"-gdouble_strategy",
|
"-gdouble_strategy",
|
||||||
"partial",
|
"partial",
|
||||||
'Default strategy to use when doubling. Valid values are [partial, full]. Default "[default]"'
|
'Default strategy to use when doubling. Valid values are [partial, full]. Default "[default]"'
|
||||||
)
|
)
|
||||||
|
)
|
||||||
opts.add("-gdisable_colors", false, "Disable command line colors.")
|
opts.add("-gdisable_colors", false, "Disable command line colors.")
|
||||||
opts.add("-gpre_run_script", "", "pre-run hook script path")
|
opts.add("-gpre_run_script", "", "pre-run hook script path")
|
||||||
opts.add("-gpost_run_script", "", "post-run hook script path")
|
opts.add("-gpost_run_script", "", "post-run hook script path")
|
||||||
|
@ -364,9 +367,8 @@ func _run_gut():
|
||||||
_tester = runner.get_gut()
|
_tester = runner.get_gut()
|
||||||
_tester.connect(
|
_tester.connect(
|
||||||
"end_run",
|
"end_run",
|
||||||
(
|
Callable(self, "_on_tests_finished").bind(
|
||||||
Callable(self, "_on_tests_finished")
|
_final_opts.should_exit, _final_opts.should_exit_on_success
|
||||||
. bind(_final_opts.should_exit, _final_opts.should_exit_on_success)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -378,9 +380,12 @@ func _on_tests_finished(should_exit, should_exit_on_success):
|
||||||
if _final_opts.dirs.size() == 0:
|
if _final_opts.dirs.size() == 0:
|
||||||
if _tester.get_summary().get_totals().scripts == 0:
|
if _tester.get_summary().get_totals().scripts == 0:
|
||||||
var lgr = _tester.get_logger()
|
var lgr = _tester.get_logger()
|
||||||
lgr.error(
|
(
|
||||||
|
lgr
|
||||||
|
. error(
|
||||||
"No directories configured. Add directories with options or a super.gutconfig.json file. Use the -gh option for more information."
|
"No directories configured. Add directories with options or a super.gutconfig.json file. Use the -gh option for more information."
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
if _tester.get_fail_count():
|
if _tester.get_fail_count():
|
||||||
set_exit_code(1)
|
set_exit_code(1)
|
||||||
|
|
|
@ -21,13 +21,9 @@ var _should_abort = false
|
||||||
# Virtual method that will be called by GUT after instantiating
|
# Virtual method that will be called by GUT after instantiating
|
||||||
# this script.
|
# this script.
|
||||||
func run():
|
func run():
|
||||||
(
|
gut.logger.error(
|
||||||
gut
|
|
||||||
. logger
|
|
||||||
. error(
|
|
||||||
"Run method not overloaded. Create a 'run()' method in your hook script to run your code."
|
"Run method not overloaded. Create a 'run()' method in your hook script to run your code."
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Set the exit code when running from the command line. If not set then the
|
# Set the exit code when running from the command line. If not set then the
|
||||||
|
|
|
@ -1565,9 +1565,12 @@ func double_inner(path, subpath, strategy = null):
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
func ignore_method_when_doubling(thing, method_name):
|
func ignore_method_when_doubling(thing, method_name):
|
||||||
if typeof(thing) == TYPE_STRING:
|
if typeof(thing) == TYPE_STRING:
|
||||||
_lgr.error(
|
(
|
||||||
|
_lgr
|
||||||
|
. error(
|
||||||
"ignore_method_when_doubling no longer supports paths to scripts or scenes. Load them and pass them instead."
|
"ignore_method_when_doubling no longer supports paths to scripts or scenes. Load them and pass them instead."
|
||||||
)
|
)
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
var r = thing
|
var r = thing
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
GDTOOLKIT_VERSION=5f4405e1d5f47e581860103106c96a0504bdf74a
|
GDTOOLKIT_VERSION=4.2.2
|
||||||
|
|
||||||
FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep '\.gd$' | grep -v '^addons/gd-plug' | grep -v '^addons/gut' | sed 's| |\\ |g')
|
FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep '\.gd$' | grep -v '^addons/gd-plug' | grep -v '^addons/gut' | sed 's| |\\ |g')
|
||||||
echo $FILES
|
echo $FILES
|
||||||
|
|
|
@ -1,9 +1 @@
|
||||||
colorama==0.4.5
|
gdtoolkit==4.2.2
|
||||||
docopt==0.6.2
|
|
||||||
future==0.18.2
|
|
||||||
git+https://github.com/Scony/godot-gdscript-toolkit@5f4405e1d5f47e581860103106c96a0504bdf74a
|
|
||||||
lark-parser==0.12.0
|
|
||||||
mando==0.6.4
|
|
||||||
PyYAML==6.0
|
|
||||||
radon==5.1.0
|
|
||||||
six==1.16.0
|
|
||||||
|
|
|
@ -149,7 +149,9 @@ class Helper:
|
||||||
)
|
)
|
||||||
var python_path = output[0].strip_edges()
|
var python_path = output[0].strip_edges()
|
||||||
|
|
||||||
var exit_code = OS.execute(
|
var exit_code = (
|
||||||
|
OS
|
||||||
|
. execute(
|
||||||
python_path,
|
python_path,
|
||||||
[
|
[
|
||||||
"-c",
|
"-c",
|
||||||
|
@ -160,6 +162,7 @@ class Helper:
|
||||||
],
|
],
|
||||||
output
|
output
|
||||||
)
|
)
|
||||||
|
)
|
||||||
assert(exit_code == 0, "Failed to run python command for this test.")
|
assert(exit_code == 0, "Failed to run python command for this test.")
|
||||||
|
|
||||||
var size = str_to_var("Vector2" + output[1].strip_edges())
|
var size = str_to_var("Vector2" + output[1].strip_edges())
|
||||||
|
|
Loading…
Reference in a new issue