diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java index 7e01bafbf..b235161d6 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java @@ -1220,12 +1220,9 @@ public boolean edit_isPostfixCompletionApplicable(VirtualFile file, int _offset, final Ref resultRef = Ref.create(false); final CountDownLatch latch = new CountDownLatch(1); final int offset = getOriginalOffset(file, _offset); - server.edit_isPostfixCompletionApplicable(fileUri, key, offset, new IsPostfixCompletionApplicableConsumer() { - @Override - public void isPostfixCompletionApplicable(Boolean value) { - resultRef.set(value); - latch.countDown(); - } + server.edit_isPostfixCompletionApplicable(fileUri, key, offset, value -> { + resultRef.set(value); + latch.countDown(); }); awaitForLatchCheckingCanceled(server, latch, POSTFIX_COMPLETION_TIMEOUT); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java index fb4d5bdc8..f66d2a2f3 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java @@ -277,9 +277,7 @@ void textDocumentContentDidChange(@NotNull String fileUri) { file.setWritable(false); VirtualFile finalFile = file; - ApplicationManager.getApplication().invokeLater(() -> { - FileDocumentManager.getInstance().reloadFiles(finalFile); - }, ModalityState.nonModal(), myService.getDisposedCondition()); + ApplicationManager.getApplication().invokeLater(() -> FileDocumentManager.getInstance().reloadFiles(finalFile), ModalityState.nonModal(), myService.getDisposedCondition()); }); } @@ -405,9 +403,7 @@ private void forceFileAnnotation(final @Nullable VirtualFile file, final boolean // but it will cache RemoteAnalysisServerImpl$ServerResponseReaderThread in FileStatusMap.threads and as a result, // DartAnalysisServerService.myProject will be leaked in tests ApplicationManager.getApplication() - .invokeLater(() -> { - DaemonCodeAnalyzer.getInstance(project).restart(); - }, + .invokeLater(() -> DaemonCodeAnalyzer.getInstance(project).restart(), ModalityState.nonModal(), myService.getDisposedCondition()); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerRootsHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerRootsHandler.java index 48a52bc96..c2d7d18da 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerRootsHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerRootsHandler.java @@ -57,7 +57,7 @@ void onServerStarted() { } void scheduleDartRootsUpdate(@Nullable Runnable onSuccess) { - ReadAction.nonBlocking(() -> calcIncludedAndExcludedDartRootPaths()) + ReadAction.nonBlocking(this::calcIncludedAndExcludedDartRootPaths) .coalesceBy(this) .expireWith(DartAnalysisServerService.getInstance(myProject)) .finishOnUiThread(ModalityState.nonModal(), includedAndExcludedRootPaths -> { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java index 3d215214a..180d24afe 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java @@ -372,7 +372,7 @@ public void performCopy(@NotNull DataContext dataContext) { public void uiDataSnapshot(@NotNull DataSink sink) { super.uiDataSnapshot(sink); sink.set(PlatformDataKeys.COPY_PROVIDER, this); - sink.lazy(CommonDataKeys.NAVIGATABLE, () -> createNavigatable()); + sink.lazy(CommonDataKeys.NAVIGATABLE, this::createNavigatable); } private @Nullable Navigatable createNavigatable() { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/findUsages/DartComponentUsageGroup.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/findUsages/DartComponentUsageGroup.java index d90cc6575..9eb5eaa52 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/findUsages/DartComponentUsageGroup.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/findUsages/DartComponentUsageGroup.java @@ -60,9 +60,7 @@ public boolean equals(Object object) { @Override public void uiDataSnapshot(@NotNull DataSink sink) { - sink.lazy(CommonDataKeys.PSI_ELEMENT, () -> { - return getNameElement(); - }); + sink.lazy(CommonDataKeys.PSI_ELEMENT, this::getNameElement); sink.lazy(UsageView.USAGE_INFO_KEY, () -> { final DartComponentName nameElement = getNameElement(); return nameElement != null ? new UsageInfo(nameElement) : null; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/frame/DartVmServiceValue.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/frame/DartVmServiceValue.java index 80856da9c..46f4a8745 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/frame/DartVmServiceValue.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/frame/DartVmServiceValue.java @@ -29,15 +29,9 @@ // See https://youtrack.jetbrains.com/issue/WEB-17629. public final class DartVmServiceValue extends XNamedValue { - private static final LayeredIcon FINAL_FIELD_ICON = LayeredIcon.layeredIcon(() -> { - return new Icon[]{AllIcons.Nodes.Field, IconManager.getInstance().getPlatformIcon(PlatformIcons.FinalMark)}; - }); - private static final LayeredIcon STATIC_FIELD_ICON = LayeredIcon.layeredIcon(() -> { - return new Icon[]{AllIcons.Nodes.Field, IconManager.getInstance().getPlatformIcon(PlatformIcons.StaticMark)}; - }); - private static final LayeredIcon STATIC_FINAL_FIELD_ICON = LayeredIcon.layeredIcon(() -> { - return new Icon[]{AllIcons.Nodes.Field, IconManager.getInstance().getPlatformIcon(PlatformIcons.StaticMark), IconManager.getInstance().getPlatformIcon(PlatformIcons.FinalMark)}; - }); + private static final LayeredIcon FINAL_FIELD_ICON = LayeredIcon.layeredIcon(() -> new Icon[]{AllIcons.Nodes.Field, IconManager.getInstance().getPlatformIcon(PlatformIcons.FinalMark)}); + private static final LayeredIcon STATIC_FIELD_ICON = LayeredIcon.layeredIcon(() -> new Icon[]{AllIcons.Nodes.Field, IconManager.getInstance().getPlatformIcon(PlatformIcons.StaticMark)}); + private static final LayeredIcon STATIC_FINAL_FIELD_ICON = LayeredIcon.layeredIcon(() -> new Icon[]{AllIcons.Nodes.Field, IconManager.getInstance().getPlatformIcon(PlatformIcons.StaticMark), IconManager.getInstance().getPlatformIcon(PlatformIcons.FinalMark)}); private final @NotNull DartVmServiceDebugProcess myDebugProcess; private final @NotNull String myIsolateId; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java index a20c89677..9a9919abe 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java @@ -204,11 +204,7 @@ private static PsiElement doResolveTypeReference(final DartType dartType) { // find type parameter if (result.isEmpty()) { PsiTreeUtil.treeWalkUp(dartResolveProcessor, dartType, null, ResolveState.initial()); - for (Iterator iterator = result.iterator(); iterator.hasNext(); ) { - if (!(iterator.next().getParent() instanceof DartTypeParameter)) { - iterator.remove(); - } - } + result.removeIf(dartComponentName -> !(dartComponentName.getParent() instanceof DartTypeParameter)); } // global diff --git a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartCallHierarchyTest.java b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartCallHierarchyTest.java index 98e7215b7..ae0e4383d 100644 --- a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartCallHierarchyTest.java +++ b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartCallHierarchyTest.java @@ -106,7 +106,7 @@ public void visitReferenceExpression(@NotNull DartReferenceExpression reference) List results = new ArrayList<>(); DartCallHierarchyTreeStructure.collectDeclarations(reference.resolve(), results); if (!results.isEmpty()) { - result[0] = results.get(0); + result[0] = results.getFirst(); throw new ExitVisitor(); } } diff --git a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerHighlightingTest.java b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerHighlightingTest.java index 2bf18953a..2784cb683 100644 --- a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerHighlightingTest.java +++ b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerHighlightingTest.java @@ -269,14 +269,14 @@ public void testNavigationTargetOffsetUpdated() { TextRange.create(15, 16), TextRange.create(19, 20)}; checkRegions(regions, ranges); - assertEquals(4, regions.get(4).getTargets().get(0).getOffset(getProject(), file)); + assertEquals(4, regions.get(4).getTargets().getFirst().getOffset(getProject(), file)); getEditor().getCaretModel().moveToOffset(0); myFixture.type("foo \b"); // Disable for pre-3.7.0 Dart SDK versions: if(StringUtil.compareVersionNumbers(service.getSdkVersion(), "3.7.0") >= 0) { checkRegions(regions, ContainerUtil.map2Array(ranges, TextRange.class, range -> range.shiftRight(3))); - assertEquals(4 + 3, regions.get(4).getTargets().get(0).getOffset(getProject(), file)); + assertEquals(4 + 3, regions.get(4).getTargets().getFirst().getOffset(getProject(), file)); } } diff --git a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerIntentionsTest.java b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerIntentionsTest.java index 3882d85bc..7a34408ae 100644 --- a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerIntentionsTest.java +++ b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerIntentionsTest.java @@ -51,7 +51,7 @@ void f() { var x = 3; } """); - final List intentions = ContainerUtil.map(myFixture.getAvailableIntentions(), intention -> intention.getText()); + final List intentions = ContainerUtil.map(myFixture.getAvailableIntentions(), IntentionAction::getText); assertOrderedEquals(intentions, "Surround with block", "Edit intention settings", diff --git a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerQuickFixTest.java b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerQuickFixTest.java index 3bf7e475e..471e3dbe3 100644 --- a/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerQuickFixTest.java +++ b/third_party/src/test/java/com/jetbrains/dart/analysisServer/DartServerQuickFixTest.java @@ -169,7 +169,7 @@ List bar(int i, bool bool, String s) {} public void testQuickFixOrder() { myFixture.configureByText("foo.dart", "ServerSocket f;\nclass ServerSockets{}"); - final List intentions = ContainerUtil.map(myFixture.getAvailableIntentions(), intention -> intention.getText()); + final List intentions = ContainerUtil.map(myFixture.getAvailableIntentions(), IntentionAction::getText); assertOrderedEquals(intentions, "Import library 'dart:io'", "Import library 'dart:io' with 'show'", diff --git a/third_party/src/test/java/com/jetbrains/lang/dart/dart_style/DartStyleLenientTest.java b/third_party/src/test/java/com/jetbrains/lang/dart/dart_style/DartStyleLenientTest.java index 141ad49a5..7bc1236ce 100644 --- a/third_party/src/test/java/com/jetbrains/lang/dart/dart_style/DartStyleLenientTest.java +++ b/third_party/src/test/java/com/jetbrains/lang/dart/dart_style/DartStyleLenientTest.java @@ -14,7 +14,7 @@ public class DartStyleLenientTest extends DartStyleTest { */ @Override protected void runTestInDirectory(String dirName) throws Exception { - runTestInDirectory(dirName, new HashSet(KNOWN_TO_FAIL)); + runTestInDirectory(dirName, new HashSet<>(KNOWN_TO_FAIL)); } @Override diff --git a/third_party/src/test/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProviderTest.java b/third_party/src/test/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProviderTest.java index 2780dc0be..8f7249fe4 100644 --- a/third_party/src/test/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProviderTest.java +++ b/third_party/src/test/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProviderTest.java @@ -25,7 +25,7 @@ private void doTest(@NotNull final String locationHint, @NotNull final String fi final List locations = DartTestLocationProvider.INSTANCE.getLocationForTest(file, locationHint); assertEquals(1, locations.size()); - final Location location = locations.get(0); + final Location location = locations.getFirst(); final PsiElement element = location.getPsiElement(); final DartId foundId = PsiTreeUtil.findChildOfType(element, DartId.class);