Use instanceof-pattern

Author: mickaelistria

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ChangeUtil.java

@@ -88,8 +88,8 @@ public class ChangeUtil {
 	 */
 	public static WorkspaceEdit convertToWorkspaceEdit(Change change) throws CoreException {
 		WorkspaceEdit edit = new WorkspaceEdit();
-		if (change instanceof CompositeChange) {
-			convertCompositeChange((CompositeChange) change, edit);
+		if (change instanceof CompositeChange compositeChange) {
+			convertCompositeChange(compositeChange, edit);
 		} else {
 			convertSingleChange(change, edit);
 		}
@@ -101,18 +101,18 @@ private static void convertSingleChange(Change change, WorkspaceEdit edit) throw
 			return;
 		}
 
-		if (change instanceof TextChange) {
-			convertTextChange((TextChange) change, edit);
-		} else if (change instanceof ResourceChange) {
-			convertResourceChange((ResourceChange) change, edit);
+		if (change instanceof TextChange textChange) {
+			convertTextChange(textChange, edit);
+		} else if (change instanceof ResourceChange resourceChange) {
+			convertResourceChange(resourceChange, edit);
 		}
 	}
 
 	private static void convertCompositeChange(CompositeChange change, WorkspaceEdit edit) throws CoreException {
 		Change[] changes = change.getChildren();
 		for (Change ch : changes) {
-			if (ch instanceof CompositeChange) {
-				convertCompositeChange((CompositeChange) ch, edit);
+			if (ch instanceof CompositeChange compositeChange) {
+				convertCompositeChange(compositeChange, edit);
 			} else {
 				convertSingleChange(ch, edit);
 			}
@@ -141,16 +141,16 @@ private static void convertResourceChange(ResourceChange resourceChange, Workspa
 		}
 
 		// Resource change is needed and supported by client
-		if (resourceChange instanceof RenameCompilationUnitChange) {
-			convertCUResourceChange(edit, (RenameCompilationUnitChange) resourceChange);
-		} else if (resourceChange instanceof RenamePackageChange) {
-			convertRenamePackcageChange(edit, (RenamePackageChange) resourceChange);
-		} else if (resourceChange instanceof MoveCompilationUnitChange) {
-			convertMoveCompilationUnitChange(edit, (MoveCompilationUnitChange) resourceChange);
-		} else if (resourceChange instanceof CreateFileChange) {
-			convertCreateFileChange(edit, (CreateFileChange) resourceChange);
-		} else if (resourceChange instanceof CreateCompilationUnitChange) {
-			convertCreateCompilationUnitChange(edit, (CreateCompilationUnitChange) resourceChange);
+		if (resourceChange instanceof RenameCompilationUnitChange renameCUChange) {
+			convertCUResourceChange(edit, renameCUChange);
+		} else if (resourceChange instanceof RenamePackageChange renamePackageChange) {
+			convertRenamePackcageChange(edit, renamePackageChange);
+		} else if (resourceChange instanceof MoveCompilationUnitChange moveCUChange) {
+			convertMoveCompilationUnitChange(edit, moveCUChange);
+		} else if (resourceChange instanceof CreateFileChange createFileChange) {
+			convertCreateFileChange(edit, createFileChange);
+		} else if (resourceChange instanceof CreateCompilationUnitChange createCUChange) {
+			convertCreateCompilationUnitChange(edit, createCUChange);
 		}
 	}
 

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/HoverInfoProvider.java

@@ -128,8 +128,8 @@ public List<Either<String, MarkedString>> computeHover(int line, int column, IPr
 			}
 			if (JDTEnvironmentUtils.isSyntaxServer() || isResolved(curr, monitor)) {
 				IBuffer buffer = curr.getOpenable().getBuffer();
-				if (buffer == null && curr instanceof BinaryMember) {
-					IClassFile classFile = ((BinaryMember) curr).getClassFile();
+				if (buffer == null && curr instanceof BinaryMember binaryMember) {
+					IClassFile classFile = binaryMember.getClassFile();
 					if (classFile != null) {
 						Optional<IBuildSupport> bs = JavaLanguageServerPlugin.getProjectsManager().getBuildSupport(curr.getJavaProject().getProject());
 						if (bs.isPresent()) {
@@ -224,8 +224,7 @@ public void acceptSearchMatch(SearchMatch match) throws CoreException {
 						return;
 					}
 					Object o = match.getElement();
-					if (o instanceof IJavaElement) {
-						IJavaElement element = (IJavaElement) o;
+					if (o instanceof IJavaElement element) {
 						if (element.getElementType() == IJavaElement.TYPE) {
 							res[0] = true;
 							return;
@@ -255,8 +254,7 @@ public static MarkedString computeSignature(IJavaElement element)  {
 		} else {
 			elementLabel = JavaElementLabels.getElementLabel(element, COMMON_SIGNATURE_FLAGS);
 		}
-		if (element instanceof IField) {
-			IField field = (IField) element;
+		if (element instanceof IField field) {
 			IRegion region = null;
 			try {
 				ISourceRange nameRange = JDTUtils.getNameRange(field);
@@ -297,10 +295,10 @@ private static String getDefaultValue(IMethod method) {
 	public static MarkedString computeJavadoc(IJavaElement element) throws CoreException {
 		IMember member = null;
 		String result = null;
-		if (element instanceof ITypeParameter) {
-			member= ((ITypeParameter) element).getDeclaringMember();
-		} else if (element instanceof IMember) {
-			member= (IMember) element;
+		if (element instanceof ITypeParameter typeParameter) {
+			member = typeParameter.getDeclaringMember();
+		} else if (element instanceof IMember memberElement) {
+			member = memberElement;
 		} else if (element instanceof IPackageFragment) {
 			Reader r = JavadocContentAccess2.getMarkdownContentReader(element);
 			if (r != null) {
@@ -312,8 +310,8 @@ public static MarkedString computeJavadoc(IJavaElement element) throws CoreExcep
 			if (r != null) {
 				result = getString(r);
 			}
-			if (member instanceof IMethod) {
-				String defaultValue = getDefaultValue((IMethod) member);
+			if (member instanceof IMethod method) {
+				String defaultValue = getDefaultValue(method);
 				if (defaultValue != null) {
 					if (JavaLanguageServerPlugin.getPreferencesManager().getClientPreferences().isSupportsCompletionDocumentationMarkdown()) {
 						result = (result == null ? CompletionResolveHandler.EMPTY_STRING : result) + "\n" + CompletionResolveHandler.DEFAULT + defaultValue;