Skip to content

[Formatter] Do not escape annotations inside snippet tags#4851

Merged
SougandhS merged 1 commit intoeclipse-jdt:masterfrom
SougandhS:InvalidCharFormatter
Mar 3, 2026
Merged

[Formatter] Do not escape annotations inside snippet tags#4851
SougandhS merged 1 commit intoeclipse-jdt:masterfrom
SougandhS:InvalidCharFormatter

Conversation

@SougandhS
Copy link
Copy Markdown
Member

@SougandhS SougandhS commented Feb 18, 2026

The formatter currently converts lines starting with '@' into
image inside snippet bodies. This commit prevents snippets to be marked as escape strings

Fixes : #2071

What it does

How to test

Author checklist

@SougandhS
Copy link
Copy Markdown
Member Author

Hi @mateusz-matela,
Could you please check this PR when you get some time ?

Copy link
Copy Markdown
Member

@mateusz-matela mateusz-matela left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just one trivial suggestion, otherwise good to go!

@SougandhS SougandhS force-pushed the InvalidCharFormatter branch from 41eff42 to 04cb408 Compare March 2, 2026 05:44
@eclipse-jdt-bot
Copy link
Copy Markdown
Contributor

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.core.tests.model/META-INF/MANIFEST.MF
org.eclipse.jdt.core.tests.model/pom.xml
org.eclipse.jdt.core/META-INF/MANIFEST.MF
org.eclipse.jdt.core/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 a3ec02e0a0fdc60412ca26241390aae3baa7ebde Mon Sep 17 00:00:00 2001
From: Eclipse JDT Bot <jdt-bot@eclipse.org>
Date: Mon, 2 Mar 2026 05:48:42 +0000
Subject: [PATCH] Version bump(s) for 4.40 stream


diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
index aa5c6b00cf..b7e54e66b3 100644
--- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.tests.model;singleton:=true
-Bundle-Version: 3.13.700.qualifier
+Bundle-Version: 3.13.800.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jdt.core.tests,
diff --git a/org.eclipse.jdt.core.tests.model/pom.xml b/org.eclipse.jdt.core.tests.model/pom.xml
index 543b2b5542..9a5f15b809 100644
--- a/org.eclipse.jdt.core.tests.model/pom.xml
+++ b/org.eclipse.jdt.core.tests.model/pom.xml
@@ -19,7 +19,7 @@
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <artifactId>org.eclipse.jdt.core.tests.model</artifactId>
-  <version>3.13.700-SNAPSHOT</version>
+  <version>3.13.800-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
index 349cfc604c..a2de32def2 100644
--- a/org.eclipse.jdt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
-Bundle-Version: 3.45.0.qualifier
+Bundle-Version: 3.45.100.qualifier
 Bundle-Activator: org.eclipse.jdt.core.JavaCore
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml
index d3e8348cb1..49fe6a292a 100644
--- a/org.eclipse.jdt.core/pom.xml
+++ b/org.eclipse.jdt.core/pom.xml
@@ -17,7 +17,7 @@
     <version>4.40.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.jdt.core</artifactId>
-  <version>3.45.0-SNAPSHOT</version>
+  <version>3.45.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
-- 
2.53.0

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

@SougandhS SougandhS force-pushed the InvalidCharFormatter branch from 562cc86 to a55d31f Compare March 3, 2026 04:01
The formatter currently converts lines starting with '@' into '&eclipse-jdt#64;'
inside snippet bodies. This commit prevents snippets to be marked as
escape strings

Fixes : eclipse-jdt#2071
@SougandhS SougandhS force-pushed the InvalidCharFormatter branch from a55d31f to 4697a08 Compare March 3, 2026 09:58
@SougandhS SougandhS merged commit d478cbe into eclipse-jdt:master Mar 3, 2026
8 checks passed
@SougandhS SougandhS deleted the InvalidCharFormatter branch March 3, 2026 11:14
@SougandhS
Copy link
Copy Markdown
Member Author

Thanks @mateusz-matela !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Javadoc @snippet blocks: Formatter replaces "@" with &#64;

3 participants