Issue #451: add NoWhitespaceAfter to checkstyle config

Calixte · Calixte · commit bb23e4db23e6 · 2026-05-31T22:54:48.000+02:00
diff --git a/config/checkstyle-checks.xml b/config/checkstyle-checks.xml
@@ -771,6 +771,20 @@
         <module name="GenericWhitespace"/>
         <module name="MethodParamPad"/>
         <module name="NoLineWrap"/>
+        <module name="NoWhitespaceAfter">
+            <property name="tokens" value="ARRAY_INIT"/>
+            <property name="tokens" value="AT"/>
+            <property name="tokens" value="BNOT"/>
+            <property name="tokens" value="DEC"/>
+            <property name="tokens" value="DOT"/>
+            <property name="tokens" value="INC"/>
+            <property name="tokens" value="LNOT"/>
+            <property name="tokens" value="UNARY_MINUS"/>
+            <property name="tokens" value="UNARY_PLUS"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="tokens" value="INDEX_OP"/>
+            <property name="tokens" value="METHOD_REF"/>
+        </module>
         <module name="NoWhitespaceBefore"/>
         <module name="NoWhitespaceBeforeCaseDefaultColon"/>
         <module name="NoWhitespaceBefore">
diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java
@@ -191,7 +191,9 @@ protected final IProject[] build(final int kind, @SuppressWarnings("rawtypes") f
       marker.setAttributes(markerAttributes);
     }
 
-    return new IProject[] { project };
+    return new IProject[] {
+        project,
+    };
   }
 
   @Override
diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/BuildProjectJob.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/BuildProjectJob.java
@@ -53,7 +53,9 @@ public class BuildProjectJob extends Job {
    */
   public BuildProjectJob(IProject project, int buildKind) {
     super(NLS.bind(Messages.BuildProjectJob_msgBuildProject, project.getName()));
-    mProjects = new IProject[] { project };
+    mProjects = new IProject[] {
+        project,
+    };
     mKind = buildKind;
   }
 
diff --git a/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/filters/FilesInSyncFilter.java b/net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/projectconfig/filters/FilesInSyncFilter.java
@@ -63,7 +63,9 @@ public boolean accept(Object element) {
 
   private boolean hasChanges(IFile file, Subscriber subscriber) {
     try {
-      subscriber.refresh(new IResource[] { file }, IResource.DEPTH_ZERO, new NullProgressMonitor());
+      subscriber.refresh(new IResource[] {
+          file,
+      }, IResource.DEPTH_ZERO, new NullProgressMonitor());
       SyncInfo synchInfo = subscriber.getSyncInfo(file);
 
       if (synchInfo != null) {
diff --git a/net.sf.eclipsecs.sample/src/net/sf/eclipsecs/sample/checks/MethodLimitCheck.java b/net.sf.eclipsecs.sample/src/net/sf/eclipsecs/sample/checks/MethodLimitCheck.java
@@ -30,7 +30,10 @@ public final class MethodLimitCheck extends AbstractCheck {
 
   @Override
   public int[] getAcceptableTokens() {
-    return new int[] { TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF };
+    return new int[] {
+        TokenTypes.CLASS_DEF,
+        TokenTypes.INTERFACE_DEF,
+    };
   }
 
   @Override
@@ -40,7 +43,10 @@ public int[] getRequiredTokens() {
 
   @Override
   public int[] getDefaultTokens() {
-    return new int[] { TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF };
+    return new int[] {
+        TokenTypes.CLASS_DEF,
+        TokenTypes.INTERFACE_DEF,
+    };
   }
 
   public void setMax(int limit) {
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java
@@ -166,7 +166,10 @@ protected Control createDialogArea(Composite parent) {
                     mBrowserDescription::setText, this::checkStateChanged));
     configuredModulesTable.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-    sashForm.setWeights(new int[] { 30, 70 });
+    sashForm.setWeights(new int[] {
+        30,
+        70,
+    });
 
     // initialize the data
     initialize();
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationPropertiesDialog.java
@@ -278,9 +278,11 @@ protected void okPressed() {
                 NLS.bind(Messages.CheckConfigurationPropertiesDialog_msgUnresolvedProps,
                         Integer.toString(numUnresolvedProps)),
                 MessageDialog.WARNING,
-                new String[] { Messages.CheckConfigurationPropertiesDialog_btnEditProps,
+                new String[] {
+                    Messages.CheckConfigurationPropertiesDialog_btnEditProps,
                     Messages.CheckConfigurationPropertiesDialog_btnContinue,
-                    Messages.CheckConfigurationPropertiesDialog_btnCancel },
+                    Messages.CheckConfigurationPropertiesDialog_btnCancel,
+                },
                 0);
         int result = dialog.open();
 
@@ -374,7 +376,9 @@ private void initialize() {
       this.setMessage(Messages.CheckConfigurationPropertiesDialog_msgEditCheckConfig);
 
       mConfigType.getCombo().setEnabled(false);
-      mConfigType.setInput(new IConfigurationType[] { mCheckConfig.getType() });
+      mConfigType.setInput(new IConfigurationType[] {
+          mCheckConfig.getType(),
+      });
 
       // type of existing configs cannot be changed
       mConfigType.setSelection(new StructuredSelection(mCheckConfig.getType()), true);
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/configtypes/InternalConfigurationEditor.java
@@ -166,7 +166,10 @@ configFileString, null, new ExternalFileConfigurationType(), true, null,
   private static Optional<String> promptImportConfigFile(Shell shell) {
     FileDialog fileDialog = new FileDialog(shell);
     fileDialog.setText(Messages.InternalConfigurationEditor_titleImportDialog);
-    fileDialog.setFilterExtensions(new String[] { "*.xml", "*.*" });
+    fileDialog.setFilterExtensions(new String[] {
+        "*.xml",
+        "*.*",
+    });
     String configFileString = fileDialog.open();
     if (configFileString != null && new File(configFileString).exists()) {
       return Optional.of(configFileString);
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageGeneralSettings.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/preferences/CheckstylePreferencePageGeneralSettings.java
@@ -89,8 +89,11 @@ public CheckstylePreferencePageGeneralSettings(Composite parent, int style, Runn
     lblRebuild.setText(Messages.CheckstylePreferencePage_lblRebuild);
 
     mRebuildIfNeeded = new Combo(rebuildComposite, SWT.READ_ONLY);
-    mRebuildIfNeeded.setItems(new String[] { MessageDialogWithToggle.PROMPT,
-        MessageDialogWithToggle.ALWAYS, MessageDialogWithToggle.NEVER });
+    mRebuildIfNeeded.setItems(new String[] {
+        MessageDialogWithToggle.PROMPT,
+        MessageDialogWithToggle.ALWAYS,
+        MessageDialogWithToggle.NEVER,
+    });
     mRebuildIfNeeded.select(mRebuildIfNeeded.indexOf(
             CheckstyleUIPluginPrefs.getString(CheckstyleUIPluginPrefs.PREF_ASK_BEFORE_REBUILD)));
 
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/CheckstylePropertyPageMainTab.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/CheckstylePropertyPageMainTab.java
@@ -164,7 +164,9 @@ public void widgetSelected(SelectionEvent e) {
         MessageDialogWithToggle dialog = new MessageDialogWithToggle(getShell(),
                 Messages.CheckstylePropertyPage_titleWarnFilesets, null,
                 Messages.CheckstylePropertyPage_msgWarnFilesets, MessageDialog.WARNING,
-                new String[] { IDialogConstants.OK_LABEL }, 0,
+                new String[] {
+                    IDialogConstants.OK_LABEL,
+                }, 0,
                 Messages.CheckstylePropertyPage_mgsWarnFileSetNagOption, showWarning) {
           /**
            * Overwritten because we don't want to store which button the user pressed but the
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/FileSetEditDialog.java
@@ -121,7 +121,10 @@ protected Control createDialogArea(Composite parent) {
     this.matchArea = new FileSetEditDialogMatchedFilesPreview(sashForm, SWT.NONE, mFileSet);
     matchArea.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-    sashForm.setWeights(new int[] { 50, 50 });
+    sashForm.setWeights(new int[] {
+        50,
+        50,
+    });
 
     // init the data
     initializeControls();
@@ -175,8 +178,11 @@ private void initializeControls() {
   private void updateMatchView() {
     matchArea.refresh();
     matchArea.setText(itemCount -> NLS.bind(Messages.FileSetEditDialog_titleTestResult,
-            new String[] { propertyPageContext.project().getName(), Integer.toString(itemCount),
-                Integer.toString(mProjectFiles.size()) }));
+            new String[] {
+                propertyPageContext.project().getName(),
+                Integer.toString(itemCount),
+                Integer.toString(mProjectFiles.size()),
+            }));
   }
 
   @Override
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/filter/PackageFilterEditor.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/properties/filter/PackageFilterEditor.java
@@ -342,7 +342,9 @@ public CheckedTreeSelectionDialog(Shell parent, ILabelProvider labelProvider,
      *          the initial selection.
      */
     public void setInitialSelection(Object selection) {
-      setInitialSelections(new Object[] { selection });
+      setInitialSelections(new Object[] {
+          selection,
+      });
     }
 
     /**
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/MarkerHelpContextProvider.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/MarkerHelpContextProvider.java
@@ -84,7 +84,9 @@ public IContext getContext(String id, String locale) {
 
   @Override
   public String[] getPlugins() {
-    return new String[] { "net.sf.eclipsecs.ui" };
+    return new String[] {
+        "net.sf.eclipsecs.ui",
+    };
   }
 
   /**
@@ -144,7 +146,9 @@ private CheckstyleHelpContext(String moduleName) {
     @Override
     public IHelpResource[] getRelatedTopics() {
       IHelpResource helpResource = new CheckstyleHelpTopic(moduleName);
-      return new IHelpResource[] { helpResource };
+      return new IHelpResource[] {
+          helpResource,
+      };
     }
 
     @Override
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/ModifierOrderQuickfix.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/ModifierOrderQuickfix.java
@@ -21,7 +21,6 @@
 package net.sf.eclipsecs.ui.quickfixes.modifier;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -54,14 +53,13 @@ public class ModifierOrderQuickfix extends AbstractASTResolution {
    * List containing modifier keywords in the order proposed by Java Language specification,
    * sections 8.1.1, 8.3.1 and 8.4.3.
    */
-  private static final List<Object> MODIFIER_ORDER = Arrays
-          .asList(new Object[] { ModifierKeyword.PUBLIC_KEYWORD, ModifierKeyword.PROTECTED_KEYWORD,
-              ModifierKeyword.PRIVATE_KEYWORD, ModifierKeyword.ABSTRACT_KEYWORD,
-              ModifierKeyword.STATIC_KEYWORD, ModifierKeyword.FINAL_KEYWORD,
-              ModifierKeyword.TRANSIENT_KEYWORD, ModifierKeyword.VOLATILE_KEYWORD,
-              ModifierKeyword.SYNCHRONIZED_KEYWORD, ModifierKeyword.NATIVE_KEYWORD,
-              ModifierKeyword.STRICTFP_KEYWORD, ModifierKeyword.DEFAULT_KEYWORD,
-             });
+  private static final List<Object> MODIFIER_ORDER = List.of(ModifierKeyword.PUBLIC_KEYWORD,
+          ModifierKeyword.PROTECTED_KEYWORD, ModifierKeyword.PRIVATE_KEYWORD,
+          ModifierKeyword.ABSTRACT_KEYWORD, ModifierKeyword.STATIC_KEYWORD,
+          ModifierKeyword.FINAL_KEYWORD, ModifierKeyword.TRANSIENT_KEYWORD,
+          ModifierKeyword.VOLATILE_KEYWORD, ModifierKeyword.SYNCHRONIZED_KEYWORD,
+          ModifierKeyword.NATIVE_KEYWORD, ModifierKeyword.STRICTFP_KEYWORD,
+          ModifierKeyword.DEFAULT_KEYWORD);
 
   /**
    * Reorders the given list of <code>Modifier</code> nodes into their suggested order by the JLS.
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/RedundantModifierQuickfix.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/RedundantModifierQuickfix.java
@@ -91,12 +91,10 @@ public boolean visit(MethodDeclaration node) {
         if (node.getParent() instanceof TypeDeclaration) {
           TypeDeclaration type = (TypeDeclaration) node.getParent();
           if (type.isInterface()) {
-            redundantKeyWords = Arrays
-                    .asList(new ModifierKeyword[] { ModifierKeyword.PUBLIC_KEYWORD,
-                        ModifierKeyword.ABSTRACT_KEYWORD, ModifierKeyword.FINAL_KEYWORD });
+            redundantKeyWords = List.of(ModifierKeyword.PUBLIC_KEYWORD,
+                    ModifierKeyword.ABSTRACT_KEYWORD, ModifierKeyword.FINAL_KEYWORD);
           } else if (Modifier.isFinal(type.getModifiers())) {
-            redundantKeyWords = Arrays
-                    .asList(new ModifierKeyword[] { ModifierKeyword.FINAL_KEYWORD });
+            redundantKeyWords = List.of(ModifierKeyword.FINAL_KEYWORD);
           }
         }
 
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java
@@ -296,18 +296,22 @@ private void updateLabel() {
       Stats stats = getStats();
       if (stats != null) {
         String text = NLS.bind(Messages.MarkerStatsView_lblOverviewMessage,
-                new Object[] { Integer.valueOf(stats.getMarkerCount()),
+                new Object[] {
+                    Integer.valueOf(stats.getMarkerCount()),
                     Integer.valueOf(stats.getMarkerStats().size()),
-                    Integer.valueOf(stats.getMarkerCountAll()) });
+                    Integer.valueOf(stats.getMarkerCountAll()),
+                });
         mDescLabel.setText(text);
       } else {
         mDescLabel.setText("");
       }
     } else {
 
       String text = NLS.bind(Messages.MarkerStatsView_lblDetailMessage,
-              new Object[] { mDetailViewer.getCurrentDetailCategory(),
-                  Integer.valueOf(mDetailViewer.getTable().getItemCount()) });
+              new Object[] {
+                  mDetailViewer.getCurrentDetailCategory(),
+                  Integer.valueOf(mDetailViewer.getTable().getItemCount()),
+              });
       mDescLabel.setText(text);
     }
   }
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilter.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilter.java
@@ -133,7 +133,9 @@ public IMarker[] findMarkers(IProgressMonitor mon) throws CoreException {
     if (enabled) {
       unfiltered = switch (onResource) {
         case ON_ANY_RESOURCE -> findCheckstyleMarkers(
-                new IResource[] { ResourcesPlugin.getWorkspace().getRoot() },
+                new IResource[] {
+                    ResourcesPlugin.getWorkspace().getRoot(),
+                },
                 IResource.DEPTH_INFINITE, mon);
         case ON_SELECTED_RESOURCE_ONLY -> findCheckstyleMarkers(focusResources,
                 IResource.DEPTH_ZERO, mon);
@@ -148,7 +150,9 @@ public IMarker[] findMarkers(IProgressMonitor mon) throws CoreException {
       };
     } else {
       unfiltered = findCheckstyleMarkers(
-              new IResource[] { ResourcesPlugin.getWorkspace().getRoot() },
+              new IResource[] {
+                  ResourcesPlugin.getWorkspace().getRoot(),
+              },
               IResource.DEPTH_INFINITE, mon);
     }
 
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/internal/CheckstyleMarkerFilterDialog.java
@@ -415,7 +415,9 @@ public void widgetSelected(SelectionEvent e) {
                 .createWorkingSetSelectionDialog(getShell(), false);
 
         if (mSelectedWorkingSet != null) {
-          dialog.setSelection(new IWorkingSet[] { mSelectedWorkingSet });
+          dialog.setSelection(new IWorkingSet[] {
+              mSelectedWorkingSet,
+          });
         }
         if (dialog.open() == Window.OK) {
           IWorkingSet[] result = dialog.getSelection();

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,9 @@ protected final IProject[] build(final int kind, @SuppressWarnings("rawtypes") f`
`191`	`191`	`marker.setAttributes(markerAttributes);`
`192`	`192`	`}`
`193`	`193`
`194`		`- return new IProject[] { project };`
	`194`	`+ return new IProject[] {`
	`195`	`+ project,`
	`196`	`+ };`
`195`	`197`	`}`
`196`	`198`
`197`	`199`	`@Override`