FilePath (@NotNull ShelvedChange shelvedChange) { Change change = shelvedChange.getChange(); if (change.getType() == Change.Type.MOVED) { FilePath bPath = requireNonNull(ChangesUtil.getBeforePath(change)); FilePath aPath = requireNonNull(ChangesUtil.getAfterPath(change)); if (bPath.getVirtualFile() != null) return bPath; if (aPath.getVirtualFile() != null) return aPath; return bPath; } return ChangesUtil.getFilePath(change); }