Apply cleanups to workbench.texteditor

* Pattern mathching for instanceof
* Use diamond
* Simplify lambda

Author: akurtakov

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java

@@ -183,12 +183,10 @@ private void initializeSearchScope() {
 			resetIncrementalBaseLocation();
 		}
 
-		if (target == null || !(target instanceof IFindReplaceTargetExtension)) {
+		if (target == null || !(target instanceof IFindReplaceTargetExtension extensionTarget)) {
 			return;
 		}
 
-		IFindReplaceTargetExtension extensionTarget = (IFindReplaceTargetExtension) target;
-
 		IRegion scope;
 		Point lineSelection = extensionTarget.getLineSelection();
 		scope = new Region(lineSelection.x, lineSelection.y);
@@ -204,12 +202,10 @@ private void initializeSearchScope() {
 	 * Unsets the search scope for a "Scoped"-Search.
 	 */
 	private void unsetSearchScope() {
-		if (target == null || !(target instanceof IFindReplaceTargetExtension)) {
+		if (target == null || !(target instanceof IFindReplaceTargetExtension extensionTarget)) {
 			return;
 		}
 
-		IFindReplaceTargetExtension extensionTarget = (IFindReplaceTargetExtension) target;
-
 		extensionTarget.setScope(null);
 	}
 
@@ -309,8 +305,7 @@ public void performSelectAll() {
 	 *         otherwise
 	 */
 	private boolean prepareTargetForEditing() {
-		if (target instanceof IFindReplaceTargetExtension2) {
-			IFindReplaceTargetExtension2 extension = (IFindReplaceTargetExtension2) target;
+		if (target instanceof IFindReplaceTargetExtension2 extension) {
 			if (!extension.validateTargetState()) {
 				status = new FindStatus(FindStatus.StatusCode.READONLY);
 				return false;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/FocusedInformationPresenter.java

@@ -123,8 +123,7 @@ public boolean openFocusedAnnotationHover(IAnnotationHover annotationHover, int
 		try {
 			// compute the hover information
 			Object hoverInfo;
-			if (annotationHover instanceof IAnnotationHoverExtension) {
-				IAnnotationHoverExtension extension= (IAnnotationHoverExtension) annotationHover;
+			if (annotationHover instanceof IAnnotationHoverExtension extension) {
 				ILineRange hoverLineRange= extension.getHoverLineRange(fSourceViewer, line);
 				if (hoverLineRange == null)
 					return false;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/HippieCompletionEngine.java

@@ -260,8 +260,7 @@ public static List<IDocument> computeDocuments(ITextEditor currentTextEditor) {
 
 		for (IEditorReference editor : editorsArray) {
 			IEditorPart realEditor = editor.getEditor(false);
-			if (realEditor instanceof ITextEditor && !realEditor.equals(currentTextEditor)) {
-				ITextEditor textEditor= (ITextEditor)realEditor;
+			if (realEditor instanceof ITextEditor textEditor && !realEditor.equals(currentTextEditor)) {
 				provider= textEditor.getDocumentProvider();
 				if (provider == null) {
 					continue;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/ToMultiSelectionHandler.java

@@ -40,20 +40,18 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 			return null;
 		}
 		ISelection selection = textEditor.getSelectionProvider().getSelection();
-		if (!(selection instanceof IBlockTextSelection)) {
+		if (!(selection instanceof IBlockTextSelection blockSelection)) {
 			return null;
 		}
-		IBlockTextSelection blockSelection = (IBlockTextSelection) selection;
 		IRegion[] initialRegions = ((IMultiTextSelection) blockSelection).getRegions();
 		IDocument document = textEditor.getDocumentProvider().getDocument(editor.getEditorInput());
 		if (document == null) {
 			return null;
 		}
 		IMultiTextSelection newSelection = new MultiTextSelection(document, initialRegions);
-		if (!(editor instanceof ITextEditorExtension5)) {
+		if (!(editor instanceof ITextEditorExtension5 ext)) {
 			return null;
 		}
-		ITextEditorExtension5 ext = (ITextEditorExtension5) editor;
 		ext.setBlockSelectionMode(false);
 		textEditor.getSelectionProvider().setSelection(newSelection);
 		return newSelection;

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/multiselection/AbstractMultiSelectionHandler.java

@@ -425,10 +425,9 @@ private StyledText getWidget() {
 	}
 
 	private void setBlockSelectionMode(boolean blockSelectionMode) {
-		if (!(textEditor instanceof ITextEditorExtension5)) {
+		if (!(textEditor instanceof ITextEditorExtension5 ext)) {
 			return;
 		}
-		ITextEditorExtension5 ext = (ITextEditorExtension5) textEditor;
 		ext.setBlockSelectionMode(blockSelectionMode);
 	}
 

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DocumentLineDiffer.java

@@ -1411,8 +1411,7 @@ public void connect(IDocument document) {
 		if (fOpenConnections == 1) {
 			fRightDocument= document;
 			fRightDocument.addDocumentListener(this);
-			if (document instanceof IDocumentExtension4) {
-				IDocumentExtension4 ext= (IDocumentExtension4) document;
+			if (document instanceof IDocumentExtension4 ext) {
 				ext.addDocumentRewriteSessionListener(fSessionListener);
 			}
 			initialize();
@@ -1449,8 +1448,7 @@ private void uninstall() {
 
 			if (fRightDocument != null) {
 				fRightDocument.removeDocumentListener(this);
-				if (fRightDocument instanceof IDocumentExtension4) {
-					IDocumentExtension4 ext= (IDocumentExtension4) fRightDocument;
+				if (fRightDocument instanceof IDocumentExtension4 ext) {
 					ext.removeDocumentRewriteSessionListener(fSessionListener);
 				}
 			}

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/ReferenceSelectionAction.java

@@ -84,8 +84,7 @@ public void run() {
 		if (differ == null)
 			return;
 
-		if (fEditor instanceof ITextEditorExtension3) {
-			ITextEditorExtension3 extension= (ITextEditorExtension3) fEditor;
+		if (fEditor instanceof ITextEditorExtension3 extension) {
 			IQuickDiffReferenceProvider provider= getProvider();
 			if (provider != null) {
 				provider.setActiveEditor(fEditor);

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/DocEquivalenceComparator.java

@@ -74,8 +74,7 @@ public int getRangeCount() {
 	 */
 	@Override
 	public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) {
-		if (other instanceof DocEquivalenceComparator) {
-			DocEquivalenceComparator dec= (DocEquivalenceComparator) other;
+		if (other instanceof DocEquivalenceComparator dec) {
 			try {
 				Hash ourHash= getHash(thisIndex);
 				Hash otherHash= dec.getHash(otherIndex);

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/views/minimap/MinimapWidget.java

@@ -129,8 +129,7 @@ private StyleRange modelStyleRange2WidgetStyleRange(StyleRange range) {
 		}
 
 		private IRegion modelRange2WidgetRange(IRegion region) {
-			if (fEditorViewer instanceof ITextViewerExtension5) {
-				ITextViewerExtension5 extension = (ITextViewerExtension5) fEditorViewer;
+			if (fEditorViewer instanceof ITextViewerExtension5 extension) {
 				return extension.modelRange2WidgetRange(region);
 			}
 			if (fEditorViewer instanceof TextViewer) {

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/views/minimap/MultiPageMinimapPage.java

@@ -61,9 +61,8 @@ public MultiPageMinimapPage(MultiPageEditorPart multiPageEditor) {
 				return;
 			}
 
-			if (selectedPage instanceof ITextEditor) {
+			if (selectedPage instanceof ITextEditor textEditor) {
 				// Create and show a minimap page for the given text editor page
-				ITextEditor textEditor = (ITextEditor) selectedPage;
 				minimapPage = MinimapPage.createMinimapPage(textEditor);
 			}
 			if (minimapPage != null) {