Skip to content

Adding missing @Override annotations. Some refactoring - #45

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

Adding missing @Override annotations. Some refactoring#45
VISTALL merged 1 commit into
consulo:masterfrom
unv-unv:overrides

Conversation

@unv-unv

@unv-unv unv-unv commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@unv-unv

unv-unv commented Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

@claude review pr with inline comments

@github-actions

github-actions Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

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


PR Review: Adding missing @OverRide annotations, refactoring

I reviewed the full diff (git diff origin/master...HEAD). This is a clean, mostly-mechanical PR — adding @Override, converting anonymous classes to lambdas, diamond operator, dropping redundant final, unboxing cleanups, and import reordering. I found no functional/behavioral bugs: the Boolean unboxing in GitSSHXmlRpcClient, the Integer exit-status simplification in SSHMain, and the Runnable cast in GitUserRegistry all preserve the original semantics.

The only recurring issue is cosmetic: mixed tabs vs. spaces. Several tab-indented files received new lines/blocks indented with spaces (the reformatting looks like it was done with a spaces-configured formatter). I left inline comments (with one-click suggestion blocks where a single line was affected):

  • Read the diff
  • Inspect indentation consistency
  • Post inline review comments

Inline comments left:

  • GitBranch.java:66@Override indented with spaces (file uses tabs) — suggestion
  • GitSSHXmlRpcClient.java:70@Override + reformatted signature/params use spaces; same for askPassphrase/replyToChallenge/askPasswordcomment
  • SSHMain.java:484 — new lambda body indented with spaces — comment
  • SSHMain.java:607@SuppressWarnings space-indented between tab lines — suggestion
  • GitReference.java:77SystemInfo.isFileSystemCaseSensitivePlatform.current().fs().isCaseSensitive(); worth confirming semantic equivalence since it drives ref-name comparison — comment

Overall: 👍 Good, low-risk cleanup. Recommend normalizing the tab/space indentation on the reformatted blocks before merge (ideally by pointing the IDE/formatter at tabs for these files); everything else looks correct.

Note: I couldn't build/run the test suite for this review — the feedback above is based on static reading of the diff.

public abstract boolean isRemote();

@Nonnull
@Override

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.

This @Override is indented with 4 spaces, but the rest of this file is tab-indented (the @Nonnull line just above uses a tab). The same tab/space mismatch recurs on several other reformatted lines in this PR (see notes on GitSSHXmlRpcClient and SSHMain). Suggest keeping each file consistent with its existing indentation.

Suggested change
@Override
@Override

/**
* {@inheritDoc}
*/
@Override

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.

The added @Override and the reformatted method signature/parameters below it are indented with spaces, while this file uses tabs. Recommend re-indenting this block — and the analogous askPassphrase / replyToChallenge / askPassword blocks in this file — with tabs so the whole file stays consistent.

};
@SuppressWarnings({"HardCodedStringLiteral"}) final Thread t = new Thread(action, "Forwarding " + name);
Runnable action = () -> {
byte[] buffer = new byte[BUFFER_SIZE];

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.

Nice conversion of the anonymous Runnable to a lambda. One nit: the lambda body is indented with spaces, whereas the enclosing method uses tabs. Re-indenting the body with tabs would keep this file consistent.

*/
@SuppressWarnings({"UseOfObsoleteCollectionType"})
@Override
@SuppressWarnings({"UseOfObsoleteCollectionType"})

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.

This @SuppressWarnings line is space-indented while the surrounding @Override / @Nullable lines use tabs.

Suggested change
@SuppressWarnings({"UseOfObsoleteCollectionType"})
@SuppressWarnings({"UseOfObsoleteCollectionType"})

@Override
public int compareTo(GitReference o) {
return o == null ? 1 : StringUtil.compare(getFullName(), o.getFullName(), SystemInfo.isFileSystemCaseSensitive);
return o == null ? 1 : StringUtil.compare(getFullName(), o.getFullName(), Platform.current().fs().isCaseSensitive());

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.

Good move off the deprecated SystemInfo. Worth one confirmation on semantics: SystemInfo.isFileSystemCaseSensitive reflected the case-sensitivity of the filesystem the IDE runs on, and Platform.current().fs().isCaseSensitive() should be its intended replacement. Since this value drives Git reference name comparison, a quick check that the two are truly equivalent is worthwhile.

@VISTALL
VISTALL merged commit 11eaac2 into consulo:master Jul 7, 2026
1 check passed
@unv-unv
unv-unv deleted the overrides branch July 8, 2026 12:29
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