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

Minor: Replace a number of trivial Guava usages with constructor calls and kotlin-stdlib function calls

Browse Source
This commit is contained in:
Yan Zhulanow
2018-06-01 18:03:19 +03:00
parent 61ffde54fd
commit ab5614eaac
44 changed files with 100 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.hierarchy.calls
import com.google.common.collect.Maps
import com.intellij.find.findUsages.JavaFindUsagesOptions
import com.intellij.ide.hierarchy.HierarchyNodeDescriptor
import com.intellij.ide.hierarchy.HierarchyTreeStructure
@@ -118,7 +117,7 @@ class KotlinCallerTreeStructure(
override fun buildChildren(nodeDescriptor: HierarchyNodeDescriptor): Array<Any> {
val element = nodeDescriptor.psiElement as? KtDeclaration ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
val callerToDescriptorMap = Maps.newHashMap<PsiElement, NodeDescriptor<*>>()
val callerToDescriptorMap = hashMapOf<PsiElement, NodeDescriptor<*>>()
val descriptor = element.unsafeResolveToDescriptor()
if (descriptor is CallableMemberDescriptor) {
return descriptor.getDeepestSuperDeclarations().flatMap { rootDescriptor ->
idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java
+2 -6
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.highlighter;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -45,10 +44,7 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import java.io.File;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnvironment {
private static final String DIAGNOSTICS_NUMBER_DIRECTIVE = "DIAGNOSTICS_NUMBER";
@@ -153,7 +149,7 @@ public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnviro
private Set<DiagnosticFactory<?>> getDiagnosticFactories(Map<String, String> directives) {
String diagnosticsData = directives.get(DIAGNOSTICS_DIRECTIVE);
assert diagnosticsData != null : DIAGNOSTICS_DIRECTIVE + " should be present.";
Set<DiagnosticFactory<?>> diagnosticFactories = Sets.newHashSet();
Set<DiagnosticFactory<?>> diagnosticFactories = new HashSet<>();
String[] diagnostics = diagnosticsData.split(" ");
for (String diagnosticName : diagnostics) {
Object diagnostic = getDiagnostic(diagnosticName);