azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace KotlinPackage legacy facade with corresponding package parts.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-01 22:31:17 +03:00
parent 80e4ba8712
commit 90e5ee8a7e
64 changed files with 214 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.configuration.ui.NonConfiguredKotlinProjectComp
import javax.swing.event.HyperlinkEvent;
import java.util.Collection;
import static kotlin.KotlinPackage.first;
import static kotlin.CollectionsKt.first;
public class ConfigureKotlinNotification extends Notification {
private static final String TITLE = "Configure Kotlin";
idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.execution.filters.OpenFileHyperlinkInfo;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.GlobalSearchScope;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -95,7 +95,7 @@ public class JetExceptionFilter implements Filter {
final HyperlinkInfo newHyperlinkInfo = createHyperlinkInfo(line);
if (newHyperlinkInfo == null) return result;
return new Result(KotlinPackage.map(result.getResultItems(), new Function1<ResultItem, ResultItem>() {
return new Result(CollectionsKt.map(result.getResultItems(), new Function1<ResultItem, ResultItem>() {
@Override
public ResultItem invoke(ResultItem item) {
return new ResultItem(item.getHighlightStartOffset(), item.getHighlightEndOffset(), newHyperlinkInfo,
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java
+7 -7
View File
@@ -38,7 +38,7 @@ import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import com.intellij.util.containers.MultiMap;
import kotlin.KotlinPackage;
import kotlin.*;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -109,7 +109,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
@Nullable
private static OriginalJavaMethodDescriptorWrapper getOriginalJavaMethodDescriptorWrapper(@NotNull UsageInfo[] usages) {
return KotlinPackage.firstOrNull(KotlinPackage.filterIsInstance(usages, OriginalJavaMethodDescriptorWrapper.class));
return CollectionsKt.firstOrNull(ArraysKt.filterIsInstance(usages, OriginalJavaMethodDescriptorWrapper.class));
}
// It's here to prevent O(usage_count^2) performance
@@ -190,7 +190,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
}
JetElement body = ChangeSignaturePackage.getDeclarationBody(element);
final Set<String> newParameterNames = KotlinPackage.mapTo(
final Set<String> newParameterNames = CollectionsKt.mapTo(
changeInfo.getNonReceiverParameters(),
new HashSet<String>(),
new Function1<JetParameterInfo, String>() {
@@ -588,7 +588,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
// Delete OverriderUsageInfo and CallerUsageInfo for Kotlin declarations since they can't be processed correctly
// TODO (OverriderUsageInfo only): Drop when OverriderUsageInfo.getElement() gets deleted
UsageInfo[] usageInfos = refUsages.get();
List<UsageInfo> adjustedUsages = KotlinPackage.filterNot(
List<UsageInfo> adjustedUsages = ArraysKt.filterNot(
usageInfos,
new Function1<UsageInfo, Boolean>() {
@Override
@@ -694,7 +694,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
DeclarationDescriptor callerDescriptor
) {
List<JetParameter> valueParameters = PsiUtilPackage.getValueParameters(caller);
Map<String, JetParameter> existingParameters = KotlinPackage.toMap(
Map<String, JetParameter> existingParameters = CollectionsKt.toMap(
valueParameters,
new Function1<JetParameter, String>() {
@Override
@@ -796,7 +796,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
JetParameterInfo newReceiverInfo
) {
if (newReceiverInfo != null && (callable instanceof JetNamedFunction) && ((JetNamedFunction) callable).getBodyExpression() != null) {
Map<JetReferenceExpression, BindingContext> noReceiverRefToContext = KotlinPackage.filter(
Map<JetReferenceExpression, BindingContext> noReceiverRefToContext = MapsKt.filter(
JetFileReferencesResolver.INSTANCE$.resolve((JetNamedFunction) callable, true, true),
new Function1<Map.Entry<? extends JetReferenceExpression, ? extends BindingContext>, Boolean>() {
@Override
@@ -848,7 +848,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
String prefix = declaration != null ? RefactoringUIUtil.getDescription(declaration, true) : originalRef.getText();
result.putValue(
originalRef,
KotlinPackage.capitalize(prefix + " will no longer be accessible after signature change")
StringsKt.capitalize(prefix + " will no longer be accessible after signature change")
);
}
}
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.usageView.UsageInfo;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -331,7 +331,7 @@ public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageIn
if (oldCount > commonCount) {
parameterList.deleteChildRange(oldParameters.get(commonCount - 1).getNextSibling(),
KotlinPackage.last(oldParameters));
CollectionsKt.last(oldParameters));
}
else if (newCount > commonCount) {
parameterList.addRangeAfter(newParameters.get(commonCount - 1).getNextSibling(),
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
+3 -3
View File
@@ -24,7 +24,7 @@ import com.intellij.usageView.UsageInfo;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.TIntArrayList;
import gnu.trove.TIntProcedure;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.Pair;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
@@ -432,11 +432,11 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
List<JetFunctionLiteralArgument> lambdaArguments = element.getFunctionLiteralArguments();
if (!lambdaArguments.isEmpty()) {
element.deleteChildRange(KotlinPackage.first(lambdaArguments), KotlinPackage.last(lambdaArguments));
element.deleteChildRange(CollectionsKt.first(lambdaArguments), CollectionsKt.last(lambdaArguments));
}
//TODO: this is not correct!
JetValueArgument lastArgument = KotlinPackage.lastOrNull(newArgumentList.getArguments());
JetValueArgument lastArgument = CollectionsKt.lastOrNull(newArgumentList.getArguments());
boolean hasTrailingLambdaInArgumentListAfter =
lastArgument != null && PsiPackage.unpackFunctionLiteral(lastArgument.getArgumentExpression()) != null;
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
+2 -2
View File
@@ -42,7 +42,7 @@ import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RefactoringMessageDialog;
import com.intellij.util.Function;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.Pair;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
@@ -139,7 +139,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
final String typeArgumentsForCall = getTypeArgumentsStringForCall(initializer);
final String parametersForFunctionLiteral = getParametersForFunctionLiteral(initializer);
final boolean canHighlight = KotlinPackage.all(
final boolean canHighlight = CollectionsKt.all(
referenceExpressions,
new Function1<JetExpression, Boolean>() {
@Override
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java
+5 -5
View File
@@ -25,7 +25,7 @@ import com.intellij.ui.table.JBTable;
import com.intellij.util.Function;
import com.intellij.util.ui.AbstractTableCellEditor;
import com.intellij.util.ui.EditableModel;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -108,9 +108,9 @@ public class KotlinParameterTablePanel extends JPanel {
}
public void init(@Nullable Parameter receiver, @NotNull List<Parameter> parameters) {
parameterInfos = KotlinPackage.mapTo(
parameterInfos = CollectionsKt.mapTo(
parameters,
receiver != null ? KotlinPackage.arrayListOf(new ParameterInfo(receiver, true)) : new ArrayList<ParameterInfo>(),
receiver != null ? CollectionsKt.arrayListOf(new ParameterInfo(receiver, true)) : new ArrayList<ParameterInfo>(),
new Function1<Parameter, ParameterInfo>() {
@Override
public ParameterInfo invoke(Parameter parameter) {
@@ -386,7 +386,7 @@ public class KotlinParameterTablePanel extends JPanel {
@Nullable
public ParameterInfo getReceiverInfo() {
return KotlinPackage.singleOrNull(
return CollectionsKt.singleOrNull(
parameterInfos,
new Function1<ParameterInfo, Boolean>() {
@Override
@@ -399,7 +399,7 @@ public class KotlinParameterTablePanel extends JPanel {
@NotNull
public List<ParameterInfo> getParameterInfos() {
return KotlinPackage.filter(
return CollectionsKt.filter(
parameterInfos,
new Function1<ParameterInfo, Boolean>() {
@Override
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
+4 -3
View File
@@ -35,7 +35,8 @@ import com.intellij.psi.search.SearchScope;
import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer;
import com.intellij.ui.NonFocusableCheckBox;
import com.intellij.util.ui.PositionTracker;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
@@ -390,8 +391,8 @@ public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> e
@Override
protected Collection<PsiReference> collectRefs(SearchScope referencesSearchScope) {
return KotlinPackage.map(
KotlinPackage.filterIsInstance(getOccurrences(), JetSimpleNameExpression.class),
return CollectionsKt.map(
ArraysKt.filterIsInstance(getOccurrences(), JetSimpleNameExpression.class),
new Function1<JetSimpleNameExpression, PsiReference>() {
@Override
public PsiReference invoke(JetSimpleNameExpression expression) {
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+3 -3
View File
@@ -31,7 +31,7 @@ import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.introduce.inplace.OccurrencesChooser;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
@@ -480,7 +480,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
PsiTreeUtil.getParentOfType(replace, JetFunctionLiteralArgument.class);
JetCallExpression newCallExpression = CorePackage
.moveInsideParenthesesAndReplaceWith(functionLiteralArgument, replacement, bindingContext);
result = KotlinPackage.last(newCallExpression.getValueArguments()).getArgumentExpression();
result = CollectionsKt.last(newCallExpression.getValueArguments()).getArgumentExpression();
}
else {
result = (JetExpression)replace.replace(replacement);
@@ -528,7 +528,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
}
private static List<JetExpression> findOccurrences(PsiElement occurrenceContainer, @NotNull JetExpression originalExpression) {
return KotlinPackage.map(
return CollectionsKt.map(
PatternMatchingPackage.toRange(originalExpression).match(occurrenceContainer, JetPsiUnifier.DEFAULT),
new Function1<JetPsiRange.Match, JetExpression>() {
@Override
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+22 -21
View File
@@ -55,7 +55,8 @@ import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.text.UniqueNameGenerator;
import com.intellij.util.ui.UIUtil;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
@@ -143,8 +144,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
}
private static List<JetFile> getSourceFiles(@NotNull Collection<JetNamedDeclaration> elementsToMove) {
return KotlinPackage.distinct(
KotlinPackage.map(
return CollectionsKt.distinct(
CollectionsKt.map(
elementsToMove,
new Function1<JetNamedDeclaration, JetFile>() {
@Override
@@ -158,9 +159,9 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
@NotNull
private static PsiDirectory getSourceDirectory(@NotNull Collection<JetFile> sourceFiles) {
return KotlinPackage.single(
KotlinPackage.distinct(
KotlinPackage.map(
return CollectionsKt.single(
CollectionsKt.distinct(
CollectionsKt.map(
sourceFiles,
new Function1<JetFile, PsiDirectory>() {
@Override
@@ -174,8 +175,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
}
private static List<JetNamedDeclaration> getAllDeclarations(Collection<JetFile> sourceFiles) {
return KotlinPackage.filterIsInstance(
KotlinPackage.flatMap(
return CollectionsKt.filterIsInstance(
CollectionsKt.flatMap(
sourceFiles,
new Function1<JetFile, Iterable<?>>() {
@Override
@@ -199,7 +200,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
@NotNull final Set<JetNamedDeclaration> elementsToMove,
@NotNull List<JetFile> sourceFiles
) {
final List<KotlinMemberInfo> memberInfos = KotlinPackage.map(
final List<KotlinMemberInfo> memberInfos = CollectionsKt.map(
getAllDeclarations(sourceFiles),
new Function1<JetNamedDeclaration, KotlinMemberInfo>() {
@Override
@@ -221,8 +222,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
private boolean shouldUpdateFileNameField(final Collection<KotlinMemberInfo> changedMembers) {
if (!tfFileNameInPackage.isEnabled()) return true;
Collection<JetNamedDeclaration> previousDeclarations = KotlinPackage.filterNotNull(
KotlinPackage.map(
Collection<JetNamedDeclaration> previousDeclarations = CollectionsKt.filterNotNull(
CollectionsKt.map(
memberInfos,
new Function1<KotlinMemberInfo, JetNamedDeclaration>() {
@Override
@@ -389,7 +390,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
}
private boolean isFullFileMove() {
Map<JetFile, List<? extends JetNamedDeclaration>> fileToElements = KotlinPackage.groupBy(
Map<JetFile, List<? extends JetNamedDeclaration>> fileToElements = CollectionsKt.groupBy(
getSelectedElementsToMove(),
new Function1<JetNamedDeclaration, JetFile>() {
@Override
@@ -451,7 +452,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
List<String> fileNames =
targetFileName != null
? Collections.singletonList(targetFileName)
: KotlinPackage.map(
: CollectionsKt.map(
sourceFiles,
new Function1<JetFile, String>() {
@Override
@@ -461,8 +462,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
}
);
return KotlinPackage.filterNotNull(
KotlinPackage.map(
return CollectionsKt.filterNotNull(
CollectionsKt.map(
fileNames,
new Function1<String, PsiFile>() {
@Override
@@ -498,7 +499,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
List<PsiFile> filesExistingInTargetDir = getFilesExistingInTargetDir(sourceFiles, targetFileName, targetDirectory);
if (!filesExistingInTargetDir.isEmpty()) {
if (!KotlinPackage.intersect(sourceFiles, filesExistingInTargetDir).isEmpty()) {
if (!CollectionsKt.intersect(sourceFiles, filesExistingInTargetDir).isEmpty()) {
setErrorText("Can't move to the original file(s)");
return null;
}
@@ -605,7 +606,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
}
private List<JetNamedDeclaration> getSelectedElementsToMove() {
return KotlinPackage.map(
return CollectionsKt.map(
memberTable.getSelectedMemberInfos(),
new Function1<KotlinMemberInfo, JetNamedDeclaration>() {
@Override
@@ -698,7 +699,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
public void refactoringCompleted() {
try {
if (targetFileName != null) {
KotlinPackage.single(sourceFiles).setName(targetFileName);
CollectionsKt.single(sourceFiles).setName(targetFileName);
}
}
finally {
@@ -712,19 +713,19 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
) {
@Override
protected String getCommandName() {
return targetFileName != null ? "Move " + KotlinPackage.single(sourceFiles).getName() : "Move";
return targetFileName != null ? "Move " + CollectionsKt.single(sourceFiles).getName() : "Move";
}
@Override
protected void performRefactoring(@NotNull UsageInfo[] usages) {
if (targetFileName != null) {
JetFile sourceFile = KotlinPackage.single(sourceFiles);
JetFile sourceFile = CollectionsKt.single(sourceFiles);
//noinspection ConstantConditions
String temporaryName = UniqueNameGenerator.generateUniqueName(
"temp",
"",
".kt",
KotlinPackage.map(
ArraysKt.map(
sourceFile.getContainingDirectory().getFiles(),
new Function1<PsiFile, String>() {
@Override
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+4 -3
View File
@@ -43,7 +43,8 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiPackage;
import com.intellij.refactoring.listeners.RefactoringElementAdapter;
import com.intellij.refactoring.listeners.RefactoringElementListener;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
@@ -306,8 +307,8 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
@NotNull
private static Collection<JetNamedFunction> getMainFunCandidates(@NotNull PsiClass psiClass) {
return KotlinPackage.filterNotNull(
KotlinPackage.map(
return CollectionsKt.filterNotNull(
ArraysKt.map(
psiClass.getAllMethods(),
new Function1<PsiMethod, JetNamedFunction>() {
@Override
idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java
+4 -3
View File
@@ -32,7 +32,8 @@ import com.intellij.util.CommonProcessors;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.ID;
import com.intellij.util.indexing.ScalarIndexExtension;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -278,11 +279,11 @@ public class KotlinRuntimeLibraryUtil {
Module[] modules = ModuleManager.getInstance(project).getModules();
List<Module> modulesToCheck = KotlinPackage.filter(modules, checkModule);
List<Module> modulesToCheck = ArraysKt.filter(modules, checkModule);
if (modulesToCheck.isEmpty()) return Collections.emptyList();
Collection<BinaryVersion> versions = collectAllKeys(id, modulesToCheck);
Set<BinaryVersion> badVersions = Sets.newHashSet(KotlinPackage.filter(versions, checkVersion));
Set<BinaryVersion> badVersions = Sets.newHashSet(CollectionsKt.filter(versions, checkVersion));
Set<VirtualFile> badRoots = Sets.newHashSet();
ProjectFileIndex fileIndex = ProjectFileIndex.SERVICE.getInstance(project);
idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java
+2 -2
View File
@@ -25,7 +25,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.ArrayUtil;
import com.siyeh.ig.bugs.StaticCallOnSubclassInspection;
import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
@@ -78,7 +78,7 @@ public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
List<String> toolsStrings = InTextDirectivesUtils.findListWithPrefixes(configFileText, "TOOL:");
return ArrayUtil.toObjectArray(KotlinPackage.map(toolsStrings, new Function1<String, LocalInspectionTool>() {
return ArrayUtil.toObjectArray(CollectionsKt.map(toolsStrings, new Function1<String, LocalInspectionTool>() {
@Override
public LocalInspectionTool invoke(String toolString) {
return mapStringToTool(toolString);
idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java
+4 -4
View File
@@ -48,7 +48,7 @@ import com.intellij.usages.rules.UsageFilteringRule;
import com.intellij.usages.rules.UsageGroupingRule;
import com.intellij.util.ArrayUtil;
import com.intellij.util.CommonProcessors;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -383,8 +383,8 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
Collection<UsageInfo2UsageAdapter> filteredUsages = getUsageAdapters(filteringRules, usageInfos);
List<String> usageFiles = KotlinPackage.distinct(
KotlinPackage.map(
List<String> usageFiles = CollectionsKt.distinct(
CollectionsKt.map(
filteredUsages,
new Function1<UsageInfo2UsageAdapter, String>() {
@Override
@@ -402,7 +402,7 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
assert usageAdapter != null;
String groupAsString = Joiner.on(", ").join(
KotlinPackage.map(
CollectionsKt.map(
groupingRules,
new Function1<UsageGroupingRule, String>() {
@Override
idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java
+2 -2
View File
@@ -26,7 +26,7 @@ import com.intellij.lang.Language;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.UsefulTestCase;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -84,7 +84,7 @@ public abstract class AbstractKotlinGotoTest extends JetLightCodeInsightFixtureT
Assert.assertFalse("There's no search text in test data file given. Use '// SEARCH_TEXT:' directive",
searchTextList.isEmpty());
List<String> expectedReferences = KotlinPackage.map(
List<String> expectedReferences = CollectionsKt.map(
InTextDirectivesUtils.findLinesWithPrefixesRemoved(documentText, "// REF:"),
new Function1<String, String>() {
@Override
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+2 -2
View File
@@ -34,7 +34,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.UIUtil;
import junit.framework.ComparisonFailure;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
@@ -142,7 +142,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
List<String> testFiles = new ArrayList<String>();
testFiles.add(beforeFileName);
KotlinPackage.mapTo(
ArraysKt.mapTo(
extraFiles,
testFiles,
new Function1<File, String>() {
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+3 -3
View File
@@ -35,7 +35,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.stubs.StubUpdatingIndex;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.util.indexing.FileBasedIndex;
import kotlin.KotlinPackage;
import kotlin.StringsKt;
import org.apache.commons.lang.SystemUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -88,7 +88,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
private static QuickFixTestCase myWrapper;
private void doTestFor(final String testName, final QuickFixTestCase quickFixTestCase) {
String relativePath = notNull(quickFixTestCase.getBasePath(), "") + "/" + KotlinPackage.decapitalize(testName);
String relativePath = notNull(quickFixTestCase.getBasePath(), "") + "/" + StringsKt.decapitalize(testName);
final String testFullPath = quickFixTestCase.getTestDataPath().replace(File.separatorChar, '/') + relativePath;
final File testFile = new File(testFullPath);
CommandProcessor.getInstance().executeCommand(quickFixTestCase.getProject(), new Runnable() {
@@ -143,7 +143,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
File file = new File(filePath);
String afterFileName = file.getName();
assert afterFileName.startsWith(AFTER_PREFIX);
String newAfterFileName = KotlinPackage.decapitalize(afterFileName.substring(AFTER_PREFIX.length())) + ".after";
String newAfterFileName = StringsKt.decapitalize(afterFileName.substring(AFTER_PREFIX.length())) + ".after";
super.checkResultByFile(message, new File(file.getParent(), newAfterFileName).getPath(), ignoreTrailingSpaces);
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
+8 -6
View File
@@ -32,7 +32,9 @@ import com.intellij.refactoring.util.CanonicalTypes;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.VisibilityUtil;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.SetsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.asJava.AsJavaPackage;
@@ -1112,7 +1114,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
JetClassOrObject classA =
JetFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
.iterator().next();
JetDeclaration functionBar = KotlinPackage.first(
JetDeclaration functionBar = CollectionsKt.first(
classA.getDeclarations(),
new Function1<JetDeclaration, Boolean>() {
@Override
@@ -1148,7 +1150,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
@NotNull
@Override
Set<PsiMethod> getParameterPropagationTargets(@NotNull PsiMethod method) {
PsiClass classA = KotlinPackage.first(
PsiClass classA = CollectionsKt.first(
JavaFullClassNameIndex.getInstance()
.get("A".hashCode(), getProject(), GlobalSearchScope.allScope(getProject())),
new Function1<PsiClass, Boolean>() {
@@ -1158,7 +1160,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
}
}
);
PsiMethod methodBar = KotlinPackage.first(
PsiMethod methodBar = ArraysKt.first(
classA.getMethods(),
new Function1<PsiMethod, Boolean>() {
@Override
@@ -1171,7 +1173,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
JetTopLevelFunctionFqnNameIndex.getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject()))
.iterator().next();
return KotlinPackage.setOf(methodBar, AsJavaPackage.getRepresentativeLightMethod(functionTest));
return SetsKt.setOf(methodBar, AsJavaPackage.getRepresentativeLightMethod(functionTest));
}
}
);
@@ -1222,7 +1224,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
JetClassOrObject classA =
JetFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
.iterator().next();
JetDeclaration functionBar = KotlinPackage.first(
JetDeclaration functionBar = CollectionsKt.first(
classA.getDeclarations(),
new Function1<JetDeclaration, Boolean>() {
@Override