[merge addon] Fix aligning around widgets directly before change or eol
[merge addon] Fix aligning around widgets directly before change or eol

Issue #4575

grzegorzmazur/CodeMirror,jkaplon/CodeMirror,wingify/CodeMirror,SidPresse/CodeMirror,kerabromsmu/CodeMirror,crazy4chrissi/CodeMirror,notepadqq/CodeMirror,hackmdio/CodeMirror,codio/CodeMirror,MarcelGerber/CodeMirror,jayaprabhakar/CodeMirror,SidPresse/CodeMirror,thomasjm/CodeMirror,MarcelGerber/CodeMirror,nightwing/CodeMirror,crazy4chrissi/CodeMirror,hackmdio/CodeMirror,codio/CodeMirror,schanzer/CodeMirror,MarcelGerber/CodeMirror,schanzer/CodeMirror,jkaplon/CodeMirror,wingify/CodeMirror,nightwing/CodeMirror,ficristo/CodeMirror,ficristo/CodeMirror,dperetti/CodeMirror,thomasjm/CodeMirror,ejgallego/CodeMirror,schanzer/CodeMirror,crazy4chrissi/CodeMirror,pabloferz/CodeMirror,notepadqq/CodeMirror,pabloferz/CodeMirror,mtaran-google/CodeMirror,grzegorzmazur/CodeMirror,wingify/CodeMirror,dperetti/CodeMirror,mtaran-google/CodeMirror,kerabromsmu/CodeMirror,namin/CodeMirror,notepadqq/CodeMirror,mtaran-google/CodeMirror,nightwing/CodeMirror,dperetti/CodeMirror,kerabromsmu/CodeMirror,jkaplon/CodeMirror,jayaprabhakar/CodeMirror,ejgallego/CodeMirror,hackmdio/CodeMirror,pabloferz/CodeMirror,ficristo/CodeMirror,jayaprabhakar/CodeMirror,grzegorzmazur/CodeMirror,SidPresse/CodeMirror,thomasjm/CodeMirror,namin/CodeMirror,namin/CodeMirror,codio/CodeMirror,ejgallego/CodeMirror