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

Rename package jet -> kotlin in injectors

Browse Source 
org.jetbrains.jet.di -> org.jetbrains.kotlin.di
This commit is contained in:
Alexander Udalov
2015-01-02 20:32:34 +03:00
parent 4f8e6c1dcc
commit fcbfc53dc8
40 changed files with 90 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
+1 -1
View File
@@ -25,7 +25,6 @@ import com.intellij.psi.util.PsiTreeUtil;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.analyzer.AnalyzerPackage;
import org.jetbrains.jet.di.InjectorForBodyResolve;
import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
@@ -43,6 +42,7 @@ import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.storage.ExceptionTracker;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.kotlin.di.InjectorForBodyResolve;
import java.util.Collection;
import java.util.Collections;
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS
import org.jetbrains.jet.lang.PlatformToKotlinClassMap
import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService
import org.jetbrains.jet.lang.resolve.BindingTraceContext
import org.jetbrains.jet.di.InjectorForLazyResolve
import org.jetbrains.kotlin.di.InjectorForLazyResolve
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.jet.analyzer.ModuleInfo
import org.jetbrains.jet.analyzer.ModuleContent
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
+1 -1
View File
@@ -60,7 +60,7 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext
import org.jetbrains.jet.lang.types.TypeUtils
import org.jetbrains.jet.lang.resolve.scopes.ChainedScope
import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo
import org.jetbrains.jet.di.InjectorForLazyBodyResolve
import org.jetbrains.kotlin.di.InjectorForLazyBodyResolve
import org.jetbrains.jet.plugin.project.TargetPlatformDetector
import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor
import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java
+1 -1
View File
@@ -40,7 +40,6 @@ import org.jetbrains.jet.asJava.LightClassUtil;
import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
import org.jetbrains.jet.context.ContextPackage;
import org.jetbrains.jet.context.GlobalContextImpl;
import org.jetbrains.jet.di.InjectorForLazyResolve;
import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -64,6 +63,7 @@ import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex;
import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex;
import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyFqnNameIndex;
import org.jetbrains.kotlin.di.InjectorForLazyResolve;
import java.util.Collection;
import java.util.Collections;
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.types.TypeUtils
import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.jetbrains.jet.lang.psi.JetTypeProjection
import org.jetbrains.jet.lang.psi.Call
import org.jetbrains.jet.di.InjectorForMacros
import org.jetbrains.kotlin.di.InjectorForMacros
import org.jetbrains.jet.lang.resolve.BindingTraceContext
import org.jetbrains.jet.lang.psi.JetProperty
import org.jetbrains.jet.lang.psi.JetTypeArgumentList
@@ -91,4 +91,4 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingIntention<JetTypeArgu
override fun applyTo(element: JetTypeArgumentList, editor: Editor) {
element.delete()
}
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+1 -2
View File
@@ -39,11 +39,9 @@ import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.asJava.LightClassUtil;
import org.jetbrains.jet.context.ContextPackage;
import org.jetbrains.jet.context.GlobalContextImpl;
import org.jetbrains.jet.di.InjectorForLazyTopDownAnalyzerBasic;
import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
@@ -52,6 +50,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.utils.UtilsPackage;
import org.jetbrains.kotlin.di.InjectorForLazyTopDownAnalyzerBasic;
import java.io.File;
import java.net.MalformedURLException;
idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt
+6 -6
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker
import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency
import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode
import org.jetbrains.jet.lang.resolve.calls.extensions.CompositeExtension
import org.jetbrains.jet.di.InjectorForMacros
import org.jetbrains.kotlin.di.InjectorForMacros
import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
import java.util.HashSet
@@ -117,8 +117,8 @@ class ExpectedInfos(val bindingContext: BindingContext, val resolutionFacade: Re
val functionLiteralArgument = expressionWithType.getParent() as? JetFunctionLiteralArgument
val callExpression = functionLiteralArgument?.getParent() as? JetCallExpression
if (callExpression != null) {
if (callExpression.getFunctionLiteralArguments().head?.getArgumentExpression() == expressionWithType) {
return calculateForArgument(callExpression, callExpression.getValueArguments().size - 1, true)
if (callExpression.getFunctionLiteralArguments().firstOrNull()?.getArgumentExpression() == expressionWithType) {
return calculateForArgument(callExpression, callExpression.getValueArguments().size() - 1, true)
}
}
return null
@@ -185,7 +185,7 @@ class ExpectedInfos(val bindingContext: BindingContext, val resolutionFacade: Re
if (status == ResolutionStatus.RECEIVER_TYPE_ERROR || status == ResolutionStatus.RECEIVER_PRESENCE_ERROR) continue
// consider only candidates with more arguments than in the truncated call and with all arguments before the current one matched
if (candidate.noErrorsInValueArguments() && (candidate.getCandidateDescriptor().getValueParameters().size > argumentIndex || isFunctionLiteralArgument)) {
if (candidate.noErrorsInValueArguments() && (candidate.getCandidateDescriptor().getValueParameters().size() > argumentIndex || isFunctionLiteralArgument)) {
val descriptor = candidate.getResultingDescriptor()
val thisReceiver = ExpressionTypingUtils.normalizeReceiverValueForVisibility(candidate.getDispatchReceiver(), bindingContext)
@@ -346,5 +346,5 @@ class ExpectedInfos(val bindingContext: BindingContext, val resolutionFacade: Re
}
private fun String.fromPlural()
= if (endsWith("s")) substring(0, length - 1) else this
}
= if (endsWith("s")) substring(0, length() - 1) else this
}
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
+1 -1
View File
@@ -30,7 +30,6 @@ import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.analyzer.AnalysisResult;
import org.jetbrains.jet.di.InjectorForMacros;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.psi.*;
@@ -42,6 +41,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.util.UtilPackage;
import org.jetbrains.kotlin.di.InjectorForMacros;
import java.util.ArrayList;
import java.util.LinkedHashSet;