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

Minor. remove import package usages from sources

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-07 13:44:38 +03:00
parent 9dee696847
commit 5786e620e8
12 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+1 -2
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.codegen.ClassBuilder
import org.jetbrains.kotlin.codegen.SourceInfo import org.jetbrains.kotlin.codegen.SourceInfo
import org.jetbrains.org.objectweb.asm.Label import org.jetbrains.org.objectweb.asm.Label
import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor
import java.util
import java.util.* import java.util.*
//TODO join parameter //TODO join parameter
@@ -352,7 +351,7 @@ data open public class RangeMapping(val source: Int, val dest: Int, var range: I
return source + (destLine - dest) return source + (destLine - dest)
} }
object Comparator : util.Comparator<RangeMapping> { object Comparator : java.util.Comparator<RangeMapping> {
override fun compare(o1: RangeMapping, o2: RangeMapping): Int { override fun compare(o1: RangeMapping, o2: RangeMapping): Int {
if (o1 == o2) return 0 if (o1 == o2) return 0
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
+4 -4
View File
@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.codegen.optimization.common
import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Opcodes
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.tree.* import org.jetbrains.org.objectweb.asm.tree.*
import org.jetbrains.org.objectweb.asm.tree.analysis import org.jetbrains.org.objectweb.asm.tree.analysis.AnalyzerException
import org.jetbrains.org.objectweb.asm.tree.analysis.* import org.jetbrains.org.objectweb.asm.tree.analysis.Frame
import org.jetbrains.org.objectweb.asm.util.Printer import org.jetbrains.org.objectweb.asm.tree.analysis.Interpreter
import org.jetbrains.org.objectweb.asm.tree.analysis.Value
import java.util.* import java.util.*
import kotlin.properties.Delegates
public open class MethodAnalyzer<V : Value>( public open class MethodAnalyzer<V : Value>(
public val owner: String, public val owner: String,
compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateClassNameDiagnostics.kt
+2 -14
View File
@@ -16,24 +16,12 @@
package org.jetbrains.kotlin.codegen.state package org.jetbrains.kotlin.codegen.state
import com.intellij.psi.PsiElement
import com.intellij.util.containers.MultiMap
import org.jetbrains.kotlin.codegen.ClassBuilderFactory import org.jetbrains.kotlin.codegen.ClassBuilderFactory
import org.jetbrains.kotlin.codegen.ClassBuilderMode
import org.jetbrains.kotlin.codegen.ClassNameCollectionClassBuilderFactory import org.jetbrains.kotlin.codegen.ClassNameCollectionClassBuilderFactory
import org.jetbrains.kotlin.codegen.SignatureCollectingClassBuilderFactory
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
import org.jetbrains.kotlin.resolve.jvm
import org.jetbrains.kotlin.resolve.jvm.diagnostics.*
import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.join
import java.util.*
class BuilderFactoryForDuplicateClassNameDiagnostics( class BuilderFactoryForDuplicateClassNameDiagnostics(
compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt
+1 -2
View File
@@ -27,8 +27,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.org.objectweb.asm.* import org.jetbrains.org.objectweb.asm.*
import org.jetbrains.org.objectweb.asm.tree.MethodNode import org.jetbrains.org.objectweb.asm.tree.MethodNode
import java.util.ArrayList import java.util.*
import java.util.HashSet
import kotlin.properties.Delegates import kotlin.properties.Delegates
public object InlineTestUtil { public object InlineTestUtil {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
-2
View File
@@ -17,10 +17,8 @@
package org.jetbrains.kotlin.load.kotlin package org.jetbrains.kotlin.load.kotlin
import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver
import org.jetbrains.kotlin.types.FlexibleTypeCapabilities import org.jetbrains.kotlin.types.FlexibleTypeCapabilities
import org.jetbrains.kotlin.types
object JavaFlexibleTypeCapabilitiesDeserializer : FlexibleTypeCapabilitiesDeserializer { object JavaFlexibleTypeCapabilitiesDeserializer : FlexibleTypeCapabilitiesDeserializer {
override fun capabilitiesById(id: String): FlexibleTypeCapabilities? { override fun capabilitiesById(id: String): FlexibleTypeCapabilities? {
generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
+4 -4
View File
@@ -17,13 +17,13 @@
package org.jetbrains.kotlin.generators.test.evaluate package org.jetbrains.kotlin.generators.test.evaluate
import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.generators.evaluate import org.jetbrains.kotlin.generators.evaluate.DEST_FILE
import org.jetbrains.kotlin.generators.evaluate.generate
import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.JetTestUtils
import org.junit.Ignore
public class GenerateOperationsMapTest : UsefulTestCase() { public class GenerateOperationsMapTest : UsefulTestCase() {
public fun testGeneratedDataIsUpToDate(): Unit { public fun testGeneratedDataIsUpToDate(): Unit {
val text = evaluate.generate() val text = generate()
JetTestUtils.assertEqualsToFile(evaluate.DEST_FILE, text) JetTestUtils.assertEqualsToFile(DEST_FILE, text)
} }
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
+1 -2
View File
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiPackage
import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.isOneSegmentFQN import org.jetbrains.kotlin.name.isOneSegmentFQN
import org.jetbrains.kotlin.psi
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
@@ -54,7 +53,7 @@ fun JetSimpleNameExpression.changeQualifiedName(fqName: FqName): JetElement {
assert(!fqName.isRoot()) { "Can't set empty FqName for element $this" } assert(!fqName.isRoot()) { "Can't set empty FqName for element $this" }
val shortName = fqName.shortName().asString() val shortName = fqName.shortName().asString()
val psiFactory = psi.JetPsiFactory(this) val psiFactory = JetPsiFactory(this)
val fqNameBase = (getParent() as? JetCallExpression)?.let { parent -> val fqNameBase = (getParent() as? JetCallExpression)?.let { parent ->
val callCopy = parent.copy() as JetCallExpression val callCopy = parent.copy() as JetCallExpression
callCopy.getCalleeExpression()!!.replace(psiFactory.createSimpleName(shortName)).getParent()!!.getText() callCopy.getCalleeExpression()!!.replace(psiFactory.createSimpleName(shortName)).getParent()!!.getText()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
-1
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.stubs.KotlinFileStub import org.jetbrains.kotlin.psi.stubs.KotlinFileStub
import org.jetbrains.kotlin.psi.stubs.impl
import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
public class KotlinFileStubForIde( public class KotlinFileStubForIde(
idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
+6 -11
View File
@@ -16,20 +16,15 @@
package org.jetbrains.kotlin.idea package org.jetbrains.kotlin.idea
import com.intellij.debugger.engine
import com.intellij.debugger.engine.SuspendContext
import org.jetbrains.kotlin.idea.debugger.JetPositionManager
import com.sun.jdi.Location
import org.jetbrains.kotlin.idea.util.application.runReadAction
import com.intellij.debugger.NoDataException import com.intellij.debugger.NoDataException
import com.sun.jdi.request.StepRequest import com.intellij.debugger.engine.SuspendContext
import java.util.regex.Pattern
import java.util.WeakHashMap
import com.intellij.openapi.extensions.Extensions
import com.intellij.ui.classFilter.DebuggerClassFilterProvider
import com.intellij.debugger.settings.DebuggerSettings import com.intellij.debugger.settings.DebuggerSettings
import com.sun.jdi.Location
import com.sun.jdi.request.StepRequest
import org.jetbrains.kotlin.idea.debugger.JetPositionManager
import org.jetbrains.kotlin.idea.util.application.runReadAction
public class ExtraSteppingFilter : engine.ExtraSteppingFilter { public class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
override fun isApplicable(context: SuspendContext?): Boolean { override fun isApplicable(context: SuspendContext?): Boolean {
if (context == null) { if (context == null) {
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
+1 -2
View File
@@ -30,7 +30,6 @@ import com.intellij.ui.JBColor
import com.intellij.ui.SimpleTextAttributes import com.intellij.ui.SimpleTextAttributes
import com.intellij.ui.treeStructure.Tree import com.intellij.ui.treeStructure.Tree
import com.intellij.util.Consumer import com.intellij.util.Consumer
import com.intellij.util.containers
import com.intellij.util.ui.UIUtil import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod
import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.namedUnwrappedElement
@@ -56,7 +55,7 @@ public class KotlinCallerChooser(
previousTree: Tree?, previousTree: Tree?,
callback: Consumer<Set<PsiElement>> callback: Consumer<Set<PsiElement>>
): CallerChooserBase<PsiElement>(declaration, project, title, previousTree, "dummy." + JetFileType.EXTENSION, callback) { ): CallerChooserBase<PsiElement>(declaration, project, title, previousTree, "dummy." + JetFileType.EXTENSION, callback) {
override fun createTreeNode(method: PsiElement?, called: containers.HashSet<PsiElement>, cancelCallback: Runnable): KotlinMethodNode { override fun createTreeNode(method: PsiElement?, called: com.intellij.util.containers.HashSet<PsiElement>, cancelCallback: Runnable): KotlinMethodNode {
return KotlinMethodNode(method, called, myProject, cancelCallback) return KotlinMethodNode(method, called, myProject, cancelCallback)
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.template.TemplateBuilderImpl
import com.intellij.codeInsight.template.impl.TemplateManagerImpl import com.intellij.codeInsight.template.impl.TemplateManagerImpl
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.util import com.intellij.openapi.util.Pair
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
@@ -115,7 +115,7 @@ public class KotlinVariableInplaceIntroducer(
} }
override fun buildTemplateAndStart(refs: Collection<PsiReference>, override fun buildTemplateAndStart(refs: Collection<PsiReference>,
stringUsages: Collection<util.Pair<PsiElement, TextRange>>, stringUsages: Collection<Pair<PsiElement, TextRange>>,
scope: PsiElement, scope: PsiElement,
containingFile: PsiFile): Boolean { containingFile: PsiFile): Boolean {
myEditor.getCaretModel().moveToOffset(getNameIdentifier()!!.startOffset) myEditor.getCaretModel().moveToOffset(getNameIdentifier()!!.startOffset)
jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.jps.build package org.jetbrains.kotlin.jps.build
import com.intellij.openapi.diagnostic
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.FileUtilRt import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.testFramework.TestLoggerFactory import com.intellij.testFramework.TestLoggerFactory
@@ -77,7 +76,7 @@ public abstract class AbstractIncrementalJpsTest(
protected var workDir: File by Delegates.notNull() protected var workDir: File by Delegates.notNull()
private fun enableDebugLogging() { private fun enableDebugLogging() {
diagnostic.Logger.setFactory(javaClass<TestLoggerFactory>()) com.intellij.openapi.diagnostic.Logger.setFactory(javaClass<TestLoggerFactory>())
TestLoggerFactory.dumpLogToStdout("") TestLoggerFactory.dumpLogToStdout("")
TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org")