Skip to content
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 @@ -2001,7 +2001,7 @@ public void execution_deleteContext(final @NotNull String contextId) {
@NotNull List<RuntimeCompletionExpression> expressions) {
final AnalysisServer server = myServer;
if (server == null) {
return new Pair<>(new ArrayList<>(), new ArrayList<>());
return new Pair<>(new SmartList<>(), new SmartList<>());
}

final String contextFileUri = getFileUri(contextFile);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ VirtualFile getNotLocalVirtualFile(@NotNull String fileUri) {

@NotNull
List<DartError> getErrors(final @NotNull SearchScope scope) {
final List<DartError> errors = new ArrayList<>();
final List<DartError> errors = new SmartList<>();

synchronized (myErrorData) {
for (Map.Entry<DartFileInfo, List<DartError>> entry : myErrorData.entrySet()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.SmartList;
import com.jetbrains.lang.dart.analyzer.DartAnalysisServerService;
import com.jetbrains.lang.dart.psi.DartComponent;
import com.jetbrains.lang.dart.psi.DartComponentName;
Expand Down Expand Up @@ -81,7 +82,7 @@ private static PsiElement getDeclaration(DartNavigationTarget target, PsiElement
return region.getTargets();
}
}
return new ArrayList<>(0);
return new SmartList<>();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.intellij.refactoring.ui.NameSuggestionsField;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.SmartList;
import com.intellij.util.ui.JBUI;
import com.jetbrains.lang.dart.DartBundle;
import com.jetbrains.lang.dart.DartFileType;
Expand All @@ -35,7 +36,6 @@

import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;

public class DartServerExtractLocalVariableHandler implements RefactoringActionHandler {
Expand Down Expand Up @@ -89,9 +89,6 @@ public void perform() {
final int[] offsets = refactoring.getCoveringExpressionOffsets();
final int[] lengths = refactoring.getCoveringExpressionLengths();
expressions = getDartExpressions(offsets, lengths);
if (expressions == null) {
return;
}
}
// select the expression to extract
if (expressions.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
Expand Down Expand Up @@ -119,12 +116,13 @@ private void createRefactoring(int offset, int length) {
return PsiTreeUtil.findElementOfClassAtRange(file, offset, offset + length, DartExpression.class);
}

private @Nullable List<DartExpression> getDartExpressions(int[] offsets, int[] lengths) {
final List<DartExpression> expressions = new ArrayList<>();
@NotNull
private List<DartExpression> getDartExpressions(int[] offsets, int[] lengths) {
final List<DartExpression> expressions = new SmartList<>();
for (int i = 0; i < offsets.length; i++) {
final DartExpression expression = findExpressionWithRange(offsets[i], lengths[i]);
if (expression == null) {
return null;
return expressions;
}
expressions.add(expression);
}
Expand Down