Code Blocks Nested in Ordered List

My issue is pretty similar to some things in this thread Code blocks nested in lists render in editor as if at top-level - Bug graveyard - Obsidian Forum

What I want to do is have an ordered list with all sorts of stuff nested. So far, notes and single code lines are fine. As soon as I put a code block with a type in, it breaks the list. When I say breaks the list, the numbering goes haywire if I try to update the numbers or add new lines mid list. It seems like anything that is not broken in the list get renumbered 1-x like 5, 6, 7, 8 in the screen shots below and all others get set to 1. Also, anything with a code block is not able to be collapsed. Here are some screen shots on my issue:

Code view:

Editor mode:

Reading mode (on 6 you can see the collapse button):

I found some rather bizarre behavior. If you prefix the code block with an unordered list and then don’t close the code block (???) it almost does what I want it to, other than looking a little odd - it doesn’t line up with the bullet point.

image

I think I’ve come up with an acceptable workaround. This also renders correctly in Quartz.

The important thing is to have a sub-list item (either ordered or unordered) followed by the code block indented one more time. If you do not put any text after your list item, it renders a little odd. It almost puts it on the same line but not quite. I’ve found putting at least some text there makes it look better.

It would be nice to have lists updated so they support indented multi-line items correctly. I now notice that callouts would have had the same issue, but in my original post I was saved by the fact that I created a sub item above them.

This does not fix the other extremely frustrating bug where all the numbers below the line I’m on are renumbered when adding another item mid list. Is there any way to just disable list renumbering? Or at the very least have it correctly renumber everything after the list is valid again? I’m aware that it renders in preview correctly regardless of what’s in the editor view but it’s very distracting to be editing something when the list is out of order.

Here’s an example of what works. Note the sub item is now not collapsable which for my purposes is ok in most cases.