Merge branch 'eclipse-platform:master' into align_multi_page_editor_tab

Author: praveen-skp

bundles/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.core.refactoring
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ltk.core.refactoring; singleton:=true
-Bundle-Version: 3.14.500.qualifier
+Bundle-Version: 3.14.600.qualifier
 Bundle-Activator: org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringDescriptor.java

@@ -357,7 +357,7 @@ public final long getTimeStamp() {
 	public final int hashCode() {
 		int code= getDescription().hashCode();
 		if (fTimeStamp >= 0)
-			code+= (17 * fTimeStamp);
+			code+= 17 * Long.hashCode(fTimeStamp);
 		return code;
 	}
 

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringDescriptorProxy.java

@@ -108,7 +108,7 @@ public final int hashCode() {
 		int code= getDescription().hashCode();
 		final long stamp= getTimeStamp();
 		if (stamp >= 0)
-			code+= (17 * stamp);
+			code+= 17 * Long.hashCode(stamp);
 		return code;
 	}
 

bundles/org.eclipse.search.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.search.core;singleton:=true
-Bundle-Version: 3.16.300.qualifier
+Bundle-Version: 3.16.400.qualifier
 Bundle-Activator: org.eclipse.search.internal.core.SearchCorePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName

bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java

@@ -40,7 +40,6 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.core.runtime.content.IContentTypeManager;
 import org.eclipse.core.runtime.jobs.Job;
@@ -205,8 +204,13 @@ public IStatus processFile(List<IFile> sameFiles, IProgressMonitor monitor) {
 					occurences = locateMatches(file, charsequence, matcher, monitor);
 				} else {
 					try {
+						boolean reportTextOnly = !fCollector.reportBinaryFile(file);
+						if (reportTextOnly && hasBinaryContentType(file)) {
+							// fail fast for binary file types without opening the file
+							return Status.OK_STATUS;
+						}
 						charsequence = fileCharSequenceProvider.newCharSequence(file);
-						if (hasBinaryContent(charsequence, file) && !fCollector.reportBinaryFile(file)) {
+						if (reportTextOnly && hasBinaryContent(charsequence)) {
 							return Status.OK_STATUS;
 						}
 						occurences = locateMatches(file, charsequence, matcher, monitor);
@@ -435,21 +439,25 @@ public IStatus search(TextSearchScope scope, IProgressMonitor monitor) {
 		return search(scope.evaluateFilesInScope(fStatus), monitor);
 	}
 
-	private boolean hasBinaryContent(CharSequence seq, IFile file) throws CoreException {
-		if (seq instanceof String) {
-			if (!((String) seq).contains("\0")) { //$NON-NLS-1$
-				// fail fast to avoid file.getContentDescription():
-				return false;
+	private final IContentType TEXT_TYPE = Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT);
+
+	private boolean hasBinaryContentType(IFile file) {
+		IContentType[] contentTypes = Platform.getContentTypeManager().findContentTypesFor(file.getName());
+		for (IContentType contentType : contentTypes) {
+			if (contentType.isKindOf(TEXT_TYPE)) {
+				return false; // is text
 			}
 		}
-		IContentDescription desc= file.getContentDescription();
-		if (desc != null) {
-			IContentType contentType= desc.getContentType();
-			if (contentType != null && contentType.isKindOf(Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT))) {
-				return false;
-			}
+		if (contentTypes.length > 0) {
+			return true; // has some not text type
 		}
+		return false; // unknown
+	}
 
+	private boolean hasBinaryContent(CharSequence seq) {
+		if (seq instanceof String s) {
+			return (s.contains("\0")); //$NON-NLS-1$
+		}
 		// avoid calling seq.length() at it runs through the complete file,
 		// thus it would do so for all binary files.
 		try {

bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.ui.forms;singleton:=true
-Bundle-Version: 3.13.300.qualifier
+Bundle-Version: 3.13.400.qualifier
 Bundle-Vendor: %provider-name
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.forms,

bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/Paragraph.java

@@ -162,7 +162,7 @@ public void layout(GC gc, int width, Locator loc, int lineHeight,
 				computeRowHeights(gc, width, loc, lineHeight, resourceTable);
 			for (ParagraphSegment segment : segments) {
 				boolean doSelect = false;
-				if (selectedLink != null && segment.equals(selectedLink))
+				if (selectedLink instanceof ParagraphSegment sl && segment.equals(sl))
 					doSelect = true;
 				segment.layout(gc, width, loc, resourceTable, doSelect);
 			}
@@ -182,7 +182,7 @@ public void paint(GC gc, Rectangle repaintRegion,
 			if (!segment.intersects(repaintRegion))
 				continue;
 			boolean doSelect = false;
-			if (selectedLink != null && segment.equals(selectedLink))
+			if (selectedLink instanceof ParagraphSegment sl && segment.equals(sl))
 				doSelect = true;
 			segment.paint(gc, false, resourceTable, doSelect, selData, repaintRegion);
 		}

bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
-Bundle-Version: 3.22.300.qualifier
+Bundle-Version: 3.22.400.qualifier
 Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java

@@ -17,6 +17,8 @@
 package org.eclipse.ui.actions;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.net.URI;
@@ -528,7 +530,11 @@ private void copyExisting(IResource source, IResource existing, IProgressMonitor
 			IFile sourceFile = getFile(source);
 
 			if (sourceFile != null) {
-				existingFile.setContents(sourceFile.getContents(), IResource.KEEP_HISTORY, subMonitor.split(1));
+				try (InputStream contents = sourceFile.getContents()) {
+					existingFile.setContents(contents, IResource.KEEP_HISTORY, subMonitor.split(1));
+				} catch (IOException closeException) {
+					// never happens
+				}
 			}
 		}
 	}

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/MoveFilesAndFoldersOperation.java

@@ -13,6 +13,9 @@
  *******************************************************************************/
 package org.eclipse.ui.actions;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -199,7 +202,11 @@ private void moveExisting(IResource source, IResource existing, IProgressMonitor
 			IFile sourceFile = getFile(source);
 
 			if (sourceFile != null) {
-				existingFile.setContents(sourceFile.getContents(), IResource.KEEP_HISTORY, subMonitor.split(1));
+				try (InputStream contents = sourceFile.getContents()) {
+					existingFile.setContents(contents, IResource.KEEP_HISTORY, subMonitor.split(1));
+				} catch (IOException closeException) {
+					// never happens
+				}
 				delete(sourceFile, subMonitor.split(1));
 			}
 		}