@@ -87,7 +87,6 @@ public String mapResourceName(int classFileFormatVersion, String resourceName) {
87
87
patchHideGeneratedNodes (sm );
88
88
patchPostCompileHookEclipse (sm );
89
89
patchFixSourceTypeConverter (sm );
90
- patchDisableLombokForCodeCleanup (sm );
91
90
patchListRewriteHandleGeneratedMethods (sm );
92
91
patchSyntaxAndOccurrencesHighlighting (sm );
93
92
patchSortMembersOperation (sm );
@@ -206,14 +205,6 @@ private static void patchSyntaxAndOccurrencesHighlighting(ScriptManager sm) {
206
205
.build ());
207
206
}
208
207
209
- private static void patchDisableLombokForCodeCleanup (ScriptManager sm ) {
210
- sm .addScriptIfWitness (OSGI_TYPES , ScriptBuilder .exitEarly ()
211
- .target (new MethodTarget ("org.eclipse.jdt.core.dom.ASTNode" , "accept" , "void" , "org.eclipse.jdt.core.dom.ASTVisitor" ))
212
- .decisionMethod (new Hook ("lombok.launch.PatchFixesHider$PatchFixes" , "isRefactoringVisitorAndGenerated" , "boolean" , "org.eclipse.jdt.core.dom.ASTNode" , "org.eclipse.jdt.core.dom.ASTVisitor" ))
213
- .request (StackRequest .THIS , StackRequest .PARAM1 )
214
- .build ());
215
- }
216
-
217
208
private static void patchListRewriteHandleGeneratedMethods (ScriptManager sm ) {
218
209
sm .addScriptIfWitness (OSGI_TYPES , ScriptBuilder .replaceMethodCall ()
219
210
.target (new MethodTarget ("org.eclipse.jdt.internal.core.dom.rewrite.ASTRewriteAnalyzer$ListRewriter" , "rewriteList" ))
@@ -308,6 +299,12 @@ private static void patchHideGeneratedNodes(ScriptManager sm) {
308
299
"org.eclipse.jdt.core.dom.SimpleName[]" ))
309
300
.request (StackRequest .RETURN_VALUE ).build ());
310
301
302
+ sm .addScriptIfWitness (OSGI_TYPES , ScriptBuilder .exitEarly ()
303
+ .target (new MethodTarget ("org.eclipse.jdt.core.dom.ASTNode" , "accept" , "void" , "org.eclipse.jdt.core.dom.ASTVisitor" ))
304
+ .decisionMethod (new Hook ("lombok.launch.PatchFixesHider$PatchFixes" , "isBlockedVisitorAndGenerated" , "boolean" , "org.eclipse.jdt.core.dom.ASTNode" , "org.eclipse.jdt.core.dom.ASTVisitor" ))
305
+ .request (StackRequest .THIS , StackRequest .PARAM1 )
306
+ .build ());
307
+
311
308
patchRefactorScripts (sm );
312
309
patchFormatters (sm );
313
310
}
0 commit comments