Unexpected Indent with Decorators when sending to terminal

[duylamvo-wefox]

VS Code version

1.61.0

Extension version

v2021.12.1559732655

OS type

macOS

OS version

10.15.7

Python distribution

Anaconda

Python version

3.7.11

Language server

Pylance

Expected behaviour

Select the code with decorator @ -> [Shift + Enter]

The code should be executed properly

Similar to the issue:

• "Run Selection" does not handle decorators properly. #15058

Actual behaviour

Start and Ends of block is wrongly sent.
Only end lines with indent, hence -> Unexpected Indent

Steps to reproduce

def task(func):
    def wrapper():
        print("Something is happening before the function is called.")
        func()
        print("Something is happening after the function is called.")
    return wrapper


@task
def do_a() -> dict:
    msg_d = {"msg": "hello world"}
    print(f"I am task_a. I send a message: {msg_d['msg']}")
    return msg_d
    
@task
def do_b(msg_d: dict) -> int:
    msg = msg_d["msg"]
    print(f"I am task_b. I got a message: {msg}")
    n_len = len(msg)
    return n_len


@task
def do_c(msg_d: dict, n_len: int):
    print(f"I am task_c. I got a message: '{msg_d}' with {n_len} words")

def run():
    print(1)

When I select all code and do [shift+enter] -> It shows Unexpected Indent
When I select only a code, the whole block from @task -> end of block -> it shows only return msg_d with indent -> again, Unexpected Indent

The start and end of block is wrongly sent to terminal

Logs

No response

Code of Conduct

• I agree to follow this project's Code of Conduct

[duylamvo-wefox]

From pythonFiles/normalizeSelection.py, If I comment out the block of check decorator and restart vscode. I can make it works again.

    for node, end in zip(tree.body, ends):
        # Given this selection:
        # 1: if (m > 0 and
        # 2:        n < 3):
        # 3:     print('foo')
        # 4: value = 'bar'
        #
        # The first block would have lineno = 1,and the second block lineno = 4
        start = node.lineno - 1

        # Special handling of decorators similar to what's above.
        # if hasattr(node, "decorator_list") and sys.version_info.major >= 3:
        #     start -= len(node.decorator_list)
        block = "\n".join(lines[start:end])

The code start = node.lineno - 1 is already correct to identify position of the decorator.

[kimadeline]

Hi @duylamvo-wefox, thank you for reaching out!

Maybe the sys.version_info.major >= 3 check isn't enough, and it should be check for 3.7 or higher, because these lines were needed when testing with 3.8. I'll take a look.

[kimadeline]

After some testing, I can reproduce the issue with Python 3.6 and 3.7, but not on 3.8, 3.9, 3.10 and 3.11, so it indeed seems like the version check should be >= 3.8 instead of 3.