version 1.21.2

jmgrassau · jmgrassau · commit ffeca1bc2c3c · 2025-07-03T17:34:37.000+02:00
diff --git a/com.sap.adt.abapcleaner.app/abapcleaner.product b/com.sap.adt.abapcleaner.app/abapcleaner.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="ABAP cleaner" uid="com.sap.adt.abapcleaner.app" application="com.sap.adt.abapcleaner.standalone.app" version="1.21.2.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="ABAP cleaner" uid="com.sap.adt.abapcleaner.app" application="com.sap.adt.abapcleaner.standalone.app" version="1.21.2" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/com.sap.adt.abapcleaner.app/pom.xml b/com.sap.adt.abapcleaner.app/pom.xml
@@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sap.adt.abapcleaner</groupId>
   <artifactId>com.sap.adt.abapcleaner.app</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>com.sap.adt.abapcleaner.app</name>
   <packaging>eclipse-repository</packaging>
 
   <parent>
     <artifactId>parent</artifactId>
     <groupId>com.sap.adt.abapcleaner</groupId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/com.sap.adt.abapcleaner.feature/feature.xml b/com.sap.adt.abapcleaner.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.sap.adt.abapcleaner.feature"
       label="ABAP cleaner"
-      version="1.21.2.qualifier">
+      version="1.21.2">
 
    <description>
       ABAP cleaner plug-in for ABAP Development Tools
diff --git a/com.sap.adt.abapcleaner.feature/pom.xml b/com.sap.adt.abapcleaner.feature/pom.xml
@@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <modelVersion>4.0.0</modelVersion>
   <artifactId>com.sap.adt.abapcleaner.feature</artifactId>
   <groupId>com.sap.adt.abapcleaner</groupId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>com.sap.adt.abapcleaner.feature</name>
   <packaging>eclipse-feature</packaging>
 
   <parent>
     <artifactId>parent</artifactId>
     <groupId>com.sap.adt.abapcleaner</groupId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF b/com.sap.adt.abapcleaner.gui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.sap.adt.abapcleaner.gui;singleton:=true
-Bundle-Version: 1.21.2.qualifier
+Bundle-Version: 1.21.2
 Bundle-Vendor: %Provider-Name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.sap.adt.abapcleaner.gui/pom.xml b/com.sap.adt.abapcleaner.gui/pom.xml
@@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sap.adt.abapcleaner</groupId>
   <artifactId>com.sap.adt.abapcleaner.gui</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>com.sap.adt.abapcleaner.gui</name>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <artifactId>parent</artifactId>
     <groupId>com.sap.adt.abapcleaner</groupId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/com.sap.adt.abapcleaner.updatesite/pom.xml b/com.sap.adt.abapcleaner.updatesite/pom.xml
@@ -2,14 +2,14 @@
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>com.sap.adt.abapcleaner.updatesite</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>ABAP Cleaner for ABAP Development Tools (ADT)</name>
   <packaging>eclipse-repository</packaging>
 
   <parent>
     <artifactId>parent</artifactId>
     <groupId>com.sap.adt.abapcleaner</groupId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/com.sap.adt.abapcleaner/META-INF/MANIFEST.MF b/com.sap.adt.abapcleaner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.sap.adt.abapcleaner;singleton:=true
-Bundle-Version: 1.21.2.qualifier
+Bundle-Version: 1.21.2
 Bundle-Vendor: %Provider-Name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/com.sap.adt.abapcleaner/pom.xml b/com.sap.adt.abapcleaner/pom.xml
@@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sap.adt.abapcleaner</groupId>
   <artifactId>com.sap.adt.abapcleaner</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>com.sap.adt.abapcleaner</name>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <artifactId>parent</artifactId>
     <groupId>com.sap.adt.abapcleaner</groupId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/com.sap.adt.abapcleaner/src/com/sap/adt/abapcleaner/rules/ddl/alignment/DdlAlignDataSourcesRule.java b/com.sap.adt.abapcleaner/src/com/sap/adt/abapcleaner/rules/ddl/alignment/DdlAlignDataSourcesRule.java
