[eclipse-platform#2909] fix wrong hover size in composite hovers

These two changes require each other:

* Do not add sizes in computeCompositeSize as only the max. should be
used in x-direction

* Prevent shrinking of the hover shell when the size calculation fails

fixes eclipse-platform#2909

Author: Gesa Hentschke

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java

@@ -368,6 +368,11 @@ public void setVisible(boolean visible) {
 
 	@Override
 	public Point computeSizeHint() {
+		if (getShell().getChildren().length == 0) {
+			// no content yet, return default size
+			// computeSize would return 2,2 here
+			return getShell().getSize();
+		}
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=117602
 		int widthHint= SWT.DEFAULT;
 		Point constraints= getSizeConstraints();

bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/CompositeInformationControl.java

@@ -141,8 +141,7 @@ public IInformationControlCreator getInformationPresenterControlCreator() {
 			LinkedHashMap<ITextHover, IInformationControlCreator> presenterCreators = new LinkedHashMap<>();
 			boolean allNull = true;
 			for (Entry<ITextHover, AbstractInformationControl> hover : this.controls.entrySet()) {
-				IInformationControlCreator creator = hover.getValue()
-							.getInformationPresenterControlCreator();
+				IInformationControlCreator creator = hover.getValue().getInformationPresenterControlCreator();
 				if (creator == null) {
 					creator = this.creators.get(hover.getKey());
 				} else {
@@ -174,8 +173,8 @@ public Point computeSizeHint() {
 
 	private Point computeCompositeSize(Function<AbstractInformationControl, Point> computeSize,
 			Supplier<Point> getDefault) {
-		return controls.values().stream().map(computeSize)
-				.reduce((size1, size2) -> new Point(size1.x + size2.x, size1.y + size2.y + layout.verticalSpacing))
+		return controls.values().stream().map(computeSize).reduce(
+				(size1, size2) -> new Point(Math.max(size1.x, size2.x), size1.y + size2.y + layout.verticalSpacing))
 				.orElseGet(getDefault);
 	}
 

bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerInformationControl.java

@@ -161,7 +161,10 @@ public IInformationControlCreator getInformationPresenterControlCreator() {
 
 	@Override
 	public Point computeSizeHint() {
-		getShell().pack();
+		if (getShell().getChildren().length > 0) {
+			// Do not pack the shell/control if it has no children, as it will size to 2,2
+			getShell().pack();
+		}
 		return getShell().getSize();
 	}