Code Cleanup: Java 16 instanceof pattern matching #556

SougandhS · 2024-11-07T03:47:28Z

Performs code cleanup in pattern matching using instanceof operator according to Java 16 guidelines, making the code more concise for classes in jdt.launching package.

What it does

How to test

Author checklist

I have thoroughly tested my changes
The change is following the coding conventions
I have signed the Eclipse Contributor Agreement (ECA)

SougandhS · 2024-11-07T04:15:21Z

Hi @jukzi , could you please check on this ?

jukzi · 2024-11-07T08:24:25Z

Was this an pure automated cleanup, or manual edit? Or both?

SougandhS · 2024-11-07T08:25:38Z

Was this an pure automated cleanup, or manual edit? Or both?

Manual edit only.

jukzi · 2024-11-07T08:28:38Z

...eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchableTester.java

@@ -144,17 +144,17 @@ public class JavaLaunchableTester extends PropertyTester {
 	 */
 	private IType getType(IJavaElement element) {
        IType type = null;
-        if (element instanceof ICompilationUnit) {
-            type= ((ICompilationUnit) element).findPrimaryType();
+		if (element instanceof ICompilationUnit iCompilationUnit) {


on github the intendation looks wrong here

in local its ok

It may be an automated conversion of TABs to whitespace or other way around. Would be good if the intendation would be uniform within a method. Please try autoformat the whole affected method.

Will do this.

jukzi · 2024-11-07T08:31:08Z

org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java

@@ -3337,8 +3331,8 @@ private static void updateCompliance(IVMInstall vm) {
 		if (LaunchingPlugin.isVMLogging()) {
 			LaunchingPlugin.log("Compliance needs an update."); //$NON-NLS-1$
 		}
-        if (vm instanceof IVMInstall2) {
-            String javaVersion = ((IVMInstall2)vm).getJavaVersion();
+		if (vm instanceof IVMInstall2 ivmInstall) {


intendation looks wrong on github

in local there's no modification any intendations.

Enable "show whitespace characters" and you'll most likely see a mixture of tabs and spaces and different tools display tabs as 2,4,8,... whitespaces.

Enable "show whitespace characters" and you'll most likely see a mixture of tabs and spaces and different tools display tabs as 2,4,8,... whitespaces.

Thanks

jukzi · 2024-11-07T08:32:36Z

beside minor intendation looks ok for me

jukzi · 2024-11-07T08:36:23Z

Manual edit only.

please make that clear in the commit message "manual code cleanup" to not be confused with dogfooding

SougandhS · 2024-11-07T08:55:47Z

Manual edit only.

please make that clear in the commit message "manual code cleanup" to not be confused with dogfooding

Done the changes now.

SougandhS · 2024-11-07T09:53:19Z

Hi @jukzi
I have removed all changes from JavaLaunchableTester.java as it is doing some auto formatting once it is saved, resulting huge collapse in indentations

jukzi · 2024-11-07T10:31:22Z

org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java

- * As well, this class provides VM install change notification,
- * and computes class paths and source lookup paths for launch
- * configurations.
+ * The central access point for launching support. This class manages the registered VM types contributed through the


Manu unrelated format changes in JavaRuntime.java

Same case as of JavaLaunchableTester.java - So removed the changes now.

jukzi · 2024-11-07T10:32:43Z

.../launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java

@@ -119,7 +119,7 @@ protected ISourceContainer[] createSourceContainers() throws CoreException {
 						IPath path = entry.getPath();
 						IResource resource = root.findMember(path);
 						if (resource instanceof IContainer) {


missing cleanup here

jukzi

LGTM, lets wait some days if someone else wants to review too.

SougandhS · 2024-11-07T13:54:01Z

LGTM, lets wait some days if someone else wants to review too.

Sure @jukzi , Thanks

Performed manual code cleanup in pattern matching using instanceof operator according to Java 16 guidelines, making the code more concise for classes in jdt.launching package.

eclipse-jdt-bot · 2024-11-26T14:29:55Z

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

org.eclipse.jdt.launching/META-INF/MANIFEST.MF
org.eclipse.jdt.launching/pom.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch

From ff4d26cc976487c07d9b787175b39b58ff0034e1 Mon Sep 17 00:00:00 2001
From: Eclipse JDT Bot <jdt-bot@eclipse.org>
Date: Tue, 26 Nov 2024 14:29:35 +0000
Subject: [PATCH] Version bump(s) for 4.35 stream


diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index 04685fba1..71435c3e1 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.23.100.qualifier
+Bundle-Version: 3.23.200.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 4ddaac0a1..c92753988 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.launching</artifactId>
-  <version>3.23.100-SNAPSHOT</version>
+  <version>3.23.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
-- 
2.47.0

Further information are available in Common Build Issues - Missing version increments.

akurtakov · 2024-11-27T06:25:05Z

Thanks for this one. I really find such PRs reducing time to read code kind one of the most important things as with the limited resources it's very hard to dedicate time for issues/improvements making every second counts.

SougandhS · 2024-11-27T06:27:08Z

Thank you @akurtakov & @jukzi

jukzi · 2024-11-27T06:53:27Z

I really find such PRs reducing time to read code kind one of the most important things as with the limited resources it's very hard to dedicate time for issues/improvements making every second counts.

I like such motivating comments. thanks. And thanks for @SougandhS for improving the code even in minor cases.

SougandhS · 2024-11-28T03:58:09Z

I like such motivating comments. thanks. And thanks for @SougandhS for improving the code even in minor cases.

Thanks again @jukzi

jukzi reviewed Nov 7, 2024

View reviewed changes

SougandhS force-pushed the Code_upgradation_instanceof_pattern_matching branch from 0a514b6 to 66814be Compare November 7, 2024 08:53

SougandhS requested a review from jukzi November 7, 2024 08:55

SougandhS force-pushed the Code_upgradation_instanceof_pattern_matching branch 4 times, most recently from 9f896cb to 7ae5a62 Compare November 7, 2024 09:43

jukzi reviewed Nov 7, 2024

View reviewed changes

SougandhS force-pushed the Code_upgradation_instanceof_pattern_matching branch from 7ae5a62 to 7a5de07 Compare November 7, 2024 10:47

jukzi approved these changes Nov 7, 2024

View reviewed changes

Manual Code Cleanup: Java 16 instanceof pattern matching

a825216

Performed manual code cleanup in pattern matching using instanceof operator according to Java 16 guidelines, making the code more concise for classes in jdt.launching package.

jukzi force-pushed the Code_upgradation_instanceof_pattern_matching branch from 7a5de07 to a825216 Compare November 26, 2024 14:27

Version bump(s) for 4.35 stream

16b9992

akurtakov merged commit ecfc91d into eclipse-jdt:master Nov 27, 2024
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Code Cleanup: Java 16 instanceof pattern matching #556

Code Cleanup: Java 16 instanceof pattern matching #556

SougandhS commented Nov 7, 2024 •

edited

Loading

SougandhS commented Nov 7, 2024

jukzi commented Nov 7, 2024

SougandhS commented Nov 7, 2024

jukzi Nov 7, 2024

SougandhS Nov 7, 2024

jukzi Nov 7, 2024

SougandhS Nov 7, 2024

jukzi Nov 7, 2024

SougandhS Nov 7, 2024

akurtakov Nov 7, 2024

SougandhS Nov 7, 2024

jukzi commented Nov 7, 2024

jukzi commented Nov 7, 2024

SougandhS commented Nov 7, 2024

SougandhS commented Nov 7, 2024

jukzi Nov 7, 2024

SougandhS Nov 7, 2024

jukzi Nov 7, 2024

SougandhS Nov 7, 2024

jukzi left a comment

SougandhS commented Nov 7, 2024

eclipse-jdt-bot commented Nov 26, 2024

akurtakov commented Nov 27, 2024

SougandhS commented Nov 27, 2024

jukzi commented Nov 27, 2024

SougandhS commented Nov 28, 2024

Code Cleanup: Java 16 instanceof pattern matching #556

Code Cleanup: Java 16 instanceof pattern matching #556

Conversation

SougandhS commented Nov 7, 2024 • edited Loading

What it does

How to test

Author checklist

SougandhS commented Nov 7, 2024

jukzi commented Nov 7, 2024

SougandhS commented Nov 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jukzi commented Nov 7, 2024

jukzi commented Nov 7, 2024

SougandhS commented Nov 7, 2024

SougandhS commented Nov 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jukzi left a comment

Choose a reason for hiding this comment

SougandhS commented Nov 7, 2024

eclipse-jdt-bot commented Nov 26, 2024

akurtakov commented Nov 27, 2024

SougandhS commented Nov 27, 2024

jukzi commented Nov 27, 2024

SougandhS commented Nov 28, 2024

SougandhS commented Nov 7, 2024 •

edited

Loading