Do you use org-edit-special in Org Mode (bound to C-c ' by default) to edit code blocks? It opens the code block in special temporary buffer with proper major mode enabled so you can edit the source code block with all the batteries included.