diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java b/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java index 9157cce5e..0547375c8 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java @@ -23,7 +23,6 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; -import com.intellij.ui.IconManager; import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ContainerUtil; import com.jetbrains.lang.dart.DartBundle; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java index 25275c81e..961e31e81 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java @@ -182,11 +182,6 @@ protected void doAction() { close(DialogWrapper.OK_EXIT_CODE); } - @Override - protected String getBorderTitle() { - return RefactoringBundle.message("inline.method.border.title"); // not used actually - } - @Override protected String getInlineAllText() { return DartBundle.message("radio.inline.all.references.remove.method"); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/ServerInlineLocalRefactoring.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/ServerInlineLocalRefactoring.java index 8086c245d..84802aede 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/ServerInlineLocalRefactoring.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/ServerInlineLocalRefactoring.java @@ -14,7 +14,6 @@ * LTK wrapper around Analysis Server 'Inline Local' refactoring. */ public class ServerInlineLocalRefactoring extends ServerRefactoring { - private String variableName; private int occurrences; public ServerInlineLocalRefactoring(final @NotNull Project project, final @NotNull VirtualFile file, final int offset, final int length) { @@ -25,10 +24,6 @@ public int getOccurrences() { return occurrences; } - public String getVariableName() { - return variableName; - } - @Override protected RefactoringOptions getOptions() { return null; @@ -37,7 +32,6 @@ protected RefactoringOptions getOptions() { @Override protected void setFeedback(@NotNull RefactoringFeedback _feedback) { InlineLocalVariableFeedback feedback = (InlineLocalVariableFeedback)_feedback; - variableName = feedback.getName(); occurrences = feedback.getOccurrences(); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java index ac8a9cb92..c7fcca876 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java @@ -176,9 +176,6 @@ private void performOnExpression(DartExpression expression) { final int[] occurrencesOffsets = refactoring.getOccurrencesOffsets(); final int[] occurrencesLengths = refactoring.getOccurrencesLengths(); occurrences = getDartExpressions(occurrencesOffsets, occurrencesLengths); - if (occurrences == null) { - return; - } } // handle occurrences OccurrencesChooser.simpleChooser(editor).showChooser(expression, occurrences, new Pass<>() { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java index f225b3e77..e69ec0e22 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java @@ -65,29 +65,6 @@ public void addWarning(@NotNull String msg, @Nullable RefactoringStatusContext c addEntry(new RefactoringStatusEntry(RefactoringStatusSeverity.WARNING, msg, context)); } - /** - * @return the copy of this {@link RefactoringStatus} with {@link RefactoringStatusSeverity#ERROR} - * replaced with {@link RefactoringStatusSeverity#FATAL}. - */ - public @NotNull RefactoringStatus escalateErrorToFatal() { - RefactoringStatus result = new RefactoringStatus(); - for (RefactoringStatusEntry entry : entries) { - RefactoringStatusSeverity severity = entry.getSeverity(); - if (severity == RefactoringStatusSeverity.ERROR) { - severity = RefactoringStatusSeverity.FATAL; - } - result.addEntry(new RefactoringStatusEntry(severity, entry.getMessage(), entry.getContext())); - } - return result; - } - - /** - * @return the {@link RefactoringStatusEntry}s. - */ - public @NotNull List getEntries() { - return entries; - } - /** * @return the RefactoringStatusEntry with the highest severity, or {@code null} if no * entries are present. diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/resolve/ClassNameScopeProcessor.java b/third_party/src/main/java/com/jetbrains/lang/dart/resolve/ClassNameScopeProcessor.java deleted file mode 100644 index 058b4b367..000000000 --- a/third_party/src/main/java/com/jetbrains/lang/dart/resolve/ClassNameScopeProcessor.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jetbrains.lang.dart.resolve; - -import com.jetbrains.lang.dart.psi.DartClass; -import com.jetbrains.lang.dart.psi.DartComponentName; -import org.jetbrains.annotations.NotNull; - -import java.util.Set; - -public class ClassNameScopeProcessor extends DartPsiScopeProcessor { - - private final @NotNull Set myResult; - - public ClassNameScopeProcessor(final @NotNull Set result) { - this.myResult = result; - } - - @Override - protected boolean doExecute(final @NotNull DartComponentName componentName) { - if (componentName.getParent() instanceof DartClass) myResult.add(componentName); - return true; - } -} diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartElementGenerator.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartElementGenerator.java index eb32123e0..0aac2dc01 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartElementGenerator.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartElementGenerator.java @@ -16,11 +16,6 @@ import org.jetbrains.annotations.Nullable; public final class DartElementGenerator { - public static @Nullable DartReference createReferenceFromText(Project myProject, String text) { - final DartExpression expression = createExpressionFromText(myProject, text); - return expression instanceof DartReference ? (DartReference)expression : null; - } - public static @Nullable DartExpression createExpressionFromText(Project myProject, String text) { final PsiFile file = createDummyFile(myProject, "var dummy = " + text + ";"); final PsiElement child = file.getFirstChild(); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartNameSuggesterUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartNameSuggesterUtil.java deleted file mode 100644 index eaa5f08ca..000000000 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartNameSuggesterUtil.java +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.jetbrains.lang.dart.util; - -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.containers.ContainerUtil; -import com.jetbrains.lang.dart.psi.DartCallExpression; -import com.jetbrains.lang.dart.psi.DartClass; -import com.jetbrains.lang.dart.psi.DartExpression; -import com.jetbrains.lang.dart.psi.DartReference; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public final class DartNameSuggesterUtil { - private DartNameSuggesterUtil() { - } - - private static @NotNull String deleteNonLetterFromString(final @NotNull String string) { - Pattern pattern = Pattern.compile("[^a-zA-Z_]+"); - Matcher matcher = pattern.matcher(string); - return matcher.replaceAll("_"); - } - - public static Collection getSuggestedNames(final DartExpression expression) { - return getSuggestedNames(expression, null); - } - - public static Collection getSuggestedNames(final DartExpression expression, @Nullable Collection additionalUsedNames) { - Collection candidates = new LinkedHashSet<>(); - - String text = expression.getText(); - if (expression instanceof DartReference) { - DartClass dartClass = ((DartReference)expression).resolveDartClass().getDartClass(); - String dartClassName = dartClass == null ? null : dartClass.getName(); - if (dartClassName != null && !dartClassName.equals(StringUtil.decapitalize(dartClassName))) { - candidates.add(StringUtil.decapitalize(dartClassName)); - } - } - - if (expression instanceof DartCallExpression) { - final DartExpression callee = ((DartCallExpression)expression).getExpression(); - if (callee != null) { - text = callee.getText(); - } - } - - if (text != null) { - candidates.addAll(generateNames(text)); - } - - final Set usedNames = DartRefactoringUtil.collectUsedNames(expression); - if (additionalUsedNames != null && !additionalUsedNames.isEmpty()) { - usedNames.addAll(additionalUsedNames); - } - final Collection result = new ArrayList<>(); - - for (String candidate : candidates) { - int index = 0; - String suffix = ""; - while (usedNames.contains(candidate + suffix)) { - suffix = Integer.toString(++index); - } - result.add(candidate + suffix); - } - - if (result.isEmpty()) { - result.add("o"); // never empty - } - - return result; - } - - public static @NotNull Collection generateNames(@NotNull String name) { - name = StringUtil.decapitalize(deleteNonLetterFromString(StringUtil.unquoteString(name.replace('.', '_')))); - if (name.startsWith("get")) { - name = name.substring(3); - } - else { - name = StringUtil.trimStart(name, "is"); - } - while (name.startsWith("_")) { - name = name.substring(1); - } - while (name.endsWith("_")) { - name = name.substring(0, name.length() - 1); - } - final int length = name.length(); - final Collection possibleNames = new LinkedHashSet<>(); - for (int i = 0; i < length; i++) { - if (Character.isLetter(name.charAt(i)) && - (i == 0 || name.charAt(i - 1) == '_' || (Character.isLowerCase(name.charAt(i - 1)) && Character.isUpperCase(name.charAt(i))))) { - final String candidate = StringUtil.decapitalize(name.substring(i)); - if (candidate.length() < 25) { - possibleNames.add(candidate); - } - } - } - // prefer shorter names - ArrayList reversed = new ArrayList<>(possibleNames); - Collections.reverse(reversed); - return ContainerUtil.map(reversed, name1 -> { - if (name1.indexOf('_') == -1) { - return name1; - } - name1 = StringUtil.capitalizeWords(name1, "_", true, true); - return StringUtil.decapitalize(name1.replaceAll("_", "")); - }); - } -} diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java index 9630d1833..aa1a4c8e0 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java @@ -1,18 +1,14 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.jetbrains.lang.dart.util; -import com.intellij.codeInsight.PsiEquivalenceUtil; import com.intellij.lang.ASTNode; import com.intellij.navigation.NavigationItem; -import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.ResolveState; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; -import com.jetbrains.lang.dart.DartComponentType; import com.jetbrains.lang.dart.DartTokenTypes; import com.jetbrains.lang.dart.psi.*; import com.jetbrains.lang.dart.resolve.ComponentNameScopeProcessor; @@ -32,41 +28,6 @@ public static Set collectUsedComponents(PsiElement context) { return usedComponentNames; } - public static @Nullable DartExpression getSelectedExpression(final @NotNull Project project, - @NotNull PsiFile file, - final @NotNull PsiElement element1, - final @NotNull PsiElement element2) { - PsiElement parent = PsiTreeUtil.findCommonParent(element1, element2); - if (parent == null) { - return null; - } - if (parent instanceof DartExpression) { - return (DartExpression)parent; - } - return PsiTreeUtil.getParentOfType(parent, DartExpression.class); - } - - public static @NotNull List getOccurrences(final @NotNull PsiElement pattern, final @Nullable PsiElement context) { - if (context == null) { - return Collections.emptyList(); - } - final List occurrences = new SmartList<>(); - context.acceptChildren(new DartRecursiveVisitor() { - @Override - public void visitElement(final @NotNull PsiElement element) { - if (DartComponentType.typeOf(element) == DartComponentType.PARAMETER) { - return; - } - if (PsiEquivalenceUtil.areElementsEquivalent(element, pattern)) { - occurrences.add(element); - return; - } - super.visitElement(element); - } - }); - return occurrences; - } - public static PsiElement @NotNull [] findStatementsInRange(PsiFile file, int startOffset, int endOffset) { PsiElement element1 = file.findElementAt(startOffset); PsiElement element2 = file.findElementAt(endOffset - 1); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java index 798585f01..48be96ce6 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java @@ -866,12 +866,6 @@ public void visitElement(@NotNull PsiElement element) { return null; } - public static boolean aloneOrFirstInChain(DartReference reference) { - return PsiTreeUtil.getChildrenOfType(reference, DartReference.class) == null && - getLeftReference(reference) == null && - getLeftReference(reference.getParent()) == null; - } - public static ResolveResult @NotNull [] toCandidateInfoArray(@Nullable List elements) { if (elements == null) { return ResolveResult.EMPTY_ARRAY; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/UsefulPsiTreeUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/UsefulPsiTreeUtil.java index 56deb3515..c195a77e9 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/UsefulPsiTreeUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/UsefulPsiTreeUtil.java @@ -4,15 +4,11 @@ import com.intellij.lang.ASTNode; import com.intellij.openapi.util.Condition; import com.intellij.psi.*; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Function; import com.jetbrains.lang.dart.DartTokenTypes; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; public final class UsefulPsiTreeUtil { public static ASTNode[] findChildrenRange(ASTNode[] elements, int startOffset, int endOffset) { @@ -57,22 +53,6 @@ public static boolean isWhitespaceOrComment(PsiElement element) { return element instanceof PsiWhiteSpace || element instanceof PsiComment; } - public static @Nullable List getPathToParentOfType(@Nullable PsiElement element, - @NotNull Class aClass) { - if (element == null) return null; - final List result = new ArrayList<>(); - while (element != null) { - result.add(element); - if (aClass.isInstance(element)) { - return result; - } - if (element instanceof PsiFile) return null; - element = element.getParent(); - } - - return null; - } - public static @Nullable PsiElement getNextSiblingSkippingWhiteSpacesAndComments(PsiElement sibling) { return getSiblingSkippingCondition( sibling, @@ -115,13 +95,4 @@ public static boolean isWhitespaceOrComment(PsiElement element) { } return result; } - - public static boolean isAncestor(@NotNull PsiElement element, List children, boolean strict) { - for (PsiElement child : children) { - if (child != null && !PsiTreeUtil.isAncestor(element, child, strict)) { - return false; - } - } - return true; - } }