Skip to content

Merge Conditional not shown in the diff #77

@tsantalis

Description

@tsantalis

JetBrains/intellij-community@8d7a26e#diff-e65c0dd996f6794ca3aa6ae2e05c9666a944ad8d912b89f6e2f1a0660a2aab94L1176-L1182

We should check all new cases added in the oracle
tsantalis@d8bb59b#diff-6dacce79421f046bc43455a79cf254020e0880c9b86ed2f6242ef2b9943ac5fc

There is a Merge Conditional refactoring
Merge Conditional [if(getVirtualFile().isValid()), if(getVirtualFile() == null)] to return virtualFile == null || !virtualFile.isValid() ? null : virtualFile; in method public getData(dataId String) : Object from class com.intellij.openapi.vcs.history.FileHistoryPanelImpl
but the expressions of the if statements are not matched with the conditions of the ternary operator.

We should allow getter call getVirtualFile() to be replaced with variable SimpleName virtualFile and vice versa.

Screenshot from 2023-04-19 22-01-43

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions