Skip to content

Commit 29ce7fb

Browse files
authored
[CQ] remove (dead) empty methods (#8106)
More opportunistic tidying. 🧹 Remove unused empty method bodies. (Also a rogue `;`.) 🧹 Simplify a boolean expression. --- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR. <details> <summary>Contribution guidelines:</summary><br> - See our [contributor guide]([https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview) for general expectations for PRs. - Larger or significant changes should be discussed in an issue before creating a PR. - Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`. - Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](#8098)). </details>
1 parent ac6e7e6 commit 29ce7fb

File tree

5 files changed

+10
-21
lines changed

5 files changed

+10
-21
lines changed

flutter-idea/src/io/flutter/editor/OutlineLocation.java

-3
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ public OutlineLocation(
139139
this.indent = indent;
140140
}
141141

142-
public void dispose() {
143-
}
144-
145142
/**
146143
* This method must be called if the location is set to update to reflect
147144
* edits to the document.

flutter-idea/src/io/flutter/sdk/FlutterCreateAdditionalSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public List<String> getArgs() {
127127
args.add(org);
128128
}
129129

130-
if (kotlin == null || Boolean.FALSE.equals(kotlin)) {
130+
if (kotlin == null || !kotlin) {
131131
args.add("--android-language");
132132
args.add("java");
133133
}

flutter-idea/src/io/flutter/sdk/FlutterPluginsLibraryManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private void updateFlutterPluginsImpl() {
142142
}
143143

144144
for (String packagePath : packagesMap.values()) {
145-
if (packagePath == null) continue;;
145+
if (packagePath == null) continue;
146146
final VirtualFile libFolder = LocalFileSystem.getInstance().findFileByPath(packagePath);
147147
if (libFolder == null) {
148148
continue;

flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java

+8-13
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848
import com.intellij.openapi.vfs.VirtualFileContentsChangedAdapter;
4949
import com.intellij.openapi.vfs.VirtualFileManager;
5050
import com.intellij.serviceContainer.ComponentManagerImpl;
51-
import com.intellij.util.ReflectionUtil;
51+
import com.intellij.util.ReflectionUtil;
5252
import com.intellij.util.modules.CircularModuleDependenciesDetector;
5353
import io.flutter.sdk.AbstractLibraryManager;
5454
import io.flutter.sdk.FlutterSdkUtil;
5555
import io.flutter.settings.FlutterSettings;
5656
import io.flutter.utils.FlutterModuleUtils;
57+
5758
import java.lang.reflect.InvocationTargetException;
5859
import java.lang.reflect.Method;
5960
import java.nio.file.Path;
@@ -62,6 +63,7 @@
6263
import java.util.concurrent.atomic.AtomicBoolean;
6364
import java.util.function.Function;
6465
import java.util.stream.Collectors;
66+
6567
import org.jetbrains.android.facet.AndroidFacet;
6668
import org.jetbrains.annotations.NotNull;
6769
import org.jetbrains.annotations.Nullable;
@@ -91,7 +93,7 @@ public AndroidModuleLibraryManager(@NotNull Project project) {
9193
}
9294

9395
public void update() {
94-
doGradleSync(getProject(), this::scheduleAddAndroidLibraryDeps);
96+
doGradleSync(getProject(), androidProject -> androidProject != null ? scheduleAddAndroidLibraryDeps(androidProject) : null);
9597
}
9698

9799
private Void scheduleAddAndroidLibraryDeps(@NotNull Project androidProject) {
@@ -198,7 +200,7 @@ private void scheduleUpdate() {
198200
}
199201

200202
final Runnable runnable = this::updateAndroidLibraries;
201-
DumbService.getInstance(getProject()).smartInvokeLater(runnable, ModalityState.NON_MODAL);
203+
DumbService.getInstance(getProject()).smartInvokeLater(runnable, ModalityState.nonModal());
202204
}
203205

204206
private void updateAndroidLibraries() {
@@ -208,7 +210,7 @@ private void updateAndroidLibraries() {
208210
update();
209211
}
210212

211-
private void doGradleSync(Project flutterProject, Function<Project, Void> callback) {
213+
private void doGradleSync(@NotNull Project flutterProject, @NotNull Function<Project, Void> callback) {
212214
// TODO(messick): Collect URLs for all Android modules, including those within plugins.
213215
VirtualFile dir = flutterProject.getBaseDir().findChild("android");
214216
if (dir == null) dir = flutterProject.getBaseDir().findChild(".android"); // For modules.
@@ -218,13 +220,6 @@ private void doGradleSync(Project flutterProject, Function<Project, Void> callba
218220
Disposer.register(flutterProject, androidProject);
219221

220222
GradleSyncListener listener = new GradleSyncListener() {
221-
public void syncTaskCreated(@NotNull Project project, @NotNull GradleSyncInvoker.Request request) {}
222-
223-
// TODO(messick) Remove when 3.6 is stable.
224-
public void syncStarted(@NotNull Project project, boolean skipped, boolean sourceGenerationRequested) {}
225-
226-
public void setupStarted(@NotNull Project project) {}
227-
228223
@Override
229224
public void syncSucceeded(@NotNull Project project) {
230225
if (isUpdating.get()) {
@@ -315,8 +310,8 @@ private class EmbeddedAndroidProject extends ProjectImpl {
315310
private Path path;
316311

317312
protected EmbeddedAndroidProject(@NotNull Path filePath) {
318-
super((ComponentManagerImpl) ApplicationManager.getApplication(), filePath, TEMPLATE_PROJECT_NAME);
319-
path = filePath;
313+
super((ComponentManagerImpl)ApplicationManager.getApplication(), filePath, TEMPLATE_PROJECT_NAME);
314+
path = filePath;
320315
}
321316

322317
static final String TEMPLATE_PROJECT_NAME = "_android";

flutter-studio/src/io/flutter/utils/AddToAppUtils.java

-3
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ public void syncFailed(@NotNull Project project, @NotNull String errorMessage) {
126126
public void syncSkipped(@NotNull Project project) {
127127
GradleUtils.checkDartSupport(project);
128128
}
129-
130-
public void sourceGenerationFinished(@NotNull Project project) {
131-
}
132129
};
133130
}
134131

0 commit comments

Comments
 (0)