Skip to content

[cq] Some minor Java language cleanups #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2025
Merged

[cq] Some minor Java language cleanups #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ abstract class DartPubActionBase : AnAction(), DumbAware {
private var myProcessHandler: OSProcessHandler? = null

init {
registerCustomShortcutSet(CommonShortcuts.getRerun(), info.console.getComponent())
registerCustomShortcutSet(CommonShortcuts.getRerun(), info.console.component)
}

fun setProcessHandler(processHandler: OSProcessHandler) {
Expand Down
4 changes: 3 additions & 1 deletion third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.jetbrains.lang.dart.DartComponentType;
import org.jetbrains.annotations.Nullable;

import java.util.Objects;

public class DartComponentInfo {
private final @Nullable DartComponentType myComponentType;
private final @Nullable String myLibraryName;
Expand All @@ -29,7 +31,7 @@ public boolean equals(Object o) {
DartComponentInfo info = (DartComponentInfo)o;

if (myComponentType != info.myComponentType) return false;
if (myLibraryName != null ? !myLibraryName.equals(info.myLibraryName) : info.myLibraryName != null) return false;
if (!Objects.equals(myLibraryName, info.myLibraryName)) return false;

return true;
}
Expand Down
3 changes: 2 additions & 1 deletion third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Objects;
import java.util.Set;

public class DartImportOrExportInfo implements DartShowHideInfo {
Expand Down Expand Up @@ -58,7 +59,7 @@ public boolean equals(Object o) {

if (myKind != info.myKind) return false;
if (!myUri.equals(info.myUri)) return false;
if (myImportPrefix != null ? !myImportPrefix.equals(info.myImportPrefix) : info.myImportPrefix != null) return false;
if (!Objects.equals(myImportPrefix, info.myImportPrefix)) return false;
if (!myShowComponents.equals(info.myShowComponents)) return false;
if (!myHideComponents.equals(info.myHideComponents)) return false;

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/jetbrains/lang/dart/ide/template/macro/DartClassNameMethodNameMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public Result calculateResult(Expression @NotNull [] params, final ExpressionCon
final Result methodNameResult = (new DartMethodNameMacro()).calculateResult(params, context);

if (classNameResult != null && methodNameResult != null) {
return new TextResult(classNameResult.toString() + "." + methodNameResult.toString());
return new TextResult(classNameResult + "." + methodNameResult);
}
else if (classNameResult == null && methodNameResult != null) {
return new TextResult(methodNameResult.toString());
Expand Down
4 changes: 2 additions & 2 deletions third_party/src/main/java/com/jetbrains/lang/dart/util/DartPresentableUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ else if (simpleFormalParameter != null) {
}
else {
if (displayFinalKeyword && simpleFormalParameter.isFinal()) {
result.append(DartTokenTypes.FINAL.toString());
result.append(DartTokenTypes.FINAL);
result.append(SPACE);
}
final DartType type = simpleFormalParameter.getType();
Expand All @@ -153,7 +153,7 @@ else if (simpleFormalParameter != null) {
}
else {
if (displayFinalKeyword && simpleFormalParameter.isFinal()) {
result.append(DartTokenTypes.FINAL.toString());
result.append(DartTokenTypes.FINAL);
result.append(SPACE);
}
final DartType type = simpleFormalParameter.getType();
Expand Down
4 changes: 2 additions & 2 deletions third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ else if (quotedDartString.startsWith(R_QUOTE)) {
}

final DartUriElement uriElement = partOfStatement.getUriElement();
assert uriElement != null : "[" + partOfStatement.toString() + "]";
assert uriElement != null : "[" + partOfStatement + "]";

final String uri = uriElement.getUriStringAndItsRange().first;
final VirtualFile file = DartResolveUtil.getRealVirtualFile(partOfStatement.getContainingFile());
Expand All @@ -121,7 +121,7 @@ else if (quotedDartString.startsWith(R_QUOTE)) {
}

final DartUriElement uriElement = partOfStatement.getUriElement();
assert uriElement != null : "[" + partOfStatement.toString() + "]";
assert uriElement != null : "[" + partOfStatement + "]";

final String uri = uriElement.getUriStringAndItsRange().first;
final VirtualFile file = DartResolveUtil.getRealVirtualFile(partOfStatement.getContainingFile());
Expand Down