diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-15 13:16:27 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-16 11:40:20 +0000 |
| commit | ee6e659a483d11b4e77dbb1c66d7dc314e0864b1 (patch) | |
| tree | 9499c05b7c563e2442fcf018824b0a284fd6c7c7 | |
| parent | 3ff9d620b458f64a308cf939de005ed0b3696671 (diff) | |
snippets_translate: Do convert return statements to functions
Task-number: PYSIDE-2030
Change-Id: Icd6f3a639449d737933d4420fbeb891224999b59
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit beaf2513cbe23f0a40162df1cd454c278fc7a1d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tools/snippets_translate/handlers.py | 7 | ||||
| -rw-r--r-- | tools/snippets_translate/tests/test_converter.py | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/snippets_translate/handlers.py b/tools/snippets_translate/handlers.py index 6ededfc06..40ba71841 100644 --- a/tools/snippets_translate/handlers.py +++ b/tools/snippets_translate/handlers.py @@ -516,10 +516,13 @@ def handle_methods_return_type(x): def handle_functions(x): - re_capture = re.compile(r"^ *[a-zA-Z0-9]+ ([\w\*\&]+\(.*\)$)") + re_capture = re.compile(r"^ *([a-zA-Z0-9]+) ([\w\*\&]+\(.*\)$)") capture = re_capture.search(x) if capture: - content = capture.group(1) + return_type = capture.group(1) + if return_type == "return": # "return QModelIndex();" + return x + content = capture.group(2) function_name = content.split("(")[0] re_par = re.compile(r"\((.+)\)") par_capture = re_par.search(x) diff --git a/tools/snippets_translate/tests/test_converter.py b/tools/snippets_translate/tests/test_converter.py index 84e266f41..b2d6468d8 100644 --- a/tools/snippets_translate/tests/test_converter.py +++ b/tools/snippets_translate/tests/test_converter.py @@ -367,6 +367,7 @@ def test_functions(): st("QString myDecoderFunc(const QByteArray &localFileName);") == "def myDecoderFunc(localFileName):" ) + assert st("return QModelIndex();") == "return QModelIndex()" def test_foreach(): |