Skip to content

[CQ] Nullability: add missing annotations to overrides #8147

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.

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 3 commits into from
May 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public String getReportActionText() {
}

//@Override
public boolean submit(@NotNull IdeaLoggingEvent[] events,
public boolean submit(@NotNull IdeaLoggingEvent @NotNull [] events,
@Nullable String additionalInfo,
@NotNull Component parentComponent,
@NotNull Consumer<? super SubmittedReportInfo> consumer) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@
public class FlutterProjectOpenProcessor extends ProjectOpenProcessor {
private static final Logger LOG = Logger.getInstance(FlutterProjectOpenProcessor.class);

@NotNull
@Override
public String getName() {
public @NotNull String getName() {
return FlutterBundle.message("flutter.module.name");
}

Expand Down
8 changes: 5 additions & 3 deletions flutter-idea/src/io/flutter/run/FlutterPositionMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ public FlutterPositionMapper(@NotNull Project project,

@NotNull
public Project getProject() {
return project;
// Project may be null after shutdown but clients have no business accessing it after that so it's reasonable to fail here.
return Objects.requireNonNull(project);
}

public void onConnect(@NotNull DartVmServiceDebugProcess.ScriptProvider provider, @Nullable String remoteBaseUri) {
Expand Down Expand Up @@ -330,9 +331,10 @@ protected VirtualFile findLocalFile(@NotNull String uri, CompletableFuture<Strin
if (analyzer != null && !isDartPatchUri(remoteUri)) {
final String path = analyzer.getAbsolutePath(remoteUri);
if (path != null) {
if(path.startsWith("file://")) {
if (path.startsWith("file://")) {
LocalFileSystem.getInstance().findFileByPath(path.substring(7));
} else {
}
else {
LocalFileSystem.getInstance().findFileByPath(path);
}
}
Expand Down
16 changes: 8 additions & 8 deletions flutter-idea/src/io/flutter/run/SdkRunConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static class RecursiveDeleter extends SimpleFileVisitor<Path> {
}

@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
public @NotNull FileVisitResult visitFile(Path file, @NotNull BasicFileAttributes attrs) {
final Path name = file.getFileName();
if (name != null && matcher.matches(name)) {
try {
Expand All @@ -111,12 +111,12 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
}

@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
public @NotNull FileVisitResult preVisitDirectory(@NotNull Path dir, @NotNull BasicFileAttributes attrs) {
return CONTINUE;
}

@Override
public FileVisitResult visitFileFailed(Path file, IOException exc) {
public @NotNull FileVisitResult visitFileFailed(@NotNull Path file, @NotNull IOException exc) {
FlutterUtils.warn(LOG, exc);
return CONTINUE;
}
Expand Down Expand Up @@ -199,11 +199,11 @@ public LaunchState getState(@NotNull Executor executor, @NotNull ExecutionEnviro
}

static @NotNull FlutterApp getFlutterApp(@NotNull ExecutionEnvironment env,
@NotNull FlutterDevice device,
Project project,
Module module,
RunMode mode,
GeneralCommandLine command) throws ExecutionException {
@NotNull FlutterDevice device,
Project project,
Module module,
RunMode mode,
GeneralCommandLine command) throws ExecutionException {
final FlutterApp app = FlutterApp.start(env, project, module, mode, device, command,
StringUtil.capitalize(mode.mode()) + "App",
"StopApp");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,28 @@
*/
package io.flutter.run.coverage;

import com.intellij.coverage.CoverageAnnotator;
import com.intellij.coverage.CoverageEngine;
import com.intellij.coverage.CoverageFileProvider;
import com.intellij.coverage.CoverageRunner;
import com.intellij.coverage.CoverageSuite;
import com.intellij.coverage.CoverageSuitesBundle;
import com.intellij.coverage.*;
import com.intellij.execution.configurations.RunConfigurationBase;
import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.configurations.WrappingRunConfiguration;
import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
import com.intellij.execution.testframework.AbstractTestProxy;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.jetbrains.lang.dart.DartFileType;
import com.jetbrains.lang.dart.psi.DartFile;
import io.flutter.FlutterBundle;
import io.flutter.FlutterUtils;
import io.flutter.pub.PubRoot;
import io.flutter.run.test.TestConfig;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.io.File;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class FlutterCoverageEngine extends CoverageEngine {

public static FlutterCoverageEngine getInstance() {
Expand Down Expand Up @@ -134,16 +125,6 @@ public String getQualifiedName(@NotNull final File outputFile,
return qualifiedNames;
}

@Override
public List<PsiElement> findTestsByNames(@NotNull String[] testNames, @NotNull Project project) {
return null;
}

@Override
public @Nullable String getTestMethodName(@NotNull PsiElement element, @NotNull AbstractTestProxy testProxy) {
return null;
}

@Override
public String getPresentableText() {
return FlutterBundle.message("flutter.coverage.presentable.text");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import org.jetbrains.annotations.NotNull;

import java.util.Iterator;

Expand All @@ -27,7 +28,7 @@ public boolean isEmpty() {
}

@Override
public Iterator<T> iterator() {
public @NotNull Iterator<T> iterator() {
return new Iterator<T>() {
int index = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public class OpenAndroidModule extends OpenInAndroidStudioAction implements DumbAware {
@Override
public void actionPerformed(AnActionEvent e) {
public void actionPerformed(@NotNull AnActionEvent e) {
final VirtualFile projectFile = findProjectFile(e);
if (projectFile == null) {
FlutterMessages.showError("Error Opening Android Studio", "Project not found.", e.getProject());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ protected EmbeddedAndroidProject(@NotNull Path filePath) {

static final String TEMPLATE_PROJECT_NAME = "_android";

public String getLocationHash() {
public @NotNull String getLocationHash() {
return "";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import com.intellij.projectImport.ProjectOpenProcessor;
import com.intellij.ui.EditorNotifications;
import io.flutter.FlutterUtils;
//import io.flutter.project.FlutterProjectCreator;
import io.flutter.project.FlutterProjectOpenProcessor;
import io.flutter.pub.PubRoot;
import io.flutter.utils.FlutterModuleUtils;
Expand All @@ -20,7 +19,7 @@

public class FlutterStudioProjectOpenProcessor extends FlutterProjectOpenProcessor {
@Override
public String getName() {
public @NotNull String getName() {
return "Flutter Studio";
}

Expand Down