@@ -296,7 +296,7 @@ private void alignTable(Code code, AlignTable table) throws UnexpectedSyntaxExce
 			AlignColumn dataSourceColumn = table.getColumn(columnWithDataSources.getValue());
 			for (int line = 0; line < table.getLineCount(); ++line) {
 				AlignCellTerm dataSourceCell = (AlignCellTerm)dataSourceColumn.getCellFromLine(line);
-				if (!dataSourceCell.getTerm().isOnSingleLine()) {
+				if (dataSourceCell != null && !dataSourceCell.getTerm().isOnSingleLine()) {
 					int condensedWidth = dataSourceCell.getLastToken().getEndIndexInLine() - dataSourceCell.getFirstToken().getStartIndexInLine();
 					dataSourceCell.setOverrideTextWidth(condensedWidth);
 				}
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -6,6 +6,26 @@ as well as bugfixes of reported issues, i.e. anything that enhances or changes t
 For a complete list of changes (including documentation, tests, refactoring etc.), please refer to 
 the list of [commits](../../../commits/main).
 
+## 2025-07-03 (version 1.21.2)
+
+Many **thanks** to [**mraht**](https://github.com/mraht), [**kjetil-kilhavn**](https://github.com/kjetil-kilhavn),
+ [**fabianlupa**](https://github.com/fabianlupa), [**Plabbs**](https://github.com/Plabbs), [**matthewdjb**](https://github.com/matthewdjb),
+ [**Kaszub09**](https://github.com/Kaszub09), [**D029515**](https://github.com/D029515), [**vonglan**](https://github.com/vonglan),
+ [**jrodriguez-rc**](https://github.com/jrodriguez-rc) and [**VladGhitulescu**](https://github.com/VladGhitulescu) for the reporting the bugs behind these fixes!
+
+* Enhanced rule '**Unchain into multiple statements**' to **respect pseudo-comment** "#EC CHAIN_DECL_USAG ([#401](../../../issues/401))
+* Fixed rule '**Report unused parameters**' for **EXPORT** ... TO DATA BUFFER ([#415](../../../issues/415))
+* Fixed rule '**Delete unused variables**' for usage in **functional calls** ([#398](../../../issues/398))
+* Fixed rule '**Replace READ TABLE with table expression**' for IF ... **ENDIF on same line** ([#413](../../../issues/413))
+* Fixed rule '**Align declarations**' for **READ-ONLY** and line-end **comment** ([#409](../../../issues/409))
+* Fixed rule '**Align declarations**' for **comments** after TYPE ... TABLE ([#395](../../../issues/395))
+* Fixed rule '**Align keywords with second word of first line**' for **SUBMIT ... WITH** ([#396](../../../issues/396))
+* Fixed DDL rule '**Align JOINs and ASSOCIATIONs**' for **textual cardinality** ([#394](../../../issues/394))
+* Fixed **keyboard shortcuts** with CTRL for **macOS** ([#407](../../../issues/407))
+* Fixed **Parser** for **SELECT** with **FIELDS** as final clause ([#400](../../../issues/400))
+* Updated **ABAP grammar file**
+* Updated **known CamelCase names** for CDS views and fields
+
 ## 2024-12-23 (version 1.21.1)
 
 **Thanks** to [**freakadunse**](https://github.com/freakadunse) for reporting the bug behind this release!
diff --git a/docs/rules.md b/docs/rules.md
@@ -1,6 +1,6 @@
 # Available Cleanup Rules
 
-ABAP cleaner offers 98 cleanup rules with a total of 463 configuration options:
+ABAP cleaner offers 98 cleanup rules with a total of 464 configuration options:
 
 ## Empty Lines
 
diff --git a/docs/rules/ChainRule.md b/docs/rules/ChainRule.md
@@ -4,6 +4,8 @@
 
 Resolves a chain \(DATA:, FIELD-SYMBOLS:, ASSERT: etc.\) into multiple standalone statements. The chain is kept, however, for structure declarations with BEGIN OF ... END OF.
 
+You can use the pseudo-comment "\#EC CHAIN\_DECL\_USAG \(after the colon\) to deactivate the rule for a specific declaration.
+
 This rule is part of the **essential** profile, as it is explicitly demanded by the [Clean ABAP Styleguide](https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md).
 
 ## References
diff --git a/docs/rules/DdlAlignDataSourcesRule.md b/docs/rules/DdlAlignDataSourcesRule.md
@@ -12,6 +12,7 @@ Whether to break ON conditions to the next line is configured in 'Break before J
 * \[X\] Align aliases
 * \[X\] Align ON conditions that continue on the same line
 * \[ \] Align ASSOCIATIONs together with JOINs
+* \[X\] Align TO keywords in ASSOCIATIONs with textual cardinality
 * \[ \] Consider all lines of multi-line parameter assignments
 
 ## Examples
@@ -62,11 +63,11 @@ union all
     left outer to one join I_FourthSource2( P_AnyParam   : 'any literal'
                                             P_OtherParam : 42 ) as FourthAlias on AnyAlias.AnyField = FourthAlias.OtherField
 
-  association [0..*] to I_FifthSource2 as _FifthAlias on _FifthAlias.AnyField = AnyAlias.AnyField
+  association of one to many I_FifthSource2 as _FifthAlias on _FifthAlias.AnyField = AnyAlias.AnyField
 
-  association [0..1] to I_SixthSourceWithLongName2 as _SixthAlias on  _SixthAlias.AnyField   = AnyAlias.AnyField
-                                                                  and _SixthAlias.OtherField = AnyAlias.OtherField
-                                                                  and _SixthAlias.ThirdField = ThirdAlias.ThirdField
+  association of exact one to one I_SixthSourceWithLongName2 as _SixthAlias on  _SixthAlias.AnyField   = AnyAlias.AnyField
+                                                                            and _SixthAlias.OtherField = AnyAlias.OtherField
+                                                                            and _SixthAlias.ThirdField = ThirdAlias.ThirdField
 
 {
   key AnyAlias.AnyField,
@@ -123,11 +124,11 @@ union all
     left outer to one join I_FourthSource2( P_AnyParam   : 'any literal'
                                             P_OtherParam : 42 ) as FourthAlias            on AnyAlias.AnyField = FourthAlias.OtherField
 
-  association [0..*] to I_FifthSource2             as _FifthAlias on _FifthAlias.AnyField = AnyAlias.AnyField
+  association of one       to many I_FifthSource2             as _FifthAlias on _FifthAlias.AnyField = AnyAlias.AnyField
 
-  association [0..1] to I_SixthSourceWithLongName2 as _SixthAlias on  _SixthAlias.AnyField   = AnyAlias.AnyField
-                                                                  and _SixthAlias.OtherField = AnyAlias.OtherField
-                                                                  and _SixthAlias.ThirdField = ThirdAlias.ThirdField
+  association of exact one to one  I_SixthSourceWithLongName2 as _SixthAlias on  _SixthAlias.AnyField   = AnyAlias.AnyField
+                                                                             and _SixthAlias.OtherField = AnyAlias.OtherField
+                                                                             and _SixthAlias.ThirdField = ThirdAlias.ThirdField
 
 {
   key AnyAlias.AnyField,
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sap.adt.abapcleaner</groupId>
   <artifactId>parent</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>ABAP cleaner</name>
   <packaging>pom</packaging>
   <modules>
diff --git a/test/com.sap.adt.abapcleaner.test/META-INF/MANIFEST.MF b/test/com.sap.adt.abapcleaner.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Unit Tests for com.sap.adt.abapcleaner
 Bundle-SymbolicName: com.sap.adt.abapcleaner.test;singleton:=true
-Bundle-Version: 1.21.2.qualifier
+Bundle-Version: 1.21.2
 Bundle-Vendor: abap-dev
 Fragment-Host: com.sap.adt.abapcleaner
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/test/com.sap.adt.abapcleaner.test/pom.xml b/test/com.sap.adt.abapcleaner.test/pom.xml
@@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sap.adt.abapcleaner</groupId>
   <artifactId>com.sap.adt.abapcleaner.test</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>com.sap.adt.abapcleaner.test</name>
   <packaging>eclipse-test-plugin</packaging>
 
   <parent>
     <artifactId>tests</artifactId>
     <groupId>com.sap.adt.abapcleaner</groupId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/test/pom.xml b/test/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sap.adt.abapcleaner</groupId>
   <artifactId>tests</artifactId>
-  <version>1.21.2-SNAPSHOT</version>
+  <version>1.21.2</version>
   <name>Test Fragments</name>
   <packaging>pom</packaging>
 
   <parent>
     <groupId>com.sap.adt.abapcleaner</groupId>
     <artifactId>parent</artifactId>
-    <version>1.21.2-SNAPSHOT</version>
+    <version>1.21.2</version>
     <relativePath>../</relativePath>
   </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ private void alignTable(Code code, AlignTable table) throws UnexpectedSyntaxExce`
`296`	`296`	`AlignColumn dataSourceColumn = table.getColumn(columnWithDataSources.getValue());`
`297`	`297`	`for (int line = 0; line < table.getLineCount(); ++line) {`
`298`	`298`	`AlignCellTerm dataSourceCell = (AlignCellTerm)dataSourceColumn.getCellFromLine(line);`
`299`		`- if (!dataSourceCell.getTerm().isOnSingleLine()) {`
	`299`	`+ if (dataSourceCell != null && !dataSourceCell.getTerm().isOnSingleLine()) {`
`300`	`300`	`int condensedWidth = dataSourceCell.getLastToken().getEndIndexInLine() - dataSourceCell.getFirstToken().getStartIndexInLine();`
`301`	`301`	`dataSourceCell.setOverrideTextWidth(condensedWidth);`
`302`	`302`	`}`