Unexpected "Source > Format" Context Menu in Project Explorer

In our Product we see unexpected "Source > Format" context menu entries in the project explorer basically everywhere.

See:

But this can also be seen e.g. with plain JDT.

This is confusing because there is already a "Source" context menu entry that has a "Format" entry in it's sub-menu.

The cause is https://github.com/eclipse-lsp4e/lsp4e/pull/364. This part in the plugin.xml looks a bit too broad for me:

      <menuContribution locationURI="popup:org.eclipse.ui.popup.any?endof=group.generate">
         <menu label="Source" mnemonic="S" >
            <command commandId="org.eclipse.lsp4e.formatfile">
               <visibleWhen>
                  <iterate>
                     <or>
                         <adapt type="org.eclipse.core.resources.IFile">
                            <test property="org.eclipse.lsp4e.hasLanguageServer" />
                         </adapt>
                         <adapt type="org.eclipse.core.resources.IFolder" />
                         <adapt type="org.eclipse.core.resources.IProject" />
                     </or>
                  </iterate>
               </visibleWhen>
            </command>
         </menu>
      </menuContribution>

Can we improve this?

Start by reviewing the menuContribution in plugin.xml introduced by pull request 364, focusing on its popup location and visibility conditions. Reproduce the context menu in Project Explorer and with plain JDT, then adjust the contribution so it does not create an unexpected duplicate Source > Format entry. Done means the unintended menu is absent while the intended formatting action remains available.