Skip to content

Adding missing @Override annotations (part 4). Adding RRA/RWA/RUI annotations. Some localization and refactoring - #14

Merged
VISTALL merged 1 commit into
consulo:masterfrom
unv-unv:overrides-4
Jul 26, 2026
Merged

Adding missing @Override annotations (part 4). Adding RRA/RWA/RUI annotations. Some localization and refactoring#14
VISTALL merged 1 commit into
consulo:masterfrom
unv-unv:overrides-4

Conversation

@unv-unv

@unv-unv unv-unv commented Jul 26, 2026

Copy link
Copy Markdown
Contributor

No description provided.

…otations. Some localization and refactoring.
@unv-unv

unv-unv commented Jul 26, 2026

Copy link
Copy Markdown
Contributor Author

@claude review pr with inline comments

@github-actions

github-actions Bot commented Jul 26, 2026

Copy link
Copy Markdown
Contributor

Claude finished @unv-unv's task in 4m 40s —— View job


PR Review — Adding @OverRide / RRA-RWA-RUI annotations, localization & refactoring

  • Read repo guidelines (no AGENTS.md/CLAUDE.md present)
  • Analyze the diff (50 files, +685/-589)
  • Post inline review comments with suggestions
  • Post summary

Overall

This is a clean, well-scoped mechanical modernization PR. The bulk of it is safe and welcome:

  • @Override added throughout — no incorrect ones spotted.
  • @RequiredReadAction / @RequiredWriteAction / @RequiredUIAccess consistently applied to the relevant PSI/UI entry points.
  • LocalizationSpringBundle/AopBundleSpringLocalize/AopLocalize, passing LocalizeValue where APIs support it.
  • Modernization — diamond operators, pattern-matching instanceof, lambdas replacing anonymous classes, Objects.equals/hashCode, Couple.of, SimpleReference.
  • Nice incidental fixes — real typos corrected: createSpingBeancreateSpringBean, getRequredClassesgetRequiredClasses, aliasealias, SPRING_MODULE_QUALIIFIER key field renamed.

Inline comments

  1. LocalAopModel.java:37 — 6-space indentation on the return line (should be 4). Suggestion attached. The myHost.getModule() switch itself is fine.
  2. ParserUtil.java:43/57/71builder.error(...) now passes a LocalizeValue without .get(), unlike the sibling PrattBuilder calls and line 172 of the same file (which passes a String). Please confirm PsiBuilder#error has a LocalizeValue overload so this compiles.

Non-blocking observations (no inline suggestion — whole-file / informational)

  • Reindentation noiseMethodPatternPointcut.java and MethodPointcutDescriptor.java were reformatted from 2-space to 4-space indentation, while neighboring files in the same package (ParserUtil, GenericPattern) remain 2-space. This inflates the diff and makes the real changes harder to review; consider keeping the surrounding indentation style consistent.
  • Orphaned test filesaop-common/tests/.../MockAopAdvice.java and MockAopModel.java had their imports for com.intellij.util.xml.MockDomElement / com.intellij.mock.MockXmlTag removed, but still reference those types (extends MockDomElement, new MockXmlTag()). Those classes don't exist anywhere in the repo (they're legacy IntelliJ classes), so these test files already don't compile and appear excluded from the build — just flagging that the removed imports weren't a net change there.
  • JavaSpringJavaBean.javaclassType.resolve().getAllMethods() can NPE if resolve() returns null. This is pre-existing (the old code had the same risk) and not introduced here, but it'd be a good hardening opportunity while touching the method.

Nothing here is a blocker (pending the ParserUtil compile confirmation). Nice cleanup overall. 👍
· branch overrides-4

@RequiredReadAction
private AopModel getAopModel() {
return AopModuleService.getAopModel(myHost != null ? ModuleUtilCore.findModuleForPsiElement(myHost) : null);
return AopModuleService.getAopModel(myHost != null ? myHost.getModule() : null);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Indentation is off here — this line uses 6 spaces while the rest of the method body should be 4 (the file uses 2-space indentation). The myHost.getModule() switch itself is fine and matches the same ModuleUtilCore.findModuleForPsiElement(...)getModule() migration done in MissingAspectjAutoproxyInspection in this PR.

Suggested change
return AopModuleService.getAopModel(myHost != null ? myHost.getModule() : null);
return AopModuleService.getAopModel(myHost != null ? myHost.getModule() : null);

return true;
}
builder.error(AopBundle.message("error.0.expected", text));
builder.error(AopLocalize.error0Expected(text));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These three builder.error(...) calls (lines 43, 57, 71) now pass a LocalizeValue directly, whereas the sibling PrattBuilder calls (e.g. MethodPointcutDescriptor, AopPrattParser) call .get(), and line 172 of this same file still passes a plain String to builder.error(message).

Please confirm PsiBuilder#error has a LocalizeValue overload — if it only accepts String, this won't compile and you'd need AopLocalize.error0Expected(text).get(). If the overload exists, passing the LocalizeValue is the better form and no change is needed.

@VISTALL
VISTALL merged commit 1fa64fa into consulo:master Jul 26, 2026
1 check passed
@unv-unv
unv-unv deleted the overrides-4 branch July 26, 2026 19:06
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.

2 participants