Merge branch 'master' into master

Author: EdrilanBerisha

bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java

@@ -793,7 +793,7 @@ private void expandProjectionAnnotationsBorderingRegion(Region region) throws Ba
 		for (Iterator<Annotation> it= fProjectionAnnotationModel.getAnnotationIterator(); it.hasNext();) {
 			Annotation annotation= it.next();
 			Position position= fProjectionAnnotationModel.getPosition(annotation);
-			if (bordersOrSurroundsRegion(position, region)) {
+			if (position != null && bordersOrSurroundsRegion(position, region)) {
 				fProjectionAnnotationModel.expand(annotation);
 			}
 		}
@@ -808,7 +808,7 @@ private void hideProjectionAnnotationsOutsideOfVisibleRegion() throws BadLocatio
 
 	private void hideProjectionAnnotationIfPartsAreOutsideOfVisibleRegion(Annotation annotation) throws BadLocationException {
 		Position position= fProjectionAnnotationModel.getPosition(annotation);
-		if (annotation instanceof ProjectionAnnotation a) {
+		if (annotation instanceof ProjectionAnnotation a && position != null) {
 			if (overlapsWithNonVisibleRegions(position.getOffset(), position.getLength())) {
 				a.setHidden(true);
 			} else {
@@ -1355,6 +1355,9 @@ public IRegion computeCollapsedRegion(Position position) {
 	 * @since 3.1
 	 */
 	IRegion[] computeCollapsedRegions(Position position) {
+		if (position == null) {
+			return null;
+		}
 		try {
 			IDocument document= getDocument();
 			if (document == null) {

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java

@@ -147,6 +147,9 @@ private int computeNumberOfItems() {
 	 * @param filter The filter text to apply to results
 	 */
 	public void updateProposals(String filter) {
+		if (Policy.DEBUG_QUICK_ACCESS) {
+			trace("Updating proposals with filter: \"" + filter + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+		}
 		if (computeProposalsJob != null) {
 			computeProposalsJob.cancel();
 			computeProposalsJob = null;
@@ -165,12 +168,15 @@ public void updateProposals(String filter) {
 		final Job currentComputeEntriesJob = Job.create(computingMessage, theMonitor -> {
 			entries.set(
 					computeMatchingEntries(filter, perfectMatch, maxNumberOfItemsInTable, theMonitor));
-			Tracing.printTrace(QuickAccessContents.class.getName(),
-					"[" + Thread.currentThread() + "] Computed entries: " + //$NON-NLS-1$ //$NON-NLS-2$
-							Stream.of(entries.get()).flatMap(List::stream).map(e -> e.element.getId()).toList());
+			if (Policy.DEBUG_QUICK_ACCESS) {
+				trace("Computed entries: " + toIds(entries)); //$NON-NLS-1$
+			}
 			return theMonitor.isCanceled() ? Status.CANCEL_STATUS : Status.OK_STATUS;
 		});
 		currentComputeEntriesJob.setPriority(Job.INTERACTIVE);
+		if (Policy.DEBUG_QUICK_ACCESS) {
+			trace("Will compute proposals with Job: " + currentComputeEntriesJob); //$NON-NLS-1$
+		}
 		// feedback is delayed in a job as we don't want to show it on every keystroke
 		// but only when user seems to be waiting
 		UIJob computingFeedbackJob = new UIJob(table.getDisplay(), QuickAccessMessages.QuickAccessContents_computeMatchingEntries_displayFeedback_jobName) {
@@ -186,16 +192,17 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
 		currentComputeEntriesJob.addJobChangeListener(new JobChangeAdapter() {
 			@Override
 			public void done(IJobChangeEvent event) {
-				Tracing.printTrace(QuickAccessContents.class.getName(),
-						"[" + Thread.currentThread() + "] Compute entries Job result: " + event.getResult()); //$NON-NLS-1$ //$NON-NLS-2$
+				if (Policy.DEBUG_QUICK_ACCESS) {
+					trace("Compute entries Job result: " + event.getResult() + //$NON-NLS-1$
+							", Job: " + currentComputeEntriesJob + //$NON-NLS-1$
+							", last proposals Job: " + computeProposalsJob + //$NON-NLS-1$
+							", entries: " + toIds(entries)); //$NON-NLS-1$
+				}
 				computingFeedbackJob.cancel();
 				if (computeProposalsJob == currentComputeEntriesJob && event.getResult().isOK()
 						&& !table.isDisposed()) {
 					if (Policy.DEBUG_QUICK_ACCESS) {
-						Tracing.printTrace(QuickAccessContents.class.getName(),
-								"[" + Thread.currentThread() + "] Setting quick access contents: " + //$NON-NLS-1$ //$NON-NLS-2$
-										Stream.of(entries.get()).flatMap(List::stream).map(e -> e.element.getId())
-												.toList());
+						trace("Setting quick access contents: " + toIds(entries)); //$NON-NLS-1$
 					}
 					display.asyncExec(() -> {
 						computingFeedbackJob.cancel();
@@ -205,6 +212,9 @@ public void done(IJobChangeEvent event) {
 			}
 		});
 		this.computeProposalsJob = currentComputeEntriesJob;
+		if (Policy.DEBUG_QUICK_ACCESS) {
+			trace("Set last proposals Job: " + computeProposalsJob); //$NON-NLS-1$
+		}
 		currentComputeEntriesJob.schedule();
 		computingFeedbackJob.schedule(200); // delay a bit so if proposals compute fast enough, we don't show feedback
 	}
@@ -239,6 +249,9 @@ public void setShowAllMatches(boolean showAll) {
 		if (showAllMatches != showAll) {
 			showAllMatches = showAll;
 			updateInfoLabel();
+			if (Policy.DEBUG_QUICK_ACCESS) {
+				trace("setShowAllMatches triggering proposals update"); //$NON-NLS-1$
+			}
 			updateProposals(filterText.getText().toLowerCase());
 		}
 	}
@@ -689,6 +702,9 @@ public void keyReleased(KeyEvent e) {
 		});
 		filterText.addModifyListener(e -> {
 			String text = ((Text) e.widget).getText();
+			if (Policy.DEBUG_QUICK_ACCESS) {
+				trace("Modify listener triggering proposals update"); //$NON-NLS-1$
+			}
 			updateProposals(text);
 		});
 	}
@@ -759,6 +775,9 @@ public void controlResized(ControlEvent e) {
 						e.display.timerExec(100, () -> {
 							if (table != null && !table.isDisposed() && filterText != null
 									&& !filterText.isDisposed()) {
+								if (Policy.DEBUG_QUICK_ACCESS) {
+									trace("Resize listener triggering proposals update"); //$NON-NLS-1$
+								}
 								updateProposals(filterText.getText().toLowerCase());
 							}
 							resized = false;
@@ -932,4 +951,12 @@ public Text getFilterText() {
 	public Table getTable() {
 		return table;
 	}
+
+	private static List<String> toIds(AtomicReference<List<QuickAccessEntry>[]> entries) {
+		return Stream.of(entries.get()).flatMap(List::stream).map(e -> e.element.getId()).toList();
+	}
+
+	private static void trace(String message) {
+		Tracing.printTrace(QuickAccessContents.class.getName(), " | " + Thread.currentThread() + " | " + message); //$NON-NLS-1$ //$NON-NLS-2$
+	}
 